#include "BufferParams.h"
#include "Changes.h"
-#include "support/debug.h"
#include "InsetList.h"
#include "Layout.h"
#include "Paragraph.h"
#include "Text.h"
#include "TextClass.h"
+#include "support/debug.h"
+
#include <boost/next_prior.hpp>
+using namespace std;
namespace lyx {
-using std::endl;
-
-
static bool moveItem(Paragraph & fromPar, pos_type fromPos,
Paragraph & toPar, pos_type toPos, BufferParams const & params)
{
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
+ tmp->setEmptyOrDefaultLayout(bparams.documentClass());
// 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());
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());
par.params().clear();
// do not lose start of appendix marker (bug 4212)
par.params().startOfAppendix(soa);
- par.layout(bparams.getTextClass().defaultLayout());
+ par.setEmptyOrDefaultLayout(bparams.documentClass());
}
// 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());
}