GuiTabular.cpp: fix #6957

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

diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp
index a2ada38468180462c45a01bcc5fec139892b664d..a1f01c4d7386a088426d57765d9aadae5917533b 100644 (file)
--- a/src/frontends/qt4/GuiTabular.cpp
+++ b/src/frontends/qt4/GuiTabular.cpp
@@ -159,7 +159,8 @@ GuiTabular::GuiTabular(QWidget * parent)
 
 void GuiTabular::checkEnabled()
 {
-       hAlignCB->setEnabled(true);
+       // multirows don't have their own alignment
+       hAlignCB->setEnabled(!multirowCB->isChecked());
        bool dalign =
                hAlignCB->itemData(hAlignCB->currentIndex()).toString() == QString("decimal");
        decimalPointLE->setEnabled(dalign);