]> git.lyx.org Git - lyx.git/blobdiff - src/lyxfind.cpp
Do not crash when entering math in ct mode with merge dialog open.
[lyx.git] / src / lyxfind.cpp
index 12d30e08ed14f0eeff45fe0f54c63d276e954376..ca43d47e92b0ac708d550bce79a0f140822022ac 100644 (file)
@@ -782,17 +782,14 @@ static docstring stringifySearchBuffer(Buffer & buffer, FindAndReplaceOptions co
                runparams.flavor = OutputParams::LATEX;
                runparams.linelen = 100000; //lyxrc.plaintext_linelen;
                runparams.dryrun = true;
-               runparams.for_search = true;
                for (pos_type pit = pos_type(0); pit < (pos_type)buffer.paragraphs().size(); ++pit) {
                        Paragraph const & par = buffer.paragraphs().at(pit);
                        LYXERR(Debug::FIND, "Adding to search string: '"
-                              << par.asString(pos_type(0), par.size(),
-                                              AS_STR_INSETS | AS_STR_SKIPDELETE | AS_STR_PLAINTEXT,
-                                              &runparams)
+                              << par.stringify(pos_type(0), par.size(),
+                                               AS_STR_INSETS, runparams)
                               << "'");
-                       str += par.asString(pos_type(0), par.size(),
-                                           AS_STR_INSETS | AS_STR_SKIPDELETE | AS_STR_PLAINTEXT,
-                                           &runparams);
+                       str += par.stringify(pos_type(0), par.size(),
+                                            AS_STR_INSETS, runparams);
                }
        }
        return str;
@@ -1043,9 +1040,7 @@ docstring stringifyFromCursor(DocIterator const & cur, int len)
                runparams.dryrun = true;
                LYXERR(Debug::FIND, "Stringifying with cur: "
                       << cur << ", from pos: " << cur.pos() << ", end: " << end);
-               return par.asString(cur.pos(), end,
-                       AS_STR_INSETS | AS_STR_SKIPDELETE | AS_STR_PLAINTEXT,
-                       &runparams);
+               return par.stringify(cur.pos(), end, AS_STR_INSETS, runparams);
        } else if (cur.inMathed()) {
                docstring s;
                CursorSlice cs = cur.top();