Remove it for real now.

[lyx.git] / src / Text.cpp

diff --git a/src/Text.cpp b/src/Text.cpp
index 5803c2d4ad07e1fca7be0574d645a9090801e26c..1b57b7bbde9b2c40807705cc492f4071d8525759 100644 (file)
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -171,6 +171,31 @@ void mergeParagraph(BufferParams const & bparams,
 }
 
 
+Text::Text(InsetText * owner, bool use_default_layout)
+       : owner_(owner), autoBreakRows_(false), undo_counter_(0)
+{
+       pars_.push_back(Paragraph());
+       Paragraph & par = pars_.back();
+       par.setInsetOwner(owner);
+       DocumentClass const & dc = owner->buffer().params().documentClass();
+       if (use_default_layout)
+               par.setDefaultLayout(dc);
+       else
+               par.setPlainLayout(dc);
+}
+
+
+Text::Text(InsetText * owner, Text const & text)
+       : owner_(owner), autoBreakRows_(text.autoBreakRows_), undo_counter_(0)
+{
+       pars_ = text.pars_;
+       ParagraphList::iterator const end = pars_.end();
+       ParagraphList::iterator it = pars_.begin();
+       for (; it != end; ++it)
+               it->setInsetOwner(owner);
+}
+
+
 pit_type Text::depthHook(pit_type pit, depth_type depth) const
 {
        pit_type newpit = pit;
@@ -640,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);