X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCompare.cpp;h=17bd0120647843603cdf7e19e205d3042dedf483;hb=3bf1b97ae547aea5d0243e41b2d8af463a6e40c5;hp=490a2ec0bdeb461e7d79cbddce454596cff52d11;hpb=fa6ac23e1c96d3dd39128b827b675738f668e3a4;p=features.git

diff --git a/src/Compare.cpp b/src/Compare.cpp
index 490a2ec0bd..17bd012064 100644
--- a/src/Compare.cpp
+++ b/src/Compare.cpp
@@ -24,7 +24,6 @@
 
 #include "support/docstream.h"
 #include "support/lassert.h"
-#include "support/lyxalgo.h"
 #include "support/qstring_helpers.h"
 
 using namespace std;
@@ -104,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;
@@ -397,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
@@ -408,10 +407,9 @@ 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_);
 }