Revert 23154.

[lyx.git] / src / paragraph_funcs.cpp

diff --git a/src/paragraph_funcs.cpp b/src/paragraph_funcs.cpp
index 2f87daf5b59d553417418371384dfc34fcdc7750..991341ab5f0a33ebd118aeadacecf5156291bd82 100644 (file)
--- a/src/paragraph_funcs.cpp
+++ b/src/paragraph_funcs.cpp
@@ -14,7 +14,6 @@
 
 #include "BufferParams.h"
 #include "Changes.h"
-#include "support/debug.h"
 #include "InsetList.h"
 #include "Layout.h"
 #include "Paragraph.h"
@@ -22,6 +21,8 @@
 #include "Text.h"
 #include "TextClass.h"
 
+#include "support/debug.h"
+
 #include <boost/next_prior.hpp>
 
 using namespace std;
@@ -71,20 +72,23 @@ void breakParagraph(BufferParams const & bparams,
 
        Paragraph & par = pars[par_offset];
 
-       // without doing that we get a crash when typing <Return> at the
-       // end of a paragraph
-       tmp->layout(bparams.getTextClass().defaultLayout());
        // remember to set the inset_owner
        tmp->setInsetOwner(par.inInset());
+       // without doing that we get a crash when typing <Return> at the
+       // end of a paragraph
+       if (par.useEmptyLayout())
+               tmp->setLayout(bparams.getTextClass().emptyLayout());
+       else
+               tmp->setLayout(bparams.getTextClass().defaultLayout());
 
        // layout stays the same with latex-environments
        if (keep_layout) {
-               tmp->layout(par.layout());
+               tmp->setLayout(par.layout());
                tmp->setLabelWidthString(par.params().labelWidthString());
                tmp->params().depth(par.params().depth());
        } else if (par.params().depth() > 0) {
                Paragraph const & hook = pars[outerHook(par_offset, pars)];
-               tmp->layout(hook.layout());
+               tmp->setLayout(hook.layout());
                // not sure the line below is useful
                tmp->setLabelWidthString(par.params().labelWidthString());
                tmp->params().depth(hook.params().depth());
@@ -93,7 +97,7 @@ void breakParagraph(BufferParams const & bparams,
        bool const isempty = (par.allowEmpty() && par.empty());
 
        if (!isempty && (par.size() > pos || par.empty())) {
-               tmp->layout(par.layout());
+               tmp->setLayout(par.layout());
                tmp->params().align(par.params().align());
                tmp->setLabelWidthString(par.params().labelWidthString());
 
@@ -140,12 +144,12 @@ void breakParagraph(BufferParams const & bparams,
                par.params().clear();
                // do not lose start of appendix marker (bug 4212)
                par.params().startOfAppendix(soa);
-               par.layout(bparams.getTextClass().defaultLayout());
+               par.setLayout(bparams.getTextClass().defaultLayout());
        }
 
        // layout stays the same with latex-environments
        if (keep_layout) {
-               par.layout(tmp->layout());
+               par.setLayout(tmp->layout());
                par.setLabelWidthString(tmp->params().labelWidthString());
                par.params().depth(tmp->params().depth());
        }