anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Possible fix for bug #10295."

Browse Source 
This reverts commit 9b0b45dc81.

(committed by mistake)
This commit is contained in:
Jean-Marc Lasgouttes 2017-04-03 12:29:09 +02:00
parent 0005876d17
commit 91b58cc633
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Compare.cpp
View File

@ -15,8 +15,6 @@
#include "Author.h" #include "Author.h"
#include "BufferParams.h" #include "BufferParams.h"
#include "Changes.h" #include "Changes.h"
#include "CutAndPaste.h"
#include "ErrorList.h"
#include "Font.h" #include "Font.h"
#include "insets/InsetText.h" #include "insets/InsetText.h"
@ -385,15 +383,6 @@ void Compare::run()
dest_buffer->params() = options_.settings_from_new dest_buffer->params() = options_.settings_from_new
? new_buffer->params() : old_buffer->params(); ? new_buffer->params() : old_buffer->params();
// We do not want to share the DocumentClass with the other Buffer
// See bug #10295
DocumentClassConstPtr olddc = dest_buffer->params().documentClassPtr();
dest_buffer->params().makeDocumentClass();
ErrorList el;
cap::switchBetweenClasses(
olddc, dest_buffer->params().documentClassPtr(),
static_cast<InsetText &>(dest_buffer->inset()), el);
// Copy extra authors to the destination buffer // Copy extra authors to the destination buffer
AuthorList const & extra_authors = options_.settings_from_new ? AuthorList const & extra_authors = options_.settings_from_new ?
old_buffer->params().authors() : new_buffer->params().authors(); old_buffer->params().authors() : new_buffer->params().authors();