parlist-22-a.diff

[features.git] / src / text2.C

diff --git a/src/text2.C b/src/text2.C
index b34bc99063387b290b7db708cca0ebeefd0ff9ba..55a7b7c20d50fc46fda361e81922d4dcbba5e1bd 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -393,7 +393,7 @@ LyXText::setLayout(LyXCursor & cur, LyXCursor & sstart_cur,
                ++endpit;
        }
 
-       setUndo(bv(), Undo::EDIT, sstart_cur.par(), undoendpit);
+       setUndo(bv(), Undo::EDIT, sstart_cur.par(), boost::prior(undoendpit));
 
        // ok we have a selection. This is always between sstart_cur
        // and sel_end cursor
@@ -486,7 +486,7 @@ bool LyXText::changeDepth(bv_funcs::DEPTH_CHANGE type, bool test_only)
        ParagraphList::iterator pastend = boost::next(end);
 
        if (!test_only)
-               setUndo(bv(), Undo::EDIT, start, pastend);
+               setUndo(bv(), Undo::EDIT, start, end);
 
        bool changed = false;
 
@@ -588,8 +588,7 @@ void LyXText::setFont(LyXFont const & font, bool toggleall)
        // ok we have a selection. This is always between sel_start_cursor
        // and sel_end cursor
 
-       setUndo(bv(), Undo::EDIT,
-               selection.start.par(), boost::next(selection.end.par()));
+       setUndo(bv(), Undo::EDIT, selection.start.par(), selection.end.par());
        freezeUndo();
        cursor = selection.start;
        while (cursor.par() != selection.end.par() ||
@@ -886,8 +885,14 @@ void LyXText::cursorBottom()
 {
 #warning FIXME
        // This is how it should be:
-       // ParagraphList::iterator lastpit = boost::prior(ownerParagraphs().end());
-       ParagraphList::iterator lastpit = &ownerParagraphs().back();
+#ifndef NO_STD_LIST
+       ParagraphList::iterator lastpit = boost::prior(ownerParagraphs().end());
+#else
+       ParagraphList::iterator lastpit = ownerParagraphs().begin();
+       ParagraphList::iterator end = ownerParagraphs().end();
+       while (boost::next(lastpit) != end)
+               ++lastpit;
+#endif
        int pos = lastpit->size();
        setCursor(lastpit, pos);
 }
@@ -991,7 +996,8 @@ void LyXText::setParagraph(bool line_top, bool line_bottom,
                ++endpit;
        }
 
-       setUndo(bv(), Undo::EDIT, selection.start.par(), undoendpit);
+       setUndo(bv(), Undo::EDIT, selection.start.par(),
+               boost::prior(undoendpit));
 
 
        ParagraphList::iterator tmppit = selection.end.par();
@@ -1191,7 +1197,7 @@ void LyXText::setCounter(Buffer const * buf, ParagraphList::iterator pit)
                                        isOK = true;
                                        break;
                                } else {
-                                       tmppit = in->parOwner();
+                                       tmppit = std::find(ownerParagraphs().begin(), ownerParagraphs().end(), *in->parOwner());
                                }
                        }
 
@@ -1276,8 +1282,7 @@ void LyXText::insertInset(Inset * inset)
 {
        if (!cursor.par()->insetAllowed(inset->lyxCode()))
                return;
-       setUndo(bv(), Undo::FINISH, cursor.par(),
-               boost::next(cursor.par()));
+       setUndo(bv(), Undo::FINISH, cursor.par());
        freezeUndo();
        cursor.par()->insertInset(cursor.pos(), inset);
        // Just to rebreak and refresh correctly.
@@ -1329,7 +1334,8 @@ void LyXText::cutSelection(bool doclear, bool realcut)
                ++endpit;
        }
 
-       setUndo(bv(), Undo::DELETE, selection.start.par(), undoendpit);
+       setUndo(bv(), Undo::DELETE, selection.start.par(),
+               boost::prior(undoendpit));
 
 
        endpit = selection.end.par();
@@ -1401,8 +1407,7 @@ void LyXText::pasteSelection()
        if (!CutAndPaste::checkPastePossible())
                return;
 
-       setUndo(bv(), Undo::INSERT,
-               cursor.par(), boost::next(cursor.par()));
+       setUndo(bv(), Undo::INSERT, cursor.par());
 
        ParagraphList::iterator endpit;
        PitPosPair ppp;
@@ -2264,7 +2269,8 @@ bool LyXText::deleteEmptyParagraphMechanism(LyXCursor const & old_cursor)
                                ++endpit;
                        }
 
-                       setUndo(bv(), Undo::DELETE, old_cursor.par(), endpit);
+                       setUndo(bv(), Undo::DELETE, old_cursor.par(),
+                               boost::prior(endpit));
                        cursor = tmpcursor;
 
                        // delete old row
@@ -2295,7 +2301,7 @@ bool LyXText::deleteEmptyParagraphMechanism(LyXCursor const & old_cursor)
                                ++endpit;
                        }
 
-                       setUndo(bv(), Undo::DELETE, old_cursor.par(), endpit);
+                       setUndo(bv(), Undo::DELETE, old_cursor.par(), boost::prior(endpit));
                        cursor = tmpcursor;
 
                        // delete old row