From 91b58cc633934eb72589dfb519ebf079b78462aa Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Mon, 3 Apr 2017 12:29:09 +0200 Subject: [PATCH] Revert "Possible fix for bug #10295." This reverts commit 9b0b45dc81e8f1bc5cf370f0a9a8f60b8d93f4e6. (committed by mistake) --- src/Compare.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/Compare.cpp b/src/Compare.cpp index fee569907d..b2f64390f0 100644 --- a/src/Compare.cpp +++ b/src/Compare.cpp @@ -15,8 +15,6 @@ #include "Author.h" #include "BufferParams.h" #include "Changes.h" -#include "CutAndPaste.h" -#include "ErrorList.h" #include "Font.h" #include "insets/InsetText.h" @@ -384,16 +382,7 @@ void Compare::run() // Copy the buffer params to the destination buffer dest_buffer->params() = options_.settings_from_new ? 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(dest_buffer->inset()), el); - + // Copy extra authors to the destination buffer AuthorList const & extra_authors = options_.settings_from_new ? old_buffer->params().authors() : new_buffer->params().authors();