Show branches from master document in branch inset dialog

[lyx.git] / src / Compare.cpp

diff --git a/src/Compare.cpp b/src/Compare.cpp
index 1b46e6827d1674d6b454fb431d2332c6db3122a2..17bd0120647843603cdf7e19e205d3042dedf483 100644 (file)
--- 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_);
 }