* GuiView.cpp:

[lyx.git] / src / Undo.cpp

diff --git a/src/Undo.cpp b/src/Undo.cpp
index b024067ed14209c06d684aef3c5290149019865c..06bd16ccc80ce13c0956397b14c23e33931ed925 100644 (file)
--- a/src/Undo.cpp
+++ b/src/Undo.cpp
@@ -73,8 +73,31 @@ struct UndoElement
                    MathData * ar, BufferParams const & bp, 
                    bool ifb) :
                kind(kin), cursor(cur), cell(cel), from(fro), end(en),
-               pars(pl), array(ar), bparams(bp), isFullBuffer(ifb)
-       {}
+               pars(pl), array(ar), bparams(0), isFullBuffer(ifb)
+       {
+               if (isFullBuffer)
+                       bparams = new BufferParams(bp);
+       }
+       ///
+       UndoElement(UndoElement const & ue)
+       {
+               kind = ue.kind;
+               cursor = ue.cursor;
+               cell = ue.cell;
+               from = ue.from;
+               end = ue.end;
+               pars = ue.pars;
+               array = ue.array;
+               bparams = ue.isFullBuffer
+                       ? new BufferParams(*ue.bparams) : ue.bparams;
+               isFullBuffer = ue.isFullBuffer;
+       }
+       ///
+       ~UndoElement()
+       {
+               if (isFullBuffer)
+                       delete bparams;
+       }
        /// Which kind of operation are we recording for?
        UndoKind kind;
        /// the position of the cursor
@@ -90,7 +113,7 @@ struct UndoElement
        /// the contents of the saved MathData (for mathed)
        MathData * array;
        /// Only used in case of full backups
-       BufferParams bparams;
+       BufferParams const * bparams;
        /// Only used in case of full backups
        bool isFullBuffer;
 private:
@@ -304,8 +327,9 @@ bool Undo::Private::textUndoOrRedo(DocIterator & cur, bool isUndoOperation)
        UndoElementStack & otherstack = isUndoOperation ?  redostack_ : undostack_;
 
        // Adjust undo stack and get hold of current undo data.
-       UndoElement undo = stack.top();
-       stack.pop();
+       UndoElement & undo = stack.top();
+       // We'll pop the stack only when we're done with this element. So do NOT
+       // try to return early.
 
        // We will store in otherstack the part of the document under 'undo'
        DocIterator cell_dit = undo.cell.asDocIterator(&buffer_.inset());
@@ -321,8 +345,9 @@ bool Undo::Private::textUndoOrRedo(DocIterator & cur, bool isUndoOperation)
        if (undo.isFullBuffer) {
                LASSERT(undo.pars, /**/);
                // This is a full document
-               otherstack.top().bparams = buffer_.params();
-               buffer_.params() = undo.bparams;
+               delete otherstack.top().bparams;
+               otherstack.top().bparams = new BufferParams(buffer_.params());
+               buffer_.params() = *undo.bparams;
                swap(buffer_.paragraphs(), *undo.pars);
                delete undo.pars;
                undo.pars = 0;
@@ -368,7 +393,9 @@ bool Undo::Private::textUndoOrRedo(DocIterator & cur, bool isUndoOperation)
        LASSERT(undo.array == 0, /**/);
 
        cur = undo.cursor.asDocIterator(&buffer_.inset());
-       
+       // Now that we're done with undo, we pop it off the stack.
+       stack.pop();
+
        if (labelsUpdateNeeded)
                updateLabels(buffer_);
        undo_finished_ = true;