This comment is wrong and causes bug in revision control.

[lyx.git] / src / paragraph_funcs.cpp

diff --git a/src/paragraph_funcs.cpp b/src/paragraph_funcs.cpp
index 625d258d7d7271e3ac5c82d4107f00d1864a5006..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,7 +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
-       tmp->setEmptyOrDefaultLayout(bparams.documentClass());
+       tmp->setPlainOrDefaultLayout(bparams.documentClass());
 
        // layout stays the same with latex-environments
        if (keep_layout) {
@@ -141,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.setEmptyOrDefaultLayout(bparams.documentClass());
+               par.setPlainOrDefaultLayout(bparams.documentClass());
        }
 
        // layout stays the same with latex-environments
@@ -163,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