X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FCompare.cpp;h=82236aa8de7f5eea7af0d69ec15d2ff8bf2b6290;hb=1dc55bd88b9671ade0b3ad84fcbd992db1c66ca3;hp=7d90891fa85f94000b5bb7f1dbd4c2d9cfed37ec;hpb=1582a2afe1abf2a01ac573aae2440c63b114d3d4;p=lyx.git diff --git a/src/Compare.cpp b/src/Compare.cpp index 7d90891fa8..82236aa8de 100644 --- a/src/Compare.cpp +++ b/src/Compare.cpp @@ -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_); } @@ -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(); }