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 end-of-par handling (change tracking);

Browse Source 
remove blank lines; add {} around else branch


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16031 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Michael Schmitt 2006-11-24 22:12:04 +00:00
parent 8d31ce8bf4
commit a895406082
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/text.C
View File

@ -1659,22 +1659,17 @@ bool LyXText::erase(LCursor & cur)
cur.forwardPosNoDescend(); cur.forwardPosNoDescend();
needsUpdate = true; needsUpdate = true;
} else if (cur.pit() != cur.lastpit()) { } else if (cur.pit() != cur.lastpit()) {
if (cur.buffer().params().trackChanges if (!par.isMergedOnEndOfParDeletion(cur.buffer().params().trackChanges)) {
&& par.isInserted(cur.pos())) {
// mark "carriage return" as deleted:
// FIXME: Change tracking (MG)
par.setChange(cur.pos(), Change(Change::DELETED)); par.setChange(cur.pos(), Change(Change::DELETED));
cur.forwardPos(); cur.forwardPos();
needsUpdate = true; needsUpdate = true;
} else { } else {
setCursorIntern(cur, cur.pit() + 1, 0); setCursorIntern(cur, cur.pit() + 1, 0);
needsUpdate = backspacePos0(cur); needsUpdate = backspacePos0(cur);
// FIXME: Change tracking (MG)
if (cur.paragraph().isDeleted(cur.pos()))
cur.forwardPos();
} }
} else } else {
needsUpdate = dissolveInset(cur); needsUpdate = dissolveInset(cur);
}
// FIXME: Inserting characters has nothing to do with setting a cursor. // FIXME: Inserting characters has nothing to do with setting a cursor.
// Because of the mix between the model (the paragraph contents) // Because of the mix between the model (the paragraph contents)
@ -1725,7 +1720,7 @@ bool LyXText::backspacePos0(LCursor & cur)
needsUpdate = true; needsUpdate = true;
} }
// Pasting is not allowed, if the paragraphs have different // Pasting is not allowed, if the paragraphs have different
// layout. I think it is a real bug of all other // layouts. I think it is a real bug of all other
// word processors to allow it. It confuses the user. // word processors to allow it. It confuses the user.
// Correction: Pasting is always allowed with standard-layout // Correction: Pasting is always allowed with standard-layout
else if (par.layout() == prevpar.layout() else if (par.layout() == prevpar.layout()
@ -1744,8 +1739,6 @@ bool LyXText::backspacePos0(LCursor & cur)
} }
bool LyXText::backspace(LCursor & cur) bool LyXText::backspace(LCursor & cur)
{ {
BOOST_ASSERT(this == cur.text()); BOOST_ASSERT(this == cur.text());