git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28464 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2009-02-12 03:02:34 +00:00
parent ff677ecfdb
commit a12e81fe06
2 changed files with 7 additions and 1 deletions

View File

@ -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;

View File

@ -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;