anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-10 20:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

restore undo on parlist level.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7912 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2003-10-13 13:59:45 +00:00
parent b79331e005
commit 0336ebd447
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/undo_funcs.C
View File

@ -64,23 +64,12 @@ void recordUndo(BufferView * bv, Undo::undo_kind kind,
for (ParIterator it = buf->par_iterator_begin(); it != null; ++it, ++pcount) for (ParIterator it = buf->par_iterator_begin(); it != null; ++it, ++pcount)
if (&it.plist() == &plist) if (&it.plist() == &plist)
break; break;
//lyxerr << "This is plist #" << pcount << ' ' << &plist << endl;
// We simply record the entire outer paragraphs
// First, identify the outer paragraphs
for (ParIterator it = buf->par_iterator_begin(); it != null; ++it) {
if (it->id() == first->id())
first = it.outerPar();
if (it->id() == last->id())
last = it.outerPar();
}
// And calculate a stable reference to them // And calculate a stable reference to them
int const first_offset = firstpar; int const first_offset = firstpar;
int const last_offset = plist.size() - lastpar; int const last_offset = plist.size() - lastpar;
// Undo::ATOMIC are always recorded (no overlapping there). // Undo::ATOMIC are always recorded (no overlapping there).
// Overlapping only with insert and delete inside one paragraph: // Overlapping only with insert and delete inside one paragraph:
// Nobody wants all removed character appear one by one when undoing. // Nobody wants all removed character appear one by one when undoing.
if (! undo_finished && kind != Undo::ATOMIC) { if (! undo_finished && kind != Undo::ATOMIC) {
@ -124,14 +113,14 @@ void recordUndo(BufferView * bv, Undo::undo_kind kind,
bool performUndoOrRedo(BufferView * bv, Undo const & undo) bool performUndoOrRedo(BufferView * bv, Undo const & undo)
{ {
Buffer * buf = bv->buffer(); Buffer * buf = bv->buffer();
ParagraphList & plist = buf->paragraphs();
ParIterator null = buf->par_iterator_end(); ParIterator null = buf->par_iterator_end();
ParIterator plit = buf->par_iterator_begin(); ParIterator plit = buf->par_iterator_begin();
int n = undo.plist; int n = undo.plist;
for ( ; n && plit != null; ++plit, --n) for ( ; n && plit != null; ++plit, --n)
; ;
//lyxerr << "undo: using plist #" << undo.plist << " " << &plit.plist() << endl; BOOST_ASSERT(plit != null);
ParagraphList & plist = plit.plist();
// Remove new stuff between first and last // Remove new stuff between first and last
{ {