Replace Q_WS_WIN with appropriate guards to account for Qt5.

[lyx.git] / src / lyxfind.cpp

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 12d30e08ed14f0eeff45fe0f54c63d276e954376..6b9556e8790e92fe3d2a4f87202cfce0d99927c7 100644 (file)
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -182,9 +182,9 @@ int replaceAll(BufferView * bv,
                cur.recordUndo();
                int striked = ssize -
                        cur.paragraph().eraseChars(pos, pos + match_len,
-                                                  buf.params().trackChanges);
+                                                  buf.params().track_changes);
                cur.paragraph().insert(pos, replacestr, font,
-                                      Change(buf.params().trackChanges
+                                      Change(buf.params().track_changes
                                              ? Change::INSERTED
                                              : Change::UNCHANGED));
                for (int i = 0; i < rsize + striked; ++i)
@@ -400,7 +400,7 @@ bool findChange(DocIterator & cur, bool next)
                        if (!next)
                                // if we search backwards, take a step forward
                                // to correctly set the anchor
-                               cur.forwardPos();
+                               cur.top().forwardPos();
                        return true;
                }
 
@@ -1382,7 +1382,8 @@ static void findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, M
        DocIterator sel_beg = cur.selectionBegin();
        DocIterator sel_end = cur.selectionEnd();
        if (&sel_beg.inset() != &sel_end.inset()
-           || sel_beg.pit() != sel_end.pit())
+           || sel_beg.pit() != sel_end.pit()
+           || sel_beg.idx() != sel_end.idx())
                return;
        int sel_len = sel_end.pos() - sel_beg.pos();
        LYXERR(Debug::FIND, "sel_beg: " << sel_beg << ", sel_end: " << sel_end