* GuiToolbar.cpp:

[lyx.git] / src / paragraph_funcs.cpp

diff --git a/src/paragraph_funcs.cpp b/src/paragraph_funcs.cpp
index 2b2f5ab18314fcd6f62b35ae3bd8607e2dd56906..7c8c5ab0d1c1888c7467743d95230aa0ccbf1123 100644 (file)
--- a/src/paragraph_funcs.cpp
+++ b/src/paragraph_funcs.cpp
@@ -23,6 +23,7 @@
 
 #include "support/debug.h"
 
+#include "support/lassert.h"
 #include <boost/next_prior.hpp>
 
 using namespace std;
@@ -76,10 +77,7 @@ void breakParagraph(BufferParams const & bparams,
        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.textClass().emptyLayout());
-       else
-               tmp->setLayout(bparams.textClass().defaultLayout());
+       tmp->setPlainOrDefaultLayout(bparams.documentClass());
 
        // layout stays the same with latex-environments
        if (keep_layout) {
@@ -144,7 +142,7 @@ void breakParagraph(BufferParams const & bparams,
                par.params().clear();
                // do not lose start of appendix marker (bug 4212)
                par.params().startOfAppendix(soa);
-               par.setLayout(bparams.textClass().defaultLayout());
+               par.setPlainOrDefaultLayout(bparams.documentClass());
        }
 
        // layout stays the same with latex-environments
@@ -166,7 +164,7 @@ void breakParagraphConservative(BufferParams const & bparams,
 
        tmp.makeSameLayout(par);
 
-       BOOST_ASSERT(pos <= par.size());
+       LASSERT(pos <= par.size(), /**/);
 
        if (pos < par.size()) {
                // move everything behind the break position to the new paragraph
@@ -267,8 +265,8 @@ int getEndLabel(pit_type p, ParagraphList const & pars)
        pit_type pit = p;
        depth_type par_depth = pars[p].getDepth();
        while (pit != pit_type(pars.size())) {
-               LayoutPtr const & layout = pars[pit].layout();
-               int const endlabeltype = layout->endlabeltype;
+               Layout const & layout = pars[pit].layout();
+               int const endlabeltype = layout.endlabeltype;
 
                if (endlabeltype != END_LABEL_NO_LABEL) {
                        if (p + 1 == pit_type(pars.size()))
@@ -302,7 +300,7 @@ Font const outerFont(pit_type par_offset, ParagraphList const & pars)
               && !tmpfont.resolved()) {
                par_offset = outerHook(par_offset, pars);
                if (par_offset != pit_type(pars.size())) {
-                       tmpfont.realize(pars[par_offset].layout()->font);
+                       tmpfont.realize(pars[par_offset].layout().font);
                        par_depth = pars[par_offset].getDepth();
                }
        }