From c951809efd04fc3b3145905ea865a2a07edbf3f5 Mon Sep 17 00:00:00 2001 From: John Levon Date: Thu, 10 Apr 2003 20:56:16 +0000 Subject: [PATCH] fix table bugs 939 and 1036 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6772 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/controllers/ChangeLog | 5 +++++ src/insets/ChangeLog | 8 ++++++++ src/insets/insettabular.C | 7 ++++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index 95d2255ac3..58236269dc 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,8 @@ +2003-04-10 John Levon + + * ControlTabular.h: + * ControlTabular.C: add longTabular() etc. + 2003-04-10 John Levon * ControlMath.C (find_xpm): handle math_delim arguments diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index a54614ae90..850d25cd76 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,11 @@ +2003-04-10 John Levon + + * insettabular.C (tabularFeature): make sure + to update the dialog when we change something + (bug 1036). + + (getStatus): don't disable some lfuns (bug 939) + 2003-04-09 Lars Gullik Bjønnes * insettext.C (saveLyXTextState): adjust diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C index c20a1ec6a5..3c41f35187 100644 --- a/src/insets/insettabular.C +++ b/src/insets/insettabular.C @@ -2006,7 +2006,7 @@ void InsetTabular::tabularFeatures(BufferView * bv, tabular->SetMultiColumn(bv->buffer(), actcell, 1); updateLocal(bv, CELL); } - return; + break; } // we have a selection so this means we just add all this // cells to form a multicolumn cell @@ -2111,6 +2111,9 @@ void InsetTabular::tabularFeatures(BufferView * bv, case LyXTabular::LAST_ACTION: break; } + + InsetTabularMailer mailer(*this); + mailer.updateDialog(bv); } @@ -2291,8 +2294,6 @@ FuncStatus InsetTabular::getStatus(string const & what) const case LyXTabular::SET_MPWIDTH: case LyXTabular::SET_SPECIAL_COLUMN: case LyXTabular::SET_SPECIAL_MULTI: - return status.disabled(true); - case LyXTabular::APPEND_ROW: case LyXTabular::APPEND_COLUMN: case LyXTabular::DELETE_ROW: -- 2.39.2