The branch, master, has been updated. - Log -----------------------------------------------------------------
commit f692181917a2b37e7f41ba287430ca80c3eb843e Author: Pavel Sanda <[email protected]> Date: Thu May 31 13:56:07 2012 +0200 Fix #8180: Page break on current row can't be unchecked. Patch from John Tapsell diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp index 8a14cb7..79706d4 100644 --- a/src/frontends/qt4/GuiTabular.cpp +++ b/src/frontends/qt4/GuiTabular.cpp @@ -580,6 +580,8 @@ docstring GuiTabular::dialogToParams() const // if (newpageCB->isChecked()) setParam(param_str, Tabular::SET_LTNEWPAGE); + else + setParam(param_str, Tabular::UNSET_LTNEWPAGE); // if (captionStatusCB->isChecked()) setParam(param_str, Tabular::SET_LTCAPTION); diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index 00ee719..8e796db 100644 --- a/src/insets/InsetTabular.cpp +++ b/src/insets/InsetTabular.cpp @@ -165,6 +165,7 @@ TabularFeature tabularFeature[] = { Tabular::SET_LTLASTFOOT, "set-ltlastfoot", true }, { Tabular::UNSET_LTLASTFOOT, "unset-ltlastfoot", true }, { Tabular::SET_LTNEWPAGE, "set-ltnewpage", false }, + { Tabular::UNSET_LTNEWPAGE, "unset-ltnewpage", false }, { Tabular::TOGGLE_LTCAPTION, "toggle-ltcaption", false }, { Tabular::SET_LTCAPTION, "set-ltcaption", false }, { Tabular::UNSET_LTCAPTION, "unset-ltcaption", false }, @@ -4640,6 +4641,9 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd, case Tabular::SET_LTNEWPAGE: status.setOnOff(tabular.getLTNewPage(sel_row_start)); 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 // and a multirow cannot be set as caption @@ -5657,8 +5661,10 @@ void InsetTabular::tabularFeatures(Cursor & cur, tabular.setLTFoot(row, flag, ltt, true); break; + case Tabular::UNSET_LTNEWPAGE: + flag = false; case Tabular::SET_LTNEWPAGE: - tabular.setLTNewPage(row, !tabular.getLTNewPage(row)); + tabular.setLTNewPage(row, flag); break; case Tabular::SET_LTCAPTION: { diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h index e765000..80958cc 100644 --- a/src/insets/InsetTabular.h +++ b/src/insets/InsetTabular.h @@ -233,6 +233,7 @@ public: UNSET_LTLASTFOOT, /// SET_LTNEWPAGE, + UNSET_LTNEWPAGE, /// TOGGLE_LTCAPTION, /// ----------------------------------------------------------------------- Summary of changes: src/frontends/qt4/GuiTabular.cpp | 2 ++ src/insets/InsetTabular.cpp | 8 +++++++- src/insets/InsetTabular.h | 1 + 3 files changed, 10 insertions(+), 1 deletions(-) hooks/post-receive -- The LyX Source Repository
