From: Uwe Stöhr <uwestoehr@web.de>
Date: Wed, 20 Oct 2010 22:35:05 +0000 (+0000)
Subject: GuiTabular.cpp: fix #6957
X-Git-Tag: 2.0.0~2329
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e35f55975e47a71cdbfa5674cec383f07ac9efc9;p=features.git

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 a2ada38468..a1f01c4d73 100644
--- 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);