#include "support/debug.h"
+#include "support/lassert.h"
#include <boost/next_prior.hpp>
using namespace std;
tmpInset = fromPar.releaseInset(fromPos);
}
- if (!toPar.insetAllowed(tmpInset->lyxCode())) {
+ if (!toPar.inInset().insetAllowed(tmpInset->lyxCode())) {
delete tmpInset;
return false;
}
Paragraph & par = pars[par_offset];
// remember to set the inset_owner
- tmp->setInsetOwner(par.inInset());
+ tmp->setInsetOwner(&par.inInset());
// without doing that we get a crash when typing <Return> at the
// end of a paragraph
- tmp->setEmptyOrDefaultLayout(bparams.textClass());
+ tmp->setPlainOrDefaultLayout(bparams.documentClass());
// layout stays the same with latex-environments
if (keep_layout) {
par.params().clear();
// do not lose start of appendix marker (bug 4212)
par.params().startOfAppendix(soa);
- par.setEmptyOrDefaultLayout(bparams.textClass());
+ par.setPlainOrDefaultLayout(bparams.documentClass());
}
// layout stays the same with latex-environments
Paragraph());
Paragraph & par = pars[par_offset];
+ tmp.setInsetOwner(&par.inInset());
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
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()))
&& !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();
}
}