Micro-optimization.

[lyx.git] / src / Text.cpp

diff --git a/src/Text.cpp b/src/Text.cpp
index c5d1501417853a8f00df2b75b9138147f5af731a..20accf5562f9efb81d2b5322c568347a48eea4c2 100644 (file)
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -665,11 +665,13 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic)
        DocumentClass const & tclass = cur.buffer()->params().documentClass();
        Layout const & layout = cpar.layout();
 
-       // this is only allowed, if the current paragraph is not empty
-       // or caption and if it has not the keepempty flag active
-       if (cur.lastpos() == 0 && !cpar.allowEmpty() &&
-           layout.labeltype != LABEL_SENSITIVE)
+       if (cur.lastpos() == 0 && !cpar.allowEmpty()) {
+               if (changeDepthAllowed(cur, DEC_DEPTH))
+                       changeDepth(cur, DEC_DEPTH);
+               else 
+                       setLayout(cur, tclass.defaultLayoutName());
                return;
+       }
 
        // a layout change may affect also the following paragraph
        recUndo(cur, cur.pit(), undoSpan(cur.pit()) - 1);
@@ -715,7 +717,7 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic)
                        break; // the character couldn't be deleted physically due to change tracking
        }
 
-       cur.buffer()->updateLabels();
+       cur.buffer()->updateBuffer();
 
        // A singlePar update is not enough in this case.
        cur.updateFlags(Update::Force);
@@ -1292,7 +1294,7 @@ void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op)
        cur.clearSelection();
        setCursorIntern(cur, begPit, begPos);
        cur.updateFlags(Update::Force);
-       cur.buffer()->updateLabels();
+       cur.buffer()->updateBuffer();
 }
 
 
@@ -1443,7 +1445,7 @@ bool Text::handleBibitems(Cursor & cur)
                cur.recordUndo(ATOMIC_UNDO, prevcur.pit());
                mergeParagraph(bufparams, cur.text()->paragraphs(),
                                                        prevcur.pit());
-               cur.buffer()->updateLabels();
+               cur.buffer()->updateBuffer();
                setCursorIntern(cur, prevcur.pit(), prevcur.pos());
                cur.updateFlags(Update::Force);
                return true;
@@ -1471,7 +1473,7 @@ bool Text::erase(Cursor & cur)
                        cur.top().forwardPos();
 
                if (was_inset)
-                       cur.buffer()->updateLabels();
+                       cur.buffer()->updateBuffer();
                else
                        cur.checkBufferStructure();
                needsUpdate = true;
@@ -1547,7 +1549,7 @@ bool Text::backspacePos0(Cursor & cur)
        }
 
        if (needsUpdate) {
-               cur.buffer()->updateLabels();
+               cur.buffer()->updateBuffer();
                setCursorIntern(cur, prevcur.pit(), prevcur.pos());
        }
 
@@ -1587,7 +1589,7 @@ bool Text::backspace(Cursor & cur)
                bool const was_inset = cur.paragraph().isInset(cur.pos());
                cur.paragraph().eraseChar(cur.pos(), cur.buffer()->params().trackChanges);
                if (was_inset)
-                       cur.buffer()->updateLabels();
+                       cur.buffer()->updateBuffer();
                else
                        cur.checkBufferStructure();
        }
@@ -1645,7 +1647,7 @@ bool Text::dissolveInset(Cursor & cur)
        } else
                // this is the least that needs to be done (bug 6003)
                // in the above case, pasteParagraphList handles this
-               cur.buffer()->updateLabels();
+               cur.buffer()->updateBuffer();
 
        // Ensure the current language is set correctly (bug 6292)
        cur.text()->setCursor(cur, cur.pit(), cur.pos());