// the imaginary end-of-paragraph character (at par.size()) has to be
// marked as unmodified. Otherwise, its change is adopted by the first
// character of the next paragraph.
- if (par.lookupChange(par.size()).type != Change::UNCHANGED) {
+ if (par.isChanged(par.size())) {
LYXERR(Debug::CHANGES,
"merging par with inserted/deleted end-of-par character");
par.setChange(par.size(), Change(Change::UNCHANGED));
}
-void setLabelWidthStringToSequence(pit_type par_offset,
+void setLabelWidthStringToSequence(pit_type const par_offset,
ParagraphList & pars, docstring const & s)
{
- Paragraph & par = pars[par_offset];
+ pit_type offset = par_offset;
// Find first of same layout in sequence
- while (!isFirstInSequence(par_offset, pars)) {
- par_offset = depthHook(par_offset, pars, par.getDepth());
- par = pars[par_offset];
+ while (!isFirstInSequence(offset, pars)) {
+ offset = depthHook(offset, pars, pars[offset].getDepth());
}
// now apply label width string to every par
// in sequence
pit_type const end = pars.size();
- depth_type const depth = par.getDepth();
- Layout const & layout = par.layout();
- for (pit_type pit = par_offset; pit != end; ++pit) {
+ depth_type const depth = pars[offset].getDepth();
+ Layout const & layout = pars[offset].layout();
+ for (pit_type pit = offset; pit != end; ++pit) {
while (pars[pit].getDepth() > depth)
++pit;
if (pars[pit].getDepth() < depth)
// check all paragraphs
for (pit_type pit = 0; pit < pars_size; ++pit) {
if (!pars[pit].empty()) // prevent assertion failure
- if (!pars[pit].isFullyDeleted(0, pars[pit].size()))
+ if (!pars[pit].isDeleted(0, pars[pit].size()))
return false;
}
return true;