anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 03:11:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix #8180: Page break on current row can't be unchecked.

Browse Source 
Patch from John Tapsell
This commit is contained in:
Pavel Sanda 2012-05-31 13:56:07 +02:00
parent eb4a1074bf
commit f692181917
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontends/qt4/GuiTabular.cpp
View File

@ -580,6 +580,8 @@ docstring GuiTabular::dialogToParams() const
// //
if (newpageCB->isChecked()) if (newpageCB->isChecked())
setParam(param_str, Tabular::SET_LTNEWPAGE); setParam(param_str, Tabular::SET_LTNEWPAGE);
else
setParam(param_str, Tabular::UNSET_LTNEWPAGE);
// //
if (captionStatusCB->isChecked()) if (captionStatusCB->isChecked())
setParam(param_str, Tabular::SET_LTCAPTION); setParam(param_str, Tabular::SET_LTCAPTION);

8
src/insets/InsetTabular.cpp
View File

@ -165,6 +165,7 @@ TabularFeature tabularFeature[] =
{ Tabular::SET_LTLASTFOOT, "set-ltlastfoot", true }, { Tabular::SET_LTLASTFOOT, "set-ltlastfoot", true },
{ Tabular::UNSET_LTLASTFOOT, "unset-ltlastfoot", true }, { Tabular::UNSET_LTLASTFOOT, "unset-ltlastfoot", true },
{ Tabular::SET_LTNEWPAGE, "set-ltnewpage", false }, { Tabular::SET_LTNEWPAGE, "set-ltnewpage", false },
{ Tabular::UNSET_LTNEWPAGE, "unset-ltnewpage", false },
{ Tabular::TOGGLE_LTCAPTION, "toggle-ltcaption", false }, { Tabular::TOGGLE_LTCAPTION, "toggle-ltcaption", false },
{ Tabular::SET_LTCAPTION, "set-ltcaption", false }, { Tabular::SET_LTCAPTION, "set-ltcaption", false },
{ Tabular::UNSET_LTCAPTION, "unset-ltcaption", false }, { Tabular::UNSET_LTCAPTION, "unset-ltcaption", false },
@ -4640,6 +4641,9 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
case Tabular::SET_LTNEWPAGE: case Tabular::SET_LTNEWPAGE:
status.setOnOff(tabular.getLTNewPage(sel_row_start)); status.setOnOff(tabular.getLTNewPage(sel_row_start));
break; break;
case Tabular::UNSET_LTNEWPAGE:
status.setOnOff(!tabular.getLTNewPage(sel_row_start));
break;
// only one row in head/firsthead/foot/lasthead can be the caption // only one row in head/firsthead/foot/lasthead can be the caption
// and a multirow cannot be set as caption // and a multirow cannot be set as caption
@ -5657,8 +5661,10 @@ void InsetTabular::tabularFeatures(Cursor & cur,
tabular.setLTFoot(row, flag, ltt, true); tabular.setLTFoot(row, flag, ltt, true);
break; break;
case Tabular::UNSET_LTNEWPAGE:
flag = false;
case Tabular::SET_LTNEWPAGE: case Tabular::SET_LTNEWPAGE:
tabular.setLTNewPage(row, !tabular.getLTNewPage(row)); tabular.setLTNewPage(row, flag);
break; break;
case Tabular::SET_LTCAPTION: { case Tabular::SET_LTCAPTION: {

1
src/insets/InsetTabular.h
View File

@ -233,6 +233,7 @@ public:
UNSET_LTLASTFOOT, UNSET_LTLASTFOOT,
/// ///
SET_LTNEWPAGE, SET_LTNEWPAGE,
UNSET_LTNEWPAGE,
/// ///
TOGGLE_LTCAPTION, TOGGLE_LTCAPTION,
/// ///