improved comments in removeAutoInsets()

[lyx.git] / src / BufferView_pimpl.C

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index ef79987295c11db738a4c1e8c20dd5aeacfa2712..220390374e5b8989bf4b948f6a9abfefda0a3c84 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -2624,13 +2624,13 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                        if (cursor.par()->params().spaceTop() == VSpace(VSpace::NONE)) {
                                lt->setParagraph
                                        (bv_,
-                                        cursor.par()->params().lineTop(),      
+                                        cursor.par()->params().lineTop(),
                                         cursor.par()->params().lineBottom(),
-                                        cursor.par()->params().pagebreakTop(), 
+                                        cursor.par()->params().pagebreakTop(),
                                         cursor.par()->params().pagebreakBottom(),
                                         VSpace(VSpace::DEFSKIP), cursor.par()->params().spaceBottom(),
-                                        cursor.par()->params().spacing(), 
-                                        cursor.par()->params().align(), 
+                                        cursor.par()->params().spacing(),
+                                        cursor.par()->params().align(),
                                         cursor.par()->params().labelWidthString(), 1);
                                //update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                        } 
@@ -3279,9 +3279,8 @@ void BufferView::Pimpl::specialChar(InsetSpecialChar::Kind kind)
                update(lt, BufferView::SELECT|BufferView::FITCUR);
                InsetSpecialChar * new_inset = 
                        new InsetSpecialChar(kind);
-               insertInset(new_inset);
-               // Ok, what happens here if we are unable to insert
-               // the inset? Leak it?
+               if (!insertInset(new_inset))
+                       delete new_inset;
        }
 }
 
@@ -3412,8 +3411,7 @@ void BufferView::Pimpl::updateInset(Inset * inset, bool mark_dirty)
                                return;
                        }
                } else if (bv_->theLockingInset()->updateInsetInInset(bv_, inset)) {
-                       if (bv_->text->updateInset(bv_,
-                                                  bv_->theLockingInset())) {
+                       if (bv_->text->updateInset(bv_,  bv_->theLockingInset())) {
                                update();
                                if (mark_dirty){
                                        buffer_->markDirty();
@@ -3467,9 +3465,9 @@ void BufferView::Pimpl::gotoInset(vector<Inset::Code> const & codes,
  
        if (!bv_->text->gotoNextInset(bv_, codes, contents)) {
                if (bv_->text->cursor.pos() 
-                   || bv_->text->cursor.par() != bv_->text->firstParagraph()) {
+                   || bv_->text->cursor.par() != bv_->text->ownerParagraph()) {
                        LyXCursor tmp = bv_->text->cursor;
-                       bv_->text->cursor.par(bv_->text->firstParagraph());
+                       bv_->text->cursor.par(bv_->text->ownerParagraph());
                        bv_->text->cursor.pos(0);
                        if (!bv_->text->gotoNextInset(bv_, codes, contents)) {
                                bv_->text->cursor = tmp;