From 16e093636f79d9740cc9c24e3f488b06da3a3b30 Mon Sep 17 00:00:00 2001 From: Martin Vermeer Date: Fri, 19 Aug 2005 12:57:47 +0000 Subject: [PATCH] Fix bug 1981 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10399 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/mathed/ChangeLog | 6 ++++++ src/mathed/math_nestinset.C | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index 676d68c9dc..749c44d56b 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,9 @@ + +2005-08-19 Martin Vermeer + + * math_nestinset.C (doDispatch): fix crash when deleting across rows + in math array, and block multi-cell cut/copy leading to data loss + 2005-07-26 Georg Baum * math_factory.C (initSymbols): Don't require wasysym for the wasy diff --git a/src/mathed/math_nestinset.C b/src/mathed/math_nestinset.C index a71327a84e..245055ef9e 100644 --- a/src/mathed/math_nestinset.C +++ b/src/mathed/math_nestinset.C @@ -423,6 +423,7 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd) } case LFUN_CUT: + cur.pos() = 0; // Prevent stale position >= size crash cutSelection(cur, true, true); cur.message(_("Cut")); break; @@ -814,7 +815,9 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd) if (rs.empty()) rs = ')'; recordUndo(cur, Undo::ATOMIC); - cur.handleNest(MathAtom(new MathDelimInset(ls, rs))); + // Don't do this with multi-cell selections + if (cur.selBegin().idx() == cur.selEnd().idx()) + cur.handleNest(MathAtom(new MathDelimInset(ls, rs))); break; } -- 2.39.2