don't rm emergency saves ever

[lyx.git] / src / undo_funcs.C

diff --git a/src/undo_funcs.C b/src/undo_funcs.C
index 056677ec4cf6875920f3452183d5fe700346c10f..63cbe37fc91a8a3794116fa191c76df248e8472e 100644 (file)
--- a/src/undo_funcs.C
+++ b/src/undo_funcs.C
@@ -17,7 +17,6 @@
 #include "insets/insettext.h"
 #include "debug.h"
 #include "support/LAssert.h"
-
 #include "iterators.h"
 
 #include <vector>
@@ -47,15 +46,15 @@ LyXCursor const & undoCursor(BufferView * bv)
  * we are so it will return the first paragraph of the buffer or the
  * first paragraph of the textinset we're in.
  */
-Paragraph * firstUndoParagraph(BufferView * bv, int inset_id)
+ParagraphList undoParagraphs(BufferView * bv, int inset_id)
 {
        Inset * inset = bv->buffer()->getInsetFromID(inset_id);
        if (inset) {
-               Paragraph * result = inset->getFirstParagraph(0);
-               if (result)
-                       return result;
+               ParagraphList * result = inset->getParagraphs(0);
+               if (result && !result->empty())
+                       return *result;
        }
-       return &*bv->text->ownerParagraphs().begin();
+       return bv->text->ownerParagraphs();
 }
 
 
@@ -94,18 +93,10 @@ bool textHandleUndo(BufferView * bv, Undo & undo)
                                num = -1;
                        }
                }
-               t->setCursorIntern(firstUndoParagraph(bv, num), 0);
+               t->setCursorIntern(undoParagraphs(bv, num).begin(), 0);
        }
 
-       // Replace the paragraphs with the undo informations.
-       Paragraph * undopar     = undo.pars.empty() ? 0 : undo.pars.front();
-       Paragraph * lastundopar = undo.pars.empty() ? 0 : undo.pars.back();
-
-       // Get last undo par and set the right(new) inset-owner of the
-       // paragraph if there is any. This is not needed if we don't
-       // have a paragraph before because then in is automatically
-       // done in the function which assigns the first paragraph to
-       // an InsetText. (Jug)
+       // Set the right(new) inset-owner of the paragraph if there is any. 
        if (!undo.pars.empty()) {
                Inset * in = 0;
                if (before)
@@ -116,10 +107,7 @@ bool textHandleUndo(BufferView * bv, Undo & undo)
                        undo.pars[i]->setInsetOwner(in);
        }
 
-       // Otherwise the undo destructor would
-       // delete the paragraph.
-       undo.pars.resize(0);
-
+       // Replace the paragraphs with the undo informations.
        vector<Paragraph *> deletelist;
 
        // Now add old paragraphs to be deleted.
@@ -128,11 +116,11 @@ bool textHandleUndo(BufferView * bv, Undo & undo)
                if (before)
                        deletepar = before->next();
                else
-                       deletepar = firstUndoParagraph(bv, undo.number_of_inset_id);
-               Paragraph * tmppar2 = undopar;
+                       deletepar = &undoParagraphs(bv, undo.number_of_inset_id).front();
+               // this surprisingly fills the undo! (Andre')
+               size_t par = 0;
                while (deletepar && deletepar != behind) {
                        deletelist.push_back(deletepar);
-                       Paragraph * tmppar = deletepar;
                        deletepar = deletepar->next();
 
                        // A memory optimization for edit:
@@ -140,8 +128,8 @@ bool textHandleUndo(BufferView * bv, Undo & undo)
                        // is stored in the undo. So restore
                        // the text informations.
                        if (undo.kind == Undo::EDIT) {
-                               tmppar2->setContentsFromPar(*tmppar);
-                               tmppar2 = tmppar2->next();
+                               undo.pars[par]->setContentsFromPar(*deletelist.back());
+                               ++par;
                        }
                }
        }
@@ -151,19 +139,20 @@ bool textHandleUndo(BufferView * bv, Undo & undo)
        // the LyXText works!!!
 
        // Thread the end of the undo onto the par in front if any.
-       if (lastundopar) {
-               lastundopar->next(behind);
+       if (!undo.pars.empty()) {
+               undo.pars.back()->next(behind);
                if (behind)
-                       behind->previous(lastundopar);
+                       behind->previous(undo.pars.back());
        }
 
        // Put the new stuff in the list if there is one.
-       if (undopar) {
-               undopar->previous(before);
+       Paragraph * undopar = undo.pars.empty() ? 0 : undo.pars.front();
+       if (!undo.pars.empty()) {
+               undo.pars.front()->previous(before);
                if (before)
                        before->next(undopar);
                else {
-                       int id = firstUndoParagraph(bv, undo.number_of_inset_id)->id();
+                       int id = undoParagraphs(bv, undo.number_of_inset_id).front().id();
                        Paragraph * op = &*bv->buffer()->getParFromID(id);
                        if (op && op->inInset()) {
                                static_cast<InsetText*>(op->inInset())->paragraph(undopar);
@@ -176,14 +165,13 @@ bool textHandleUndo(BufferView * bv, Undo & undo)
                // have to substitue the second paragraph with the
                // first if the removed one is the first.
                if (!before && behind) {
-                       int id = firstUndoParagraph(bv, undo.number_of_inset_id)->id();
+                       int id = undoParagraphs(bv, undo.number_of_inset_id).front().id();
                        Paragraph * op = &*bv->buffer()->getParFromID(id);
                        if (op && op->inInset()) {
                                static_cast<InsetText*>(op->inInset())->paragraph(behind);
                        } else {
                                bv->buffer()->paragraphs.set(behind);
                        }
-
                        undopar = behind;
                }
        }
@@ -276,6 +264,9 @@ bool textHandleUndo(BufferView * bv, Undo & undo)
                delete (*pit);
        }
 
+       // Otherwise the undo destructor would delete the paragraphs
+       undo.pars.resize(0);
+
        finishUndo();
        bv->text->postPaint(0);
        return true;
@@ -391,7 +382,7 @@ bool textUndoOrRedo(BufferView * bv,
                if (first && first->next())
                        first = first->next();
                else if (!first)
-                       first = firstUndoParagraph(bv, undo->number_of_inset_id);
+                       first = &*undoParagraphs(bv, undo->number_of_inset_id).begin();
                if (first) {
                        shared_ptr<Undo> u;
                        if (createUndo(bv, undo->kind, first,