From 6f157533a10b6440be435f95f329a86cc1f55d64 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Tue, 11 Sep 2012 21:58:13 +0200 Subject: [PATCH] fix multirow/column logic in table dialog GuiTabular.cpp: a cell can either be a multicolumn or multirow, not both the same time, this is already respected by the toolbar and context menu, only the dialog allowed to set this although this was correctly never applied should also go to branch --- src/frontends/qt4/GuiTabular.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp index ee4d1dfe7b..6c1505a08e 100644 --- a/src/frontends/qt4/GuiTabular.cpp +++ b/src/frontends/qt4/GuiTabular.cpp @@ -311,8 +311,10 @@ void GuiTabular::checkEnabled() captionStatusCB->setEnabled(funcEnabled(Tabular::TOGGLE_LTCAPTION) && longtabular); - multicolumnCB->setEnabled(funcEnabled(Tabular::MULTICOLUMN) && !dalign); - multirowCB->setEnabled(funcEnabled(Tabular::MULTIROW) && !dalign); + multicolumnCB->setEnabled(funcEnabled(Tabular::MULTICOLUMN) + && !dalign && !multirowCB->isChecked()); + multirowCB->setEnabled(funcEnabled(Tabular::MULTIROW) + && !dalign && !multicolumnCB->isChecked()); bool const enable_mr = multirowCB->isChecked(); multirowOffsetLA->setEnabled(enable_mr); multirowOffsetED->setEnabled(enable_mr); -- 2.39.5