X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfind.C;h=932cbec30e0a31df48b9cd37ab980a076802070f;hb=52eb91c94fb70d58dceef430659c8781de2eccda;hp=93797a61596551b7bd0247479d76d597fdcb38ea;hpb=26460b39ee8b2c8fe88e3f2225486e1b72e59f3f;p=lyx.git

diff --git a/src/lyxfind.C b/src/lyxfind.C
index 93797a6159..932cbec30e 100644
--- a/src/lyxfind.C
+++ b/src/lyxfind.C
@@ -18,6 +18,7 @@
 #include "buffer.h"
 #include "cursor.h"
 #include "CutAndPaste.h"
+#include "buffer_funcs.h"
 #include "BufferView.h"
 #include "debug.h"
 #include "funcrequest.h"
@@ -30,8 +31,7 @@
 #include "frontends/Alert.h"
 
 #include "support/convert.h"
-
-#include <sstream>
+#include "support/docstream.h"
 
 namespace lyx {
 
@@ -40,17 +40,15 @@ using support::uppercase;
 using support::split;
 
 using std::advance;
-using std::ostringstream;
-using std::string;
 
 
 namespace {
 
-bool parse_bool(string & howto)
+bool parse_bool(docstring & howto)
 {
 	if (howto.empty())
 		return false;
-	string var;
+	docstring var;
 	howto = split(howto, var, ' ');
 	return (var == "1");
 }
@@ -59,18 +57,18 @@ bool parse_bool(string & howto)
 class MatchString : public std::binary_function<Paragraph, pos_type, bool>
 {
 public:
-	MatchString(string const & str, bool cs, bool mw)
+	MatchString(docstring const & str, bool cs, bool mw)
 		: str(str), cs(cs), mw(mw)
 	{}
 
 	// returns true if the specified string is at the specified position
 	bool operator()(Paragraph const & par, pos_type pos) const
 	{
-		string::size_type const size = str.length();
+		docstring::size_type const size = str.length();
 		pos_type i = 0;
 		pos_type const parsize = par.size();
 		for (i = 0; pos + i < parsize; ++i) {
-			if (string::size_type(i) >= size)
+			if (docstring::size_type(i) >= size)
 				break;
 			if (cs && str[i] != par.getChar(pos + i))
 				break;
@@ -78,7 +76,7 @@ public:
 				break;
 		}
 
-		if (size != string::size_type(i))
+		if (size != docstring::size_type(i))
 			return false;
 
 		// if necessary, check whether string matches word
@@ -95,7 +93,7 @@ public:
 
 private:
 	// search string
-	string str;
+	docstring str;
 	// case sensitive
 	bool cs;
 	// match whole words only
@@ -132,7 +130,7 @@ bool findChange(DocIterator & cur)
 }
 
 
-bool searchAllowed(BufferView * bv, string const & str)
+bool searchAllowed(BufferView * bv, docstring const & str)
 {
 	if (str.empty()) {
 		frontend::Alert::error(_("Search error"),
@@ -143,7 +141,7 @@ bool searchAllowed(BufferView * bv, string const & str)
 }
 
 
-bool find(BufferView * bv, string const & searchstr, bool cs, bool mw, bool fw)
+bool find(BufferView * bv, docstring const & searchstr, bool cs, bool mw, bool fw)
 {
 	if (!searchAllowed(bv, searchstr))
 		return false;
@@ -162,7 +160,7 @@ bool find(BufferView * bv, string const & searchstr, bool cs, bool mw, bool fw)
 
 
 int replaceAll(BufferView * bv,
-	       string const & searchstr, string const & replacestr,
+	       docstring const & searchstr, docstring const & replacestr,
 	       bool cs, bool mw)
 {
 	Buffer & buf = *bv->buffer();
@@ -185,7 +183,7 @@ int replaceAll(BufferView * bv,
 			= cur.paragraph().getFontSettings(buf.params(), pos);
 		int striked = ssize - cur.paragraph().eraseChars(pos, pos + ssize,
 							    buf.params().trackChanges);
-		cur.paragraph().insert(pos, from_utf8(replacestr), font,
+		cur.paragraph().insert(pos, replacestr, font,
 		                       Change(buf.params().trackChanges ?
 		                              Change::INSERTED : Change::UNCHANGED));
 		for (int i = 0; i < rsize + striked; ++i)
@@ -193,7 +191,7 @@ int replaceAll(BufferView * bv,
 		++num;
 	}
 
-	bv->buffer()->text().init(bv);
+	updateLabels(buf);
 	bv->putSelectionAt(doc_iterator_begin(buf.inset()), 0, false);
 	if (num)
 		buf.markDirty();
@@ -201,13 +199,13 @@ int replaceAll(BufferView * bv,
 }
 
 
-bool stringSelected(BufferView * bv, string const & searchstr,
+bool stringSelected(BufferView * bv, docstring const & searchstr,
 		    bool cs, bool mw, bool fw)
 {
 	// if nothing selected or selection does not equal search
 	// string search and select next occurance and return
-	string const & str1 = searchstr;
-	string const str2 = to_utf8(bv->cursor().selectionAsString(false));
+	docstring const & str1 = searchstr;
+	docstring const str2 = bv->cursor().selectionAsString(false);
 	if ((cs && str1 != str2) || lowercase(str1) != lowercase(str2)) {
 		find(bv, searchstr, cs, mw, fw);
 		return false;
@@ -217,8 +215,8 @@ bool stringSelected(BufferView * bv, string const & searchstr,
 }
 
 
-int replace(BufferView * bv, string const & searchstr,
-	    std::string const & replacestr, bool cs, bool mw, bool fw)
+int replace(BufferView * bv, docstring const & searchstr,
+	    docstring const & replacestr, bool cs, bool mw, bool fw)
 {
 	if (!searchAllowed(bv, searchstr) || bv->buffer()->isReadonly())
 		return 0;
@@ -227,7 +225,7 @@ int replace(BufferView * bv, string const & searchstr,
 		return 0;
 
 	LCursor & cur = bv->cursor();
-	cap::replaceSelectionWithString(cur, from_utf8(replacestr), fw);
+	cap::replaceSelectionWithString(cur, replacestr, fw);
 	bv->buffer()->markDirty();
 	find(bv, searchstr, cs, mw, fw);
 	bv->update();
@@ -238,10 +236,10 @@ int replace(BufferView * bv, string const & searchstr,
 } // namespace anon
 
 
-string const find2string(string const & search,
+docstring const find2string(docstring const & search,
 			 bool casesensitive, bool matchword, bool forward)
 {
-	ostringstream ss;
+	odocstringstream ss;
 	ss << search << '\n'
 	   << int(casesensitive) << ' '
 	   << int(matchword) << ' '
@@ -250,11 +248,11 @@ string const find2string(string const & search,
 }
 
 
-string const replace2string(string const & search, string const & replace,
+docstring const replace2string(docstring const & search, docstring const & replace,
 			    bool casesensitive, bool matchword,
 			    bool all, bool forward)
 {
-	ostringstream ss;
+	odocstringstream ss;
 	ss << search << '\n'
 	   << replace << '\n'
 	   << int(casesensitive) << ' '
@@ -275,8 +273,8 @@ void find(BufferView * bv, FuncRequest const & ev)
 	// data is of the form
 	// "<search>
 	//  <casesensitive> <matchword> <forward>"
-	string search;
-	string howto = split(to_utf8(ev.argument()), search, '\n');
+	docstring search;
+	docstring howto = split(ev.argument(), search, '\n');
 
 	bool casesensitive = parse_bool(howto);
 	bool matchword     = parse_bool(howto);
@@ -300,9 +298,9 @@ void replace(BufferView * bv, FuncRequest const & ev)
 	// "<search>
 	//  <replace>
 	//  <casesensitive> <matchword> <all> <forward>"
-	string search;
-	string rplc;
-	string howto = split(to_utf8(ev.argument()), search, '\n');
+	docstring search;
+	docstring rplc;
+	docstring howto = split(ev.argument(), search, '\n');
 	howto = split(howto, rplc, '\n');
 
 	bool casesensitive = parse_bool(howto);
@@ -349,18 +347,24 @@ bool findNextChange(BufferView * bv)
 	Change orig_change = cur.paragraph().lookupChange(cur.pos());
 
 	DocIterator et = doc_iterator_end(cur.inset());
+	DocIterator ok = cur;   // see below
 	for (; cur != et; cur.forwardPosNoDescend()) {
+		ok = cur;
 		Change change = cur.paragraph().lookupChange(cur.pos());
 		if (change != orig_change) {
 			break;
 		}
 	}
+
+	// avoid crash (assertion violation) if the imaginary end-of-par
+	// character of the last paragraph of the document is marked as changed 
+	if (cur == et) {
+		cur = ok;
+	}
+
 	// Now put cursor to end of selection:
 	bv->cursor().setCursor(cur);
 	bv->cursor().setSelection();
-	// if we used a lfun like in find/replace, dispatch would do
-	// that for us
-	bv->update();
 
 	return true;
 }