op-1-a.diff

[lyx.git] / src / undo_funcs.C

diff --git a/src/undo_funcs.C b/src/undo_funcs.C
index 4501d53b116a3e91cb064c639f9b5642393d1859..6235df6fa9b6c19f88ebc0bbbfccada51a167bff 100644 (file)
--- a/src/undo_funcs.C
+++ b/src/undo_funcs.C
@@ -14,6 +14,7 @@
 #include "BufferView.h"
 #include "buffer.h"
 #include "insets/updatableinset.h"
+#include "insets/insettext.h"
 #include "debug.h"
 #include "support/LAssert.h"
 
@@ -53,7 +54,7 @@ Paragraph * firstUndoParagraph(BufferView * bv, int inset_id)
                if (result)
                        return result;
        }
-       return bv->text->ownerParagraph();
+       return &*bv->text->ownerParagraphs().begin();
 }
 
 
@@ -66,7 +67,7 @@ void finishNoUndo(BufferView * bv)
        freezeUndo();
        bv->unlockInset(bv->theLockingInset());
        finishUndo();
-       bv->text->status(bv, LyXText::NEED_MORE_REFRESH);
+       bv->text->postPaint(0);
        unFreezeUndo();
 }
 
@@ -96,7 +97,7 @@ bool textHandleUndo(BufferView * bv, Undo & undo)
                                num = -1;
                        }
                }
-               t->setCursorIntern(bv, firstUndoParagraph(bv, num), 0);
+               t->setCursorIntern(firstUndoParagraph(bv, num), 0);
        }
 
        // replace the paragraphs with the undo informations
@@ -166,17 +167,28 @@ bool textHandleUndo(BufferView * bv, Undo & undo)
                undopar->previous(before);
                if (before)
                        before->next(undopar);
-               else
-                       bv->text->ownerParagraph(firstUndoParagraph(bv, undo.number_of_inset_id)->id(),
-                                                undopar);
-
+               else {
+                       int id = firstUndoParagraph(bv, undo.number_of_inset_id)->id();
+                       Paragraph * op = bv->buffer()->getParFromID(id);
+                       if (op && op->inInset()) {
+                               static_cast<InsetText*>(op->inInset())->paragraph(undopar);
+                       } else {
+                               bv->buffer()->paragraphs.set(undopar);
+                       }
+               }
        } else {
                // We enter here on DELETE undo operations where we have to
                // substitue the second paragraph with the first if the removed
                // one is the first!
                if (!before && behind) {
-                       bv->text->ownerParagraph(firstUndoParagraph(bv, undo.number_of_inset_id)->id(),
-                                                behind);
+                       int id = firstUndoParagraph(bv, undo.number_of_inset_id)->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;
                }
        }
@@ -186,9 +198,9 @@ bool textHandleUndo(BufferView * bv, Undo & undo)
        if (before) { // if we have a par before the undopar
                Inset * it = before->inInset();
                if (it)
-                       it->getLyXText(bv)->setCursorIntern(bv, before, 0);
+                       it->getLyXText(bv)->setCursorIntern(before, 0);
                else
-                       bv->text->setCursorIntern(bv, before, 0);
+                       bv->text->setCursorIntern(before, 0);
        }
 // we are not ready for this we cannot set the cursor for a paragraph
 // which is not already in a row of LyXText!!!
@@ -212,7 +224,7 @@ bool textHandleUndo(BufferView * bv, Undo & undo)
        if (undopar)
                it = static_cast<UpdatableInset*>(undopar->inInset());
        if (it) {
-               it->getLyXText(bv)->redoParagraphs(bv,
+               it->getLyXText(bv)->redoParagraphs(
                                                   it->getLyXText(bv)->cursor,
                                                   endpar);
                if (tmppar) {
@@ -224,19 +236,19 @@ bool textHandleUndo(BufferView * bv, Undo & undo)
                        } else {
                                t = bv->text;
                        }
-                       t->setCursorIntern(bv, tmppar, undo.cursor_pos);
+                       t->setCursorIntern(tmppar, undo.cursor_pos);
                        // clear any selection and set the selection cursor
                        // for an evt. new selection.
                        t->clearSelection();
                        t->selection.cursor = t->cursor;
-                       t->updateCounters(bv);
+                       t->updateCounters();
                        bv->fitCursor();
                }
-               bv->updateInset(it, false);
-               bv->text->setCursorIntern(bv, bv->text->cursor.par(),
+               bv->updateInset(it);
+               bv->text->setCursorIntern(bv->text->cursor.par(),
                                          bv->text->cursor.pos());
        } else {
-               bv->text->redoParagraphs(bv, bv->text->cursor, endpar);
+               bv->text->redoParagraphs(bv->text->cursor, endpar);
                if (tmppar) {
                        LyXText * t;
                        Inset * it = tmppar->inInset();
@@ -246,12 +258,12 @@ bool textHandleUndo(BufferView * bv, Undo & undo)
                        } else {
                                t = bv->text;
                        }
-                       t->setCursorIntern(bv, tmppar, undo.cursor_pos);
+                       t->setCursorIntern(tmppar, undo.cursor_pos);
                        // clear any selection and set the selection cursor
                        // for an evt. new selection.
                        t->clearSelection();
                        t->selection.cursor = t->cursor;
-                       t->updateCounters(bv);
+                       t->updateCounters();
                }
        }
 
@@ -266,7 +278,7 @@ bool textHandleUndo(BufferView * bv, Undo & undo)
                }
 
        finishUndo();
-       bv->text->status(bv, LyXText::NEED_MORE_REFRESH);
+       bv->text->postPaint(0);
        return true;
 }
 
@@ -486,6 +498,6 @@ void setRedo(BufferView * bv, Undo::undo_kind kind,
 
 void setCursorParUndo(BufferView * bv)
 {
-       setUndo(bv, Undo::FINISH, bv->text->cursor.par(),
+       setUndo(bv, Undo::FINISH, &*bv->text->cursor.par(),
                bv->text->cursor.par()->next());
 }