From: Pavel Sanda <sanda@lyx.org>
Date: Thu, 31 May 2012 11:56:07 +0000 (+0200)
Subject: Fix #8180: Page break on current row can't be unchecked.
X-Git-Tag: 2.1.0beta1~1818
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f692181917a2b37e7f41ba287430ca80c3eb843e;p=features.git

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 8a14cb7093..79706d41c5 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 00ee719d81..8e796dbbf9 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 e7650009ec..80958cc8a8 100644
--- a/src/insets/InsetTabular.h
+++ b/src/insets/InsetTabular.h
@@ -233,6 +233,7 @@ public:
 		UNSET_LTLASTFOOT,
 		///
 		SET_LTNEWPAGE,
+		UNSET_LTNEWPAGE,
 		///
 		TOGGLE_LTCAPTION,
 		///