From c1dbcb6f066cbf6cb551b2a512acc15db08970c5 Mon Sep 17 00:00:00 2001 From: Michael Schmitt Date: Thu, 26 Oct 2006 20:44:00 +0000 Subject: [PATCH] change tracking: * src/paragraph_pimpl.C: only reject an inset's content if the inset itself is UNCHANGED git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15572 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/paragraph_pimpl.C | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C index e7b1b57102..63f03be183 100644 --- a/src/paragraph_pimpl.C +++ b/src/paragraph_pimpl.C @@ -187,6 +187,10 @@ void Paragraph::Pimpl::rejectChanges(pos_type start, pos_type end) for (pos_type pos = start; pos < end; ++pos) { switch (lookupChange(pos).type) { case Change::UNCHANGED: + // also reject changes inside of insets + if (pos < size() && owner_->isInset(pos)) { + owner_->getInset(pos)->rejectChanges(); + } break; case Change::INSERTED: @@ -201,12 +205,11 @@ void Paragraph::Pimpl::rejectChanges(pos_type start, pos_type end) case Change::DELETED: changes_.set(Change(Change::UNCHANGED), pos); - break; - } - // also reject changes in nested insets - if (pos < size() && owner_->isInset(pos)) { - owner_->getInset(pos)->rejectChanges(); + // Do NOT reject changes within a deleted inset! + // There may be insertions of a co-author inside of it! + + break; } } } -- 2.39.2