// 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<InsetText &>(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();
for (; it != extra_authors.end(); ++it)
dest_buffer->params().authors().record(*it);
- doStatusMessage();
+ // We will need this later
+ DocumentClassConstPtr const olddc =
+ dest_buffer->params().documentClassPtr();
+ // We do not want to share the DocumentClass with the other Buffer.
+ // See bug #10295.
+ dest_buffer->params().makeDocumentClass();
- // do the real work
+ doStatusMessage();
+ // Do the real work
if (!doCompare())
return;
+ // The comparison routine simply copies the paragraphs over into the
+ // 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);
+
finished(pimpl_->abort_);
return;
}
diff_i(rp_new);
for (pit_type p = 0; p < (pit_type)dest_pars_->size(); ++p) {
- (*dest_pars_)[p].setBuffer(const_cast<Buffer &>(*dest_buf));
+ (*dest_pars_)[p].setInsetBuffers(const_cast<Buffer &>(*dest_buf));
(*dest_pars_)[p].setInsetOwner(&dest_buf_->inset());
}