if (flag) {
tmp->layout(par.layout());
tmp->setLabelWidthString(par.params().labelWidthString());
+ tmp->params().depth(par.params().depth());
}
bool const isempty = (par.allowEmpty() && par.empty());
pos_type pos_end = par.size() - 1;
for (pos_type i = pos, j = pos; i <= pos_end; ++i) {
- Change::Type change = par.lookupChange(i);
+ Change::Type change = par.lookupChange(i).type;
if (moveItem(par, *tmp, bparams, i, j - pos)) {
tmp->setChange(j - pos, change);
++j;
return;
}
- if (!isempty) {
- par.params().clear();
- par.layout(bparams.getLyXTextClass().defaultLayout());
- }
-
+ if (!isempty) {
+ par.params().clear();
+ par.layout(bparams.getLyXTextClass().defaultLayout());
+ }
+
// layout stays the same with latex-environments
if (flag) {
par.layout(tmp->layout());
pos_type pos_end = par.size() - 1;
for (pos_type i = pos, j = pos; i <= pos_end; ++i) {
- Change::Type change = par.lookupChange(i);
+ Change::Type change = par.lookupChange(i).type;
if (moveItem(par, tmp, bparams, i, j - pos, change))
++j;
}
// Move over end-of-par change attr
- tmp.setChange(tmp.size(), par.lookupChange(par.size()));
+ tmp.setChange(tmp.size(), par.lookupChange(par.size()).type);
// If tracking changes, set all the text that is to be
// erased to Type::INSERTED.
// forcibly to "black" prevents this scenario. -- MV 13.3.2006
par.setChange(par.size(), Change::UNCHANGED);
- Change::Type cr = next.lookupChange(next.size());
+ Change::Type cr = next.lookupChange(next.size()).type;
// ok, now copy the paragraph
for (pos_type i = 0, j = 0; i <= pos_end; ++i) {
- Change::Type change = next.lookupChange(i);
+ Change::Type change = next.lookupChange(i).type;
if (moveItem(next, par, bparams, i, pos_insert + j, change))
++j;
}