X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfind.cpp;h=d7038dedcb1e66d4bc96bb8e328e81dd26f295c1;hb=044933b0d929e759d0c7badf55eafc471623cc0c;hp=aedbc53bff0dd5d0bf52859e164b472b4752a40e;hpb=afed7d06fa6c932a1a1578b76371189a7e17825e;p=lyx.git diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp index aedbc53bff..d7038dedcb 100644 --- a/src/lyxfind.cpp +++ b/src/lyxfind.cpp @@ -385,7 +385,6 @@ bool lyxreplace(BufferView * bv, else bv->message(_("String not found.")); } - bv->buffer().updatePreviews(); return update; } @@ -592,7 +591,6 @@ string escape_for_regex(string s, bool match_latex) } if (end_pos == s.size()) { s.replace(new_pos, end_pos - new_pos, t); - pos = s.size(); LYXERR(Debug::FIND, "Regexp after \\regexp{} removal: " << s); break; } @@ -1009,7 +1007,6 @@ docstring stringifyFromCursor(DocIterator const & cur, int len) pos_type end = ( len == -1 || cur.pos() + len > int(par.size()) ) ? int(par.size()) : cur.pos() + len; OutputParams runparams(&cur.buffer()->params().encoding()); - odocstringstream os; runparams.nice = true; runparams.flavor = OutputParams::LATEX; runparams.linelen = 100000; //lyxrc.plaintext_linelen; @@ -1073,8 +1070,8 @@ docstring latexifyFromCursor(DocIterator const & cur, int len) // Retrieve the math environment type, and add '$' or '$[' or others (\begin{equation}) accordingly for (int s = cur.depth() - 1; s >= 0; --s) { CursorSlice const & cs = cur[s]; - if (cs.asInsetMath() && cs.asInsetMath() && cs.asInsetMath()->asHullInset()) { - WriteStream ws(ods); + if (cs.asInsetMath() && cs.asInsetMath()->asHullInset()) { + WriteStream ws(os); cs.asInsetMath()->asHullInset()->header_write(ws); break; } @@ -1096,7 +1093,7 @@ docstring latexifyFromCursor(DocIterator const & cur, int len) CursorSlice const & cs = cur[s]; InsetMath * inset = cs.asInsetMath(); if (inset && inset->asHullInset()) { - WriteStream ws(ods); + WriteStream ws(os); inset->asHullInset()->footer_write(ws); break; } @@ -1224,12 +1221,10 @@ int findBackwardsAdv(DocIterator & cur, MatchStringAdv & match) return 0; cur.backwardPos(); DocIterator cur_orig(cur); - bool found_match; bool pit_changed = false; - found_match = false; do { cur.pos() = 0; - found_match = match(cur, -1, false); + bool found_match = match(cur, -1, false); if (found_match) { if (pit_changed) @@ -1302,6 +1297,7 @@ static bool allNonLowercase(Cursor const & cur, int len) if (len > cur.lastpos() + 1 - beg_pos) { LYXERR(Debug::FIND, "This should not happen, more debug needed"); len = cur.lastpos() + 1 - beg_pos; + end_pos = beg_pos + len; } for (pos_type pos = beg_pos; pos != end_pos; ++pos) if (isLowerCase(cur.paragraph().getChar(pos))) @@ -1429,7 +1425,6 @@ static void findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, M LYXERR(Debug::FIND, "After pos adj cur=" << cur << " with depth: " << cur.depth() << " and len: " << sel_len); bv->putSelectionAt(DocIterator(cur), sel_len, !opt.forward); bv->processUpdateFlags(Update::Force); - bv->buffer().updatePreviews(); }