X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCompare.cpp;h=60a0b65bb14538d630ceda87873543b406b6d973;hb=b96ce9a9c101a711ef8a1cdd5d6fe812a18966da;hp=6c146164567de9170a1250da8278f95c30de34eb;hpb=f9835d054d7aac5830ec6bb5a3537c2b4fa2d269;p=lyx.git diff --git a/src/Compare.cpp b/src/Compare.cpp index 6c14616456..60a0b65bb1 100644 --- a/src/Compare.cpp +++ b/src/Compare.cpp @@ -233,8 +233,8 @@ public: Impl(Compare const & compare) : abort_(false), n_(0), m_(0), offset_reverse_diagonal_(0), odd_offset_(0), compare_(compare), - old_buf_(0), new_buf_(0), dest_buf_(0), dest_pars_(0), - recursion_level_(0), nested_inset_level_(0), D_(0) + old_buf_(nullptr), new_buf_(nullptr), dest_buf_(nullptr), + dest_pars_(nullptr), recursion_level_(0), nested_inset_level_(0), D_(0) {} /// @@ -392,7 +392,7 @@ void Compare::run() dest_buffer->params().authors().record(*it); // We will need this later - DocumentClassConstPtr const olddc = + DocumentClassConstPtr const olddc = dest_buffer->params().documentClassPtr(); // We do not want to share the DocumentClass with the other Buffer. // See bug #10295. @@ -736,7 +736,7 @@ bool Compare::Impl::diff(Buffer const * new_buf, Buffer const * old_buf, diff_i(rp_new); for (pit_type p = 0; p < (pit_type)dest_pars_->size(); ++p) { - (*dest_pars_)[p].setBuffer(const_cast(*dest_buf)); + (*dest_pars_)[p].setInsetBuffers(const_cast(*dest_buf)); (*dest_pars_)[p].setInsetOwner(&dest_buf_->inset()); }