2005-08-19 Lars Gullik Bj����nnes <larsbj@gullik.net>

* CutAndPaste.C (eraseSelectionHelper): fix bug 1920
use old deleteion algorithm when changetracking is on.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10400 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2005-08-19 16:22:22 +00:00
parent 16e093636f
commit 411ece2787
2 changed files with 23 additions and 3 deletions

View File

@ -1,3 +1,7 @@
2005-08-19 Lars Gullik Bjønnes <larsbj@gullik.net>
* CutAndPaste.C (eraseSelectionHelper): fix bug 1920
use old deleteion algorithm when changetracking is on.
2005-08-18 Martin Vermeer <martin.vermeer@hut.fi>

View File

@ -278,8 +278,24 @@ PitPosPair eraseSelectionHelper(BufferParams const & params,
all_erased = false;
// Erase all the "middle" paragraphs.
pars.erase(pars.begin() + startpit + 1, pars.begin() + endpit);
endpit = startpit + 1;
if (params.tracking_changes) {
// Look through the deleted pars if any, erasing as needed
for (pit_type pit = startpit + 1; pit != endpit;) {
// "erase" the contents of the par
pars[pit].erase(0, pars[pit].size());
if (pars[pit].empty()) {
// remove the par if it's now empty
pars.erase(pars.begin() + pit);
--endpit;
} else {
++pit;
all_erased = false;
}
}
} else {
pars.erase(pars.begin() + startpit + 1, pars.begin() + endpit);
endpit = startpit + 1;
}
#if 0 // FIXME: why for cut but not copy ?
// the cut selection should begin with standard layout