From 8f0d715464e15dd8b2fb6b4a9969bffb02c476cf Mon Sep 17 00:00:00 2001 From: Allan Rae Date: Mon, 10 Dec 2001 01:22:12 +0000 Subject: [PATCH] remove redundant code git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3171 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/ChangeLog | 4 ++++ src/insets/insettabular.C | 16 +++------------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index f2a9686c7c..4d52b67c00 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,7 @@ +2001-12-10 Allan Rae + + * insettabular.C (localDispatch): cleanup unlockInsetInInset calls + 2001-12-05 John Levon * insettext.C (insetAllowed): add comment diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C index e84bdda0e9..5e3c7fd2d5 100644 --- a/src/insets/insettabular.C +++ b/src/insets/insettabular.C @@ -847,10 +847,7 @@ InsetTabular::localDispatch(BufferView * bv, kb_action action, case LFUN_SHIFT_TAB: case LFUN_TAB: hideInsetCursor(bv); - if (the_locking_inset) { - unlockInsetInInset(bv, the_locking_inset); - the_locking_inset = 0; - } + unlockInsetInInset(bv, the_locking_inset); if (action == LFUN_TAB) moveNextCell(bv, old_locking_inset != 0); else @@ -962,10 +959,7 @@ InsetTabular::localDispatch(BufferView * bv, kb_action action, break; case LFUN_NEXT: { int column = actcol; - if (the_locking_inset) { - unlockInsetInInset(bv, the_locking_inset); - the_locking_inset = 0; - } + unlockInsetInInset(bv, the_locking_inset); if (bv->text->first + bv->painter().paperHeight() < (top_baseline + tabular->GetHeightOfTabular())) { @@ -981,10 +975,7 @@ InsetTabular::localDispatch(BufferView * bv, kb_action action, } case LFUN_PRIOR: { int column = actcol; - if (the_locking_inset) { - unlockInsetInInset(bv, the_locking_inset); - the_locking_inset = 0; - } + unlockInsetInInset(bv, the_locking_inset); if (top_baseline < 0) { bv->scrollCB(bv->text->first - bv->painter().paperHeight()); updateLocal(bv, FULL, false); @@ -1133,7 +1124,6 @@ InsetTabular::localDispatch(BufferView * bv, kb_action action, if ((result == UNDISPATCHED) || (result >= FINISHED)) { unlockInsetInInset(bv, the_locking_inset); nodraw(false); - the_locking_inset = 0; // we need to update if this was requested before updateLocal(bv, NONE, false); return UNDISPATCHED; -- 2.39.5