X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCompare.cpp;h=17bd0120647843603cdf7e19e205d3042dedf483;hb=d79637a88e368d8e67e4b38ddcf25a4b7f40176e;hp=51a28f16ec88a41c6a0762f4a0ff0651f3a6905d;hpb=a7018252b75316b7855f04c51be2342dc269f96c;p=lyx.git diff --git a/src/Compare.cpp b/src/Compare.cpp index 51a28f16ec..17bd012064 100644 --- a/src/Compare.cpp +++ b/src/Compare.cpp @@ -103,7 +103,7 @@ public: DocPair() {} - DocPair(DocIterator o_, DocIterator n_) + DocPair(DocIterator const & o_, DocIterator const & n_) : o(o_), n(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(dest_buffer->inset()), el); + static_cast(dest_buffer->inset())); finished(pimpl_->abort_); }