Fix bug #11716

[lyx.git] / src / Undo.cpp

diff --git a/src/Undo.cpp b/src/Undo.cpp
index eb7722839c2d9ca27b7134b15b73652ca7954a47..28a2e822395abefca4956d3970e079567922f1c1 100644 (file)
--- a/src/Undo.cpp
+++ b/src/Undo.cpp
@@ -90,21 +90,15 @@ struct UndoElement
        {
        }
        ///
-       UndoElement(UndoElement const & ue) : time(current_time())
-       {
-               kind = ue.kind;
-               cur_before = ue.cur_before;
-               cur_after = ue.cur_after;
-               cell = ue.cell;
-               from = ue.from;
-               end = ue.end;
-               pars = ue.pars;
-               array = ue.array;
-               bparams = ue.bparams
-                       ? new BufferParams(*ue.bparams) : 0;
-               lyx_clean = ue.lyx_clean;
-               group_id = ue.group_id;
-       }
+       UndoElement(UndoElement const & ue) :
+               kind(ue.kind),
+               cur_before(ue.cur_before), cur_after(ue.cur_after),
+               cell(ue.cell), from(ue.from), end(ue.end),
+               pars(ue.pars), array(ue.array),
+               bparams(ue.bparams ? new BufferParams(*ue.bparams) : 0),
+               lyx_clean(ue.lyx_clean), group_id(ue.group_id),
+               time(current_time())
+               {}
        ///
        ~UndoElement()
        {
@@ -203,10 +197,10 @@ struct Undo::Private
                                   group_id_(0), group_level_(0) {}
 
        // Do one undo/redo step
-       void doTextUndoOrRedo(CursorData & cur, UndoElementStack & stack,
+       void doUndoRedoAction(CursorData & cur, UndoElementStack & stack,
                              UndoElementStack & otherStack);
        // Apply one undo/redo group. Returns false if no undo possible.
-       bool textUndoOrRedo(CursorData & cur, bool isUndoOperation);
+       bool undoRedoAction(CursorData & cur, bool isUndoOperation);
 
        ///
        void doRecordUndo(UndoKind kind,
@@ -430,7 +424,7 @@ void Undo::Private::recordUndoBufferParams(CursorData const & cur)
 }
 
 
-void Undo::Private::doTextUndoOrRedo(CursorData & cur, UndoElementStack & stack, UndoElementStack & otherstack)
+void Undo::Private::doUndoRedoAction(CursorData & cur, UndoElementStack & stack, UndoElementStack & otherstack)
 {
        // Adjust undo stack and get hold of current undo data.
        UndoElement & undo = stack.top();
@@ -472,6 +466,7 @@ void Undo::Private::doTextUndoOrRedo(CursorData & cur, UndoElementStack & stack,
                //LYXERR0("undo.array: " << *undo.array);
                LBUFERR(undo.array);
                dit.cell().swap(*undo.array);
+               dit.inset().setBuffer(buffer_);
                delete undo.array;
                undo.array = 0;
        } else {
@@ -527,7 +522,7 @@ void Undo::Private::doTextUndoOrRedo(CursorData & cur, UndoElementStack & stack,
 }
 
 
-bool Undo::Private::textUndoOrRedo(CursorData & cur, bool isUndoOperation)
+bool Undo::Private::undoRedoAction(CursorData & cur, bool isUndoOperation)
 {
        undo_finished_ = true;
 
@@ -541,7 +536,7 @@ bool Undo::Private::textUndoOrRedo(CursorData & cur, bool isUndoOperation)
 
        const size_t gid = stack.top().group_id;
        while (!stack.empty() && stack.top().group_id == gid)
-               doTextUndoOrRedo(cur, stack, otherstack);
+               doUndoRedoAction(cur, stack, otherstack);
        return true;
 }
 
@@ -553,15 +548,15 @@ void Undo::finishUndo()
 }
 
 
-bool Undo::textUndo(CursorData & cur)
+bool Undo::undoAction(CursorData & cur)
 {
-       return d->textUndoOrRedo(cur, true);
+       return d->undoRedoAction(cur, true);
 }
 
 
-bool Undo::textRedo(CursorData & cur)
+bool Undo::redoAction(CursorData & cur)
 {
-       return d->textUndoOrRedo(cur, false);
+       return d->undoRedoAction(cur, false);
 }
 
 
@@ -609,6 +604,24 @@ void Undo::endUndoGroup(CursorData const & cur_after)
 }
 
 
+void Undo::splitUndoGroup(CursorData const & cur)
+{
+       size_t const level = d->group_level_;
+       d->group_level_ = 1;
+       endUndoGroup(cur);
+       beginUndoGroup(cur);
+       d->group_level_ = level;
+}
+
+
+bool Undo::activeUndoGroup() const
+{
+       return d->group_level_ > 0
+               && !d->undostack_.empty()
+               && d->undostack_.top().group_id == d->group_id_;
+}
+
+
 void Undo::recordUndo(CursorData const & cur, UndoKind kind)
 {
        d->recordUndo(kind, cur, cur.pit(), cur.pit(), cur);