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

change tracking:

Browse Source 
* 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
This commit is contained in:
Michael Schmitt 2006-10-26 20:44:00 +00:00
parent 62b09e3dbd
commit c1dbcb6f06
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/paragraph_pimpl.C
View File

@ -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;
}
}
}