Alfredo Braunstein wrote:
> The following patch should fix the crash. The culprit is that
Upmh old patch. See this one instead.
Alfredo
? PosIterator.C-save
? PosIterator.h-save
? all.diff
? bfs.cpp
? files
? save
? frontends/screen.C-save
Index: insets/insetcollapsable.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcollapsable.C,v
retrieving revision 1.231
diff -u -p -u -r1.231 insetcollapsable.C
--- insets/insetcollapsable.C 3 Feb 2004 17:12:34 -0000 1.231
+++ insets/insetcollapsable.C 3 Feb 2004 20:13:16 -0000
@@ -299,13 +299,15 @@ void InsetCollapsable::edit(LCursor & cu
//lyxerr << "InsetCollapsable: edit xy" << endl;
if (status_ == Collapsed) {
setStatus(Open);
+ inset.edit(cur, true);
} else {
if (y <= button_dim.y2)
y = 0;
else
y += inset.ascent() - height_collapsed();
+
+ inset.edit(cur, x, y);
}
- inset.edit(cur, x, y);
}
Index: insets/insettext.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettext.C,v
retrieving revision 1.572
diff -u -p -u -r1.572 insettext.C
--- insets/insettext.C 30 Jan 2004 11:41:04 -0000 1.572
+++ insets/insettext.C 3 Feb 2004 20:13:17 -0000
@@ -253,7 +253,7 @@ void InsetText::updateLocal(LCursor & cu
lv->updateMenubar();
lv->updateToolbar();
if (old_par != cur.par()) {
- lv->setLayout(text_.cursorPar()->layout()->name());
+ lv->setLayout(text_.getPar(cur.par())->layout()->name());
old_par = cur.par();
}
}
@@ -287,7 +287,7 @@ void InsetText::edit(LCursor & cur, bool
setViewCache(&cur.bv());
int const par = left ? 0 : paragraphs().size() - 1;
int const pos = left ? 0 : paragraphs().back().size();
- text_.setCursor(par, pos);
+ text_.setCursor(cur.current(), par, pos);
cur.clearSelection();
finishUndo();
sanitizeEmptyText(cur.bv());
