GuiTabular.cpp: fix #6859 and a FIXME

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

diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp
index b5f3552e06a327e8fbdec792ddeec62af410747e..264a6456afb7d0fc429b388cc4282785cab3b05c 100644 (file)
--- a/src/frontends/qt4/GuiTabular.cpp
+++ b/src/frontends/qt4/GuiTabular.cpp
@@ -227,18 +227,10 @@ void GuiTabular::checkEnabled()
        lastfooterBorderBelowCB->setEnabled(longtabular
                && lastfooterBorderAboveCB->isChecked());
 
-       // FIXME: verify if previous row doesn't have a caption already.
-       captionStatusCB->setEnabled(longtabular);
-
-       // When a row is set as longtable caption, it must not be allowed
-       // to unset that this row is a multicolumn.
-       // FIXME: old code also checked for:
-       //    funcEnabled(Tabular::MULTICOLUMN)
-       multicolumnCB->setEnabled(longtabular);
-
-       // FIXME: old code also checked for:
-       //    funcEnabled(Tabular::MULTICOLUMN)
-       multirowCB->setEnabled(longtabular);
+       captionStatusCB->setEnabled(getStatus(FuncRequest(LFUN_INSET_MODIFY, "tabular toggle-ltcaption")).enabled());
+       
+       multicolumnCB->setEnabled(getStatus(FuncRequest(LFUN_INSET_MODIFY, "tabular multicolumn")).enabled());
+       multirowCB->setEnabled(getStatus(FuncRequest(LFUN_INSET_MODIFY, "tabular multirow")).enabled());
 
        changed();
 }