X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfind.cpp;h=409a2e2cf7f2a1bf8d24fbf5725d111dd2311a0a;hb=1e190a2af27ca99831f51567c16e6b39bf4317c3;hp=573f8859192daa3121ec1457f5ad7d7c09491f0c;hpb=fcae022192e6bce3fe6a211291e301fb2f656e22;p=lyx.git

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 573f885919..409a2e2cf7 100644
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -718,18 +718,17 @@ private:
 static docstring buffer_to_latex(Buffer & buffer) 
 {
 	OutputParams runparams(&buffer.params().encoding());
+	TexRow texrow;
 	odocstringstream ods;
-	otexstream os(ods);
+	otexstream os(ods, texrow);
 	runparams.nice = true;
 	runparams.flavor = OutputParams::LATEX;
 	runparams.linelen = 80; //lyxrc.plaintext_linelen;
 	// No side effect of file copying and image conversion
 	runparams.dryrun = true;
-	buffer.texrow().reset();
 	pit_type const endpit = buffer.paragraphs().size();
 	for (pit_type pit = 0; pit != endpit; ++pit) {
-		TeXOnePar(buffer, buffer.text(),
-			  pit, os, buffer.texrow(), runparams);
+		TeXOnePar(buffer, buffer.text(), pit, os, runparams);
 		LYXERR(Debug::FIND, "searchString up to here: " << ods.str());
 	}
 	return ods.str();
@@ -995,7 +994,7 @@ docstring latexifyFromCursor(DocIterator const & cur, int len)
 
 	TexRow texrow;
 	odocstringstream ods;
-	otexstream os(ods);
+	otexstream os(ods, texrow);
 	OutputParams runparams(&buf.params().encoding());
 	runparams.nice = false;
 	runparams.flavor = OutputParams::LATEX;
@@ -1008,7 +1007,7 @@ docstring latexifyFromCursor(DocIterator const & cur, int len)
 		pos_type endpos = cur.paragraph().size();
 		if (len != -1 && endpos > cur.pos() + len)
 			endpos = cur.pos() + len;
-		TeXOnePar(buf, *cur.innerText(), cur.pit(), os, texrow, runparams,
+		TeXOnePar(buf, *cur.innerText(), cur.pit(), os, runparams,
 			string(), cur.pos(), endpos);
 		LYXERR(Debug::FIND, "Latexified text: '" << lyx::to_utf8(ods.str()) << "'");
 	} else if (cur.inMathed()) {
@@ -1095,10 +1094,10 @@ int findForwardAdv(DocIterator & cur, MatchStringAdv & match)
 {
 	if (!cur)
 		return 0;
-	while (!theApp()->longOperationCancelled() && cur) {
+	while (cur) {
 		LYXERR(Debug::FIND, "findForwardAdv() cur: " << cur);
 		if (match(cur, -1, false)) {
-			for (; !theApp()->longOperationCancelled() && cur; cur.forwardPos()) {
+			for (; cur; cur.forwardPos()) {
 				LYXERR(Debug::FIND, "Advancing cur: " << cur);
 				if (match(cur)) {
 					// Sometimes in finalize we understand it wasn't a match
@@ -1193,7 +1192,7 @@ int findBackwardsAdv(DocIterator & cur, MatchStringAdv & match) {
 		else
 			cur.backwardPos();
 		pit_changed = true;
-	} while (!theApp()->longOperationCancelled());
+	} while (true);
 	return 0;
 }
 
@@ -1318,15 +1317,15 @@ static void findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, M
 		LYXERR(Debug::FIND, "After pasteParagraphList() cur=" << cur << endl);
 		sel_len = repl_buffer.paragraphs().begin()->size();
 	} else {
+		TexRow texrow;
 		odocstringstream ods;
-		otexstream os(ods);
+		otexstream os(ods, texrow);
 		OutputParams runparams(&repl_buffer.params().encoding());
 		runparams.nice = false;
 		runparams.flavor = OutputParams::LATEX;
 		runparams.linelen = 8000; //lyxrc.plaintext_linelen;
 		runparams.dryrun = true;
-		TexRow texrow;
-		TeXOnePar(repl_buffer, repl_buffer.text(), 0, os, texrow, runparams);
+		TeXOnePar(repl_buffer, repl_buffer.text(), 0, os, runparams);
 		//repl_buffer.getSourceCode(ods, 0, repl_buffer.paragraphs().size(), false);
 		docstring repl_latex = ods.str();
 		LYXERR(Debug::FIND, "Latexified replace_buffer: '" << repl_latex << "'");