adjust

[lyx.git] / src / paragraph_funcs.cpp

diff --git a/src/paragraph_funcs.cpp b/src/paragraph_funcs.cpp
index cad97a93c4af960c34cb17093278a9d36fc540d1..0de78ee67bd9bc2baf592ab108e14ab502aa648a 100644 (file)
--- a/src/paragraph_funcs.cpp
+++ b/src/paragraph_funcs.cpp
@@ -19,10 +19,11 @@
 #include "Paragraph.h"
 #include "ParagraphParameters.h"
 
+#include <boost/next_prior.hpp>
+
 
 namespace lyx {
 
-using std::string;
 using std::endl;
 
 
@@ -61,7 +62,8 @@ static bool moveItem(Paragraph & fromPar, pos_type fromPos,
 
 
 void breakParagraph(BufferParams const & bparams,
-       ParagraphList & pars, pit_type par_offset, pos_type pos, int flag)
+                   ParagraphList & pars, pit_type par_offset, pos_type pos, 
+                   bool keep_layout)
 {
        // create a new paragraph, and insert into the list
        ParagraphList::iterator tmp =
@@ -77,7 +79,7 @@ void breakParagraph(BufferParams const & bparams,
        tmp->setInsetOwner(par.inInset());
 
        // layout stays the same with latex-environments
-       if (flag) {
+       if (keep_layout) {
                tmp->layout(par.layout());
                tmp->setLabelWidthString(par.params().labelWidthString());
                tmp->params().depth(par.params().depth());
@@ -91,7 +93,7 @@ void breakParagraph(BufferParams const & bparams,
 
        bool const isempty = (par.allowEmpty() && par.empty());
 
-       if (!isempty && (par.size() > pos || par.empty() || flag == 2)) {
+       if (!isempty && (par.size() > pos || par.empty())) {
                tmp->layout(par.layout());
                tmp->params().align(par.params().align());
                tmp->setLabelWidthString(par.params().labelWidthString());
@@ -143,7 +145,7 @@ void breakParagraph(BufferParams const & bparams,
        }
 
        // layout stays the same with latex-environments
-       if (flag) {
+       if (keep_layout) {
                par.layout(tmp->layout());
                par.setLabelWidthString(tmp->params().labelWidthString());
                par.params().depth(tmp->params().depth());
@@ -314,7 +316,7 @@ int numberOfOptArgs(Paragraph const & par)
        InsetList::const_iterator it = par.insetlist.begin();
        InsetList::const_iterator end = par.insetlist.end();
        for (; it != end ; ++it) {
-               if (it->inset->lyxCode() == Inset::OPTARG_CODE)
+               if (it->inset->lyxCode() == OPTARG_CODE)
                        ++num;
        }
        return num;