#include "paragraph_funcs.h"
#include "bufferparams.h"
-#include "lyxtext.h"
-#include "paragraph_pimpl.h"
#include "debug.h"
+#include "lyxtext.h"
+#include "paragraph.h"
+#include "ParagraphParameters.h"
namespace lyx {
// marked as unmodified. Otherwise, its change is adopted by the first
// character of the next paragraph.
if (par.lookupChange(par.size()).type != Change::UNCHANGED) {
- lyxerr[Debug::CHANGES] <<
+ LYXERR(Debug::CHANGES) <<
"merging par with inserted/deleted end-of-par character" << endl;
par.setChange(par.size(), Change(Change::UNCHANGED));
}
pit_type dhook_offset = depthHook(par_offset, pars, par.getDepth());
+ if (dhook_offset == par_offset)
+ return true;
+
Paragraph const & dhook = pars[dhook_offset];
- return dhook_offset == par_offset
- || dhook.layout() != par.layout()
+ return dhook.layout() != par.layout()
|| dhook.getDepth() != par.getDepth();
}