#include "Compare.h"
#include "Author.h"
+#include "Buffer.h"
#include "BufferParams.h"
#include "Changes.h"
#include "CutAndPaste.h"
#include "support/docstream.h"
#include "support/lassert.h"
-#include "support/lyxalgo.h"
#include "support/qstring_helpers.h"
using namespace std;
DocPair()
{}
- DocPair(DocIterator o_, DocIterator n_)
+ DocPair(DocIterator const & o_, DocIterator const & n_)
: o(o_), n(n_)
{}
- bool operator!=(DocPair const & rhs)
+ bool operator!=(DocPair const & rhs) const
{
// this might not be intuitive but correct for our purpose
return o != rhs.o && n != rhs.n;
///
Impl(Compare const & compare)
: abort_(false), n_(0), m_(0), offset_reverse_diagonal_(0),
- odd_offset_(0), compare_(compare),
+ odd_offset_(false), compare_(compare),
old_buf_(nullptr), new_buf_(nullptr), dest_buf_(nullptr),
dest_pars_(nullptr), recursion_level_(0), nested_inset_level_(0), D_(0)
{}
dest_buffer->params().documentClassPtr();
// We do not want to share the DocumentClass with the other Buffer.
// See bug #10295.
- dest_buffer->params().makeDocumentClass();
+ dest_buffer->params().makeDocumentClass(dest_buffer->isClone(), dest_buffer->isInternal());
doStatusMessage();
// Do the real work
// new buffer with the document class from wherever they came from.
// So we need to reset the document class of all the paragraphs.
// See bug #10295.
- ErrorList el;
cap::switchBetweenClasses(
olddc, dest_buffer->params().documentClassPtr(),
- static_cast<InsetText &>(dest_buffer->inset()), el);
+ static_cast<InsetText &>(dest_buffer->inset()));
finished(pimpl_->abort_);
- return;
}
pit_type startpit = range.from.pit();
pit_type endpit = range.to.pit();
ParagraphList const & ps_ = range.text()->paragraphs();
- ParagraphList tmp_pars(lyx::next(ps_.begin(), startpit),
- lyx::next(ps_.begin(), endpit + 1));
+ ParagraphList tmp_pars(ps_.iterator_at(startpit),
+ ps_.iterator_at(endpit + 1));
// Remove the end of the last paragraph; afterwards, remove the
// beginning of the first paragraph. Keep this order - there may only
void Compare::Impl::writeToDestBuffer(ParagraphList const & pars) const
{
+ pit_type const pit = dest_pars_->size() - 1;
dest_pars_->insert(dest_pars_->end(), pars.begin(), pars.end());
- pit_type pit = dest_pars_->size();
- if (pit > 0)
- mergeParagraph(dest_buf_->params(), *dest_pars_, pit - 1);
+ if (pit >= 0)
+ mergeParagraph(dest_buf_->params(), *dest_pars_, pit);
}