ws changes only

[lyx.git] / src / undo_funcs.C

diff --git a/src/undo_funcs.C b/src/undo_funcs.C
index d81a5159565c0e9a5d56a8b410084ec4543c194e..b12a4a885fe5ea8e67748c22809e41f8fecaacba 100644 (file)
--- a/src/undo_funcs.C
+++ b/src/undo_funcs.C
@@ -68,8 +68,8 @@ void recordUndo(BufferView * bv, Undo::undo_kind kind,
        // Nobody wants all removed character appear one by one when undoing.
        if (! undo_finished && kind != Undo::ATOMIC) {
                // Check whether storing is needed.
-               if (! buf->undostack().empty() 
-                   && buf->undostack().top().kind == kind 
+               if (! buf->undostack().empty()
+                   && buf->undostack().top().kind == kind
                    && buf->undostack().top().first_par_offset == first_offset
                    && buf->undostack().top().last_par_offset == last_offset) {
                        // No additonal undo recording needed -
@@ -79,8 +79,7 @@ void recordUndo(BufferView * bv, Undo::undo_kind kind,
        }
 
        // Record the cursor position in a stable way.
-       int const cursor_offset = std::distance
-               (text->ownerParagraphs().begin(), text->cursor.par());
+       int const cursor_offset = text->cursor.par();
 
        // Make and push the Undo entry
        stack.push(Undo(kind, inset_id,
@@ -117,7 +116,7 @@ bool performUndoOrRedo(BufferView * bv, Undo & undo)
                advance(last, plist.size() - undo.last_par_offset);
                plist.erase(first, ++last);
        }
-               
+
        // Re-insert old stuff instead
        {
                if (plist.empty()) {
@@ -140,9 +139,7 @@ bool performUndoOrRedo(BufferView * bv, Undo & undo)
                                buf->getInsetFromID(undo.inset_id));
 
                LyXText * text = inset ? inset->getLyXText(bv) : bv->text;
-               ParagraphList::iterator cursor = text->ownerParagraphs().begin();
-               advance(cursor, undo.cursor_par_offset);
-               text->setCursorIntern(cursor, undo.cursor_pos);
+               text->setCursorIntern(undo.cursor_par_offset, undo.cursor_pos);
 
                if (inset) {
                        // Magic needed to update inset internal state
@@ -151,7 +148,7 @@ bool performUndoOrRedo(BufferView * bv, Undo & undo)
                }
 
                // set cursor again to force the position to be the right one
-               text->setCursorIntern(cursor, undo.cursor_pos);
+               text->setCursorIntern(undo.cursor_par_offset, undo.cursor_pos);
 
                // Clear any selection and set the selection
                // cursor for any new selection.
@@ -268,6 +265,6 @@ void recordUndo(BufferView * bv, Undo::undo_kind kind,
 
 void recordUndo(BufferView * bv, Undo::undo_kind kind)
 {
-       recordUndo(bv, kind, bv->text->cursor.par());
+       recordUndo(bv, kind, bv->text->cursorPar());
 }