X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCompare.cpp;h=82236aa8de7f5eea7af0d69ec15d2ff8bf2b6290;hb=fa6256d3251188662d4cbfffb64b040ef3e47275;hp=1b46e6827d1674d6b454fb431d2332c6db3122a2;hpb=5061db891c2b7b9ca96ca40a3ee90bd9b2c76392;p=lyx.git

diff --git a/src/Compare.cpp b/src/Compare.cpp
index 1b46e6827d..82236aa8de 100644
--- a/src/Compare.cpp
+++ b/src/Compare.cpp
@@ -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,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_);
 }
@@ -867,7 +866,7 @@ void Compare::Impl::writeToDestBuffer(DocRange const & range,
 	// Set the change
 	ParagraphList::iterator it = pars.begin();
 	for (; it != pars.end(); ++it) {
-		it->setChange(Change(type));
+		it->setChange(Change(type, compare_.options_.author));
 		size += it->size();
 	}