X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCompare.cpp;h=17bd0120647843603cdf7e19e205d3042dedf483;hb=8f43f83ddfbe6adbb04a2ba86e62797c0a313324;hp=931fe76fafe2ea81091d38e848bb469ae32c2f16;hpb=b9e29418471d0d275650c52f976da300f4f42501;p=lyx.git

diff --git a/src/Compare.cpp b/src/Compare.cpp
index 931fe76faf..17bd012064 100644
--- a/src/Compare.cpp
+++ b/src/Compare.cpp
@@ -13,6 +13,7 @@
 #include "Compare.h"
 
 #include "Author.h"
+#include "Buffer.h"
 #include "BufferParams.h"
 #include "Changes.h"
 #include "CutAndPaste.h"
@@ -23,7 +24,6 @@
 
 #include "support/docstream.h"
 #include "support/lassert.h"
-#include "support/lyxalgo.h"
 #include "support/qstring_helpers.h"
 
 using namespace std;
@@ -103,11 +103,11 @@ public:
 	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;
@@ -232,7 +232,7 @@ public:
 	///
 	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)
 	{}
@@ -396,7 +396,7 @@ void Compare::run()
 		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
@@ -407,13 +407,11 @@ void Compare::run()
 	// 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;
 }
 
 
@@ -439,8 +437,8 @@ static void getParagraphList(DocRange const & range,
 	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
@@ -881,10 +879,10 @@ void Compare::Impl::writeToDestBuffer(DocRange const & range,
 
 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);
 }