Update sk.po

[lyx.git] / src / Compare.cpp

diff --git a/src/Compare.cpp b/src/Compare.cpp
index 49bdac1bfa394b1b3f80dc936d0673bb5a605576..82236aa8de7f5eea7af0d69ec15d2ff8bf2b6290 100644 (file)
--- a/src/Compare.cpp
+++ b/src/Compare.cpp
@@ -103,11 +103,11 @@ public:
        DocPair()
        {}
 
-       DocPair(DocIterator o_, DocIterator n_)
+       DocPair(DocIterator const & o_, DocIterator const & n_)
                : o(o_), n(n_)
        {}
 
-       bool operator!=(DocPair const & rhs)
+       bool operator!=(DocPair const & rhs) const
        {
                // this might not be intuitive but correct for our purpose
                return o != rhs.o && n != rhs.n;
@@ -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();
        }