X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCompare.cpp;h=6c146164567de9170a1250da8278f95c30de34eb;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=68570b85b5fcee49befc572ec5accf9b3e7bd109;hpb=41fda35c596bc9b70da7839cc7a3b8409fed82cc;p=lyx.git

diff --git a/src/Compare.cpp b/src/Compare.cpp
index 68570b85b5..6c14616456 100644
--- a/src/Compare.cpp
+++ b/src/Compare.cpp
@@ -15,10 +15,13 @@
 #include "Author.h"
 #include "BufferParams.h"
 #include "Changes.h"
+#include "CutAndPaste.h"
+#include "ErrorList.h"
 #include "Font.h"
 
 #include "insets/InsetText.h"
 
+#include "support/docstream.h"
 #include "support/lassert.h"
 #include "support/lyxalgo.h"
 #include "support/qstring_helpers.h"
@@ -381,7 +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();
-
 	// Copy extra authors to the destination buffer
 	AuthorList const & extra_authors = options_.settings_from_new ?
 		old_buffer->params().authors() : new_buffer->params().authors();
@@ -389,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;
 }