Remove Language::fontenc()

[lyx.git] / src / Compare.cpp

diff --git a/src/Compare.cpp b/src/Compare.cpp
index 2344f2526daf3c545874ace9f34af510b516c096..214f25cc7f7d6dee5b45abf3c8934902a4c2eab2 100644 (file)
--- 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"
@@ -61,10 +64,10 @@ public:
                : from(from_), to(to_)
        {}
 
-       DocRange(Buffer const * buf)
+       DocRange(Buffer const * buf) :
+               from(doc_iterator_begin(buf)),
+               to(doc_iterator_end(buf))
        {
-               from = doc_iterator_begin(buf);
-               to = doc_iterator_end(buf);
                to.backwardPos();
        }
 
@@ -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;
 }
@@ -422,8 +439,8 @@ static void getParagraphList(DocRange const & range,
        pit_type startpit = range.from.pit();
        pit_type endpit = range.to.pit();
        ParagraphList const & ps_ = range.text()->paragraphs();
-       ParagraphList tmp_pars(next(ps_.begin(), startpit),
-               next(ps_.begin(), endpit + 1));
+       ParagraphList tmp_pars(lyx::next(ps_.begin(), startpit),
+               lyx::next(ps_.begin(), endpit + 1));
 
        // Remove the end of the last paragraph; afterwards, remove the
        // beginning of the first paragraph. Keep this order - there may only
@@ -719,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());
        }