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

Fixed stupid bug introduced in my last fix.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3262 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Vigna 2001-12-24 10:15:17 +00:00
parent a17655b05b
commit 455a8f6ca2
2 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2001-12-24 Juergen Vigna <jug@sad.it>
* undo_funcs.C (textHandleUndo): fixed a stupid earlier wrong fix
which then did not anymore update the main paragraphs on undo/redo!
2001-12-21 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* lyxfunc.C (getStatus): use func_status::toggle to simplify the

58
src/undo_funcs.C
View File

@ -215,37 +215,37 @@ bool textHandleUndo(BufferView * bv, Undo * undo)
endpar = behind->next();
tmppar = bv->buffer()->getParFromID(undo->number_of_cursor_par);
if (tmppar3) {
UpdatableInset* it = static_cast<UpdatableInset*>(tmppar3->inInset());
if (it) {
it->getLyXText(bv)->redoParagraphs(bv,
it->getLyXText(bv)->cursor,
endpar);
LyXFont font;
it->update(bv, font, false);
// we now would have to rebreak the whole paragraph the
// undo-par was in. How we do it here is not really true.
// We would have to save this information in the undo-struct
// and then we could do the right rebreak. Here we only
// handle the case where this was in the actual paragraph,
// which not always is true.
bv->text->redoParagraphs(bv, bv->text->cursor,
bv->text->cursor.par());
if (tmppar){
it = static_cast<UpdatableInset*>(tmppar->inInset());
LyXText * t;
if (it) {
it->edit(bv);
t = it->getLyXText(bv);
} else {
t = bv->text;
}
t->setCursorIntern(bv, tmppar, undo->cursor_pos);
t->updateCounters(bv, t->cursor.row());
UpdatableInset* it = 0;
if (tmppar3)
it = static_cast<UpdatableInset*>(tmppar3->inInset());
if (it) {
it->getLyXText(bv)->redoParagraphs(bv,
it->getLyXText(bv)->cursor,
endpar);
LyXFont font;
it->update(bv, font, false);
// we now would have to rebreak the whole paragraph the
// undo-par was in. How we do it here is not really true.
// We would have to save this information in the undo-struct
// and then we could do the right rebreak. Here we only
// handle the case where this was in the actual paragraph,
// which not always is true.
bv->text->redoParagraphs(bv, bv->text->cursor,
bv->text->cursor.par());
if (tmppar){
it = static_cast<UpdatableInset*>(tmppar->inInset());
LyXText * t;
if (it) {
it->edit(bv);
t = it->getLyXText(bv);
} else {
t = bv->text;
}
bv->text->setCursorIntern(bv, bv->text->cursor.par(),
bv->text->cursor.pos());
t->setCursorIntern(bv, tmppar, undo->cursor_pos);
t->updateCounters(bv, t->cursor.row());
}
bv->text->setCursorIntern(bv, bv->text->cursor.par(),
bv->text->cursor.pos());
} else {
bv->text->redoParagraphs(bv, bv->text->cursor, endpar);
if (tmppar) {