anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-24 05:40:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* src/text.C: fix change tracking for backspace

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16035 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Michael Schmitt 2006-11-25 00:31:44 +00:00
parent 286a8e2676
commit d7d9af5fa0
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/text.C
View File

@ -1747,21 +1747,13 @@ bool LyXText::backspace(LCursor & cur)
if (cur.pit() == 0)
return dissolveInset(cur);
if (cur.buffer().params().trackChanges) {
// FIXME: Change tracking (MG)
// Previous paragraph, mark "carriage return" as
// deleted:
Paragraph & par = pars_[cur.pit() - 1];
// Take care of a just inserted para break:
// FIXME: change tracking (MG)
if (!par.isInserted(par.size())) {
// FIXME: change tracking (MG)
par.setChange(par.size(), Change(Change::DELETED));
setCursorIntern(cur, cur.pit() - 1, par.size());
Paragraph & prev_par = pars_[cur.pit() - 1];
if (!prev_par.isMergedOnEndOfParDeletion(cur.buffer().params().trackChanges)) {
prev_par.setChange(prev_par.size(), Change(Change::DELETED));
setCursorIntern(cur, cur.pit() - 1, prev_par.size());
return true;
}
}
// The cursor is at the beginning of a paragraph, so
// the backspace will collapse two paragraphs into one.
needsUpdate = backspacePos0(cur);
@ -1776,7 +1768,6 @@ bool LyXText::backspace(LCursor & cur)
// without the dreaded mechanism. (JMarc)
setCursorIntern(cur, cur.pit(), cur.pos() - 1,
false, cur.boundary());
// FIXME: change tracking (MG)
cur.paragraph().eraseChar(cur.pos(), cur.buffer().params().trackChanges);
}