Streamlining CollapseStatus stuff

[lyx.git] / src / lyxfind.cpp

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index aa28e0d83670bbb47654a4d2bb8a6915655a4f8e..92dcfa8a095d0622742c8c84e46b45e5352ded74 100644 (file)
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -366,21 +366,16 @@ 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) {
+       CursorSlice & tip = cur.top();
+       for (; !tip.at_end(); tip.forwardPos()) {
+               Change change = tip.paragraph().lookupChange(tip.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;
-       }
+       if (tip.at_end())
+               tip.backwardPos();
 
        // Now put cursor to end of selection:
        bv->cursor().setCursor(cur);