Make Helge happy: no more crash on arrow up/down in math macro

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9792 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 8dd46f4b053da67f9d6a420f0c8c5dd7a061c5ad..8391e270cf5841c6ed7e6168db589e2e5d2365fc 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-07  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * math_nestinset.C (doDispatch): Fix arrow up/down inside 
+       macro crashing bug (Helge Hafting report)
+
 2005-04-07  Martin Vermeer  <martin.vermeer@hut.fi>
 
        * math_gridinset.C (getStatus): allow C-Tab to split cell

diff --git a/src/mathed/math_nestinset.C b/src/mathed/math_nestinset.C
index 8f3f8cfb6c44392c9739a83f01c67ca5234c03f5..79ca87f7799b544ca00724d277bca077742ad453 100644 (file)
--- a/src/mathed/math_nestinset.C
+++ b/src/mathed/math_nestinset.C
@@ -496,6 +496,12 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd)
 
        case LFUN_UPSEL:
        case LFUN_UP:
+               // FIXME Tried to use clearTargetX and macroModeClose, crashed on cur.up()
+               if (cur.inMacroMode()) {
+                       // Make Helge happy
+                       cur.macroModeClose();
+                       break;
+               }
                cur.selHandle(cmd.action == LFUN_UPSEL);
                if (!cur.up())
                        cmd = FuncRequest(LFUN_FINISHED_UP);
@@ -505,6 +511,10 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd)
 
        case LFUN_DOWNSEL:
        case LFUN_DOWN:
+               if (cur.inMacroMode()) {
+                       cur.macroModeClose();
+                       break;
+               }
                cur.selHandle(cmd.action == LFUN_DOWNSEL);
                if (!cur.down())
                        cmd = FuncRequest(LFUN_FINISHED_DOWN);