GuiTabular.cpp, InsetTabular.cpp: fix http://bugzilla.lyx.org/show_bug.cgi?id=5773

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

diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp
index f91650d6b856bf7b9d0387cf41f3d000e7f86c72..8661733647320deb9e16b07f9c2affd1b716e6f5 100644 (file)
--- a/src/frontends/qt4/GuiTabular.cpp
+++ b/src/frontends/qt4/GuiTabular.cpp
@@ -816,6 +816,9 @@ void GuiTabular::updateContents()
        lastfooterStatusCB->setEnabled(funcEnabled(Tabular::SET_LTLASTFOOT)
                && !lastfooterNoContentsCB->isChecked());
        captionStatusCB->setEnabled(funcEnabled(Tabular::TOGGLE_LTCAPTION));
+       // When a row is set as longtable caption, it must not be allowed to unset
+       // that this row is a multicolumn.
+       multicolumnCB->setEnabled(funcEnabled(Tabular::MULTICOLUMN));
 
        Tabular::ltType ltt;
        bool use_empty;

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 4711725213a358199cd8a8eb4ddd4603d2c3d237..9b6fe85d6170f4dcc396fc49034a598d86263c01 100644 (file)
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -3805,7 +3805,10 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
                        return true;
 
                case Tabular::MULTICOLUMN:
-                       status.setEnabled(sel_row_start == sel_row_end);
+                       // When a row is set as longtable caption, it must not be allowed
+                       // to unset that this row is a multicolumn.
+                       status.setEnabled(sel_row_start == sel_row_end
+                               && !tabular.ltCaption(tabular.cellRow(cur.idx())));
                        status.setOnOff(tabular.isMultiColumn(cur.idx()));
                        break;