anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-28 03:50:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

change tracking:

Browse Source 
* src/paragraph_pimpl.C: in method erase(),
	set the character to DELETED if
	a) it was previously unchanged or
	b) it was inserted by a co-author



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15573 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Michael Schmitt 2006-10-26 21:06:55 +00:00
parent c1dbcb6f06
commit af54be2d01
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/paragraph_pimpl.C
View File

@ -273,14 +273,19 @@ bool Paragraph::Pimpl::eraseChar(pos_type pos, bool trackChanges)
BOOST_ASSERT(pos >= 0 && pos <= size()); BOOST_ASSERT(pos >= 0 && pos <= size());
if (trackChanges) { if (trackChanges) {
Change::Type changetype(changes_.lookup(pos).type); Change change = changes_.lookup(pos);
if (changetype == Change::UNCHANGED) { // set the character to DELETED if
// a) it was previously unchanged or
// b) it was inserted by a co-author
if (change.type == Change::UNCHANGED ||
(change.type == Change::INSERTED && change.author != 0)) {
setChange(pos, Change(Change::DELETED)); setChange(pos, Change(Change::DELETED));
return false; return false;
} }
if (changetype == Change::DELETED) if (change.type == Change::DELETED)
return false; return false;
} }