X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCompare.cpp;h=214f25cc7f7d6dee5b45abf3c8934902a4c2eab2;hb=1e519d1115f41f71c253cb9e2fbb7803e9a583a9;hp=fee569907d1892c1039a8fef30f429f9937f9a30;hpb=9b0b45dc81e8f1bc5cf370f0a9a8f60b8d93f4e6;p=lyx.git

diff --git a/src/Compare.cpp b/src/Compare.cpp
index fee569907d..214f25cc7f 100644
--- a/src/Compare.cpp
+++ b/src/Compare.cpp
@@ -384,16 +384,6 @@ void Compare::run()
 	// Copy the buffer params to the destination buffer
 	dest_buffer->params() = options_.settings_from_new
 		? new_buffer->params() : old_buffer->params();
-	
-	// We do not want to share the DocumentClass with the other Buffer
-	// See bug #10295
-	DocumentClassConstPtr olddc = dest_buffer->params().documentClassPtr();
-	dest_buffer->params().makeDocumentClass();
-	ErrorList el;
-	cap::switchBetweenClasses(
-			olddc, dest_buffer->params().documentClassPtr(),
-			static_cast<InsetText &>(dest_buffer->inset()), el);
-	
 	// Copy extra authors to the destination buffer
 	AuthorList const & extra_authors = options_.settings_from_new ?
 		old_buffer->params().authors() : new_buffer->params().authors();
@@ -401,12 +391,27 @@ void Compare::run()
 	for (; it != extra_authors.end(); ++it)
 		dest_buffer->params().authors().record(*it);
 
-	doStatusMessage();
+	// We will need this later
+	DocumentClassConstPtr const olddc =
+		dest_buffer->params().documentClassPtr();
+	// We do not want to share the DocumentClass with the other Buffer.
+	// See bug #10295.
+	dest_buffer->params().makeDocumentClass();
 
-	// do the real work
+	doStatusMessage();
+	// Do the real work
 	if (!doCompare())
 		return;
 
+	// The comparison routine simply copies the paragraphs over into the
+	// 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);
+
 	finished(pimpl_->abort_);
 	return;
 }
@@ -731,7 +736,7 @@ bool Compare::Impl::diff(Buffer const * new_buf, Buffer const * old_buf,
 		diff_i(rp_new);
 
 	for (pit_type p = 0; p < (pit_type)dest_pars_->size(); ++p) {
-		(*dest_pars_)[p].setBuffer(const_cast<Buffer &>(*dest_buf));
+		(*dest_pars_)[p].setInsetBuffers(const_cast<Buffer &>(*dest_buf));
 		(*dest_pars_)[p].setInsetOwner(&dest_buf_->inset());
 	}