Backport f6921819.

diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp
index 090dca83de819caccb08497322ed09500e1e8db1..2a011e4fa55bbe1b019ac060c5f5408425012d50 100644 (file)
--- a/src/frontends/qt4/GuiTabular.cpp
+++ b/src/frontends/qt4/GuiTabular.cpp
@@ -555,6 +555,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 3c97de5d66530f10e888a2875ca59d538e013628..1e91d5cb883273602826219faee4d9779291e952 100644 (file)
--- 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 },
@@ -4641,6 +4642,9 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
                case Tabular::UNSET_LTHEAD:
                        status.setOnOff(!tabular.getRowOfLTHead(sel_row_start, dummyltt));
                        break;
+               case Tabular::UNSET_LTNEWPAGE:
+                       status.setOnOff(!tabular.getLTNewPage(sel_row_start));
+                       break;
 
                case Tabular::SET_LTFOOT:
                        status.setEnabled(sel_row_start == sel_row_end
@@ -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 3a3f63a602bd961471a2b66cd65e676026da78a2..bc4542c5a289f12e812647c7abe516393c8a5d48 100644 (file)
--- a/src/insets/InsetTabular.h
+++ b/src/insets/InsetTabular.h
@@ -233,6 +233,7 @@ public:
                UNSET_LTLASTFOOT,
                ///
                SET_LTNEWPAGE,
+               UNSET_LTNEWPAGE,
                ///
                TOGGLE_LTCAPTION,
                ///

diff --git a/status.20x b/status.20x
index 9343bff625a90e4d7dc5585b2517d58060f0d7f0..cb76a89641feb6377601571feedfd4df182fe1b9 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -223,6 +223,8 @@ What's new
 - Fix cursor bug when using backspace after the spellchecker replaced 
   a word.
 
+- Fix "Page break on current row" in tabular dialog (bug 8180).
+
 
 * DOCUMENTATION AND LOCALIZATION