ws changes only

[lyx.git] / src / text2.C

diff --git a/src/text2.C b/src/text2.C
index 9296e2ca15b6da790007c46b3702c3328a77d25c..e3994ced4f73dbe98d570a5ca4f59b3e74a801bc 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -1161,7 +1161,7 @@ void LyXText::cutSelection(bool doclear, bool realcut)
        // and selection.end
 
        // make sure that the depth behind the selection are restored, too
-       ParagraphList::iterator endpit = getPar(selection.end.par() + 1);
+       ParagraphList::iterator endpit = boost::next(getPar(selection.end.par()));
        ParagraphList::iterator undoendpit = endpit;
        ParagraphList::iterator pars_end = ownerParagraphs().end();
 
@@ -1810,8 +1810,13 @@ bool LyXText::deleteEmptyParagraphMechanism(LyXCursor const & old_cursor)
        if (selection.set())
                return false;
 
+       // Don't do anything if the cursor is invalid
+       if (old_cursor.par() == -1)
+               return false;
+
        // We allow all kinds of "mumbo-jumbo" when freespacing.
-       if (getPar(old_cursor)->isFreeSpacing())
+       ParagraphList::iterator const old_pit = getPar(old_cursor);
+       if (old_pit->isFreeSpacing())
                return false;
 
        /* Ok I'll put some comments here about what is missing.
@@ -1838,7 +1843,6 @@ bool LyXText::deleteEmptyParagraphMechanism(LyXCursor const & old_cursor)
        // MISSING
 
        // If the pos around the old_cursor were spaces, delete one of them.
-       ParagraphList::iterator const old_pit = getPar(old_cursor);
        if (old_cursor.par() != cursor.par()
            || old_cursor.pos() != cursor.pos()) {
 
@@ -1890,7 +1894,7 @@ bool LyXText::deleteEmptyParagraphMechanism(LyXCursor const & old_cursor)
 
                deleted = true;
 
-               bool selection_position_was_oldcursor_position = 
+               bool selection_position_was_oldcursor_position =
                        selection.cursor.par() == old_cursor.par()
                        && selection.cursor.pos() == old_cursor.pos();