From: Jürgen Spitzmüller <spitz@lyx.org>
Date: Fri, 11 Feb 2011 09:42:33 +0000 (+0000)
Subject: * InsetTabular.cpp: multirow does not allow paragraph breaks (bug 7051).
X-Git-Tag: 2.0.0~793
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e9cfa82c9f71e06c99e4e1d836f04ba92a33cda4;p=lyx.git

* InsetTabular.cpp: multirow does not allow paragraph breaks (bug 7051).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37597 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 4b2463ded2..f38646dfe2 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -4623,8 +4623,13 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
 	}
 
 	// disable in non-fixed-width cells
-	case LFUN_NEWLINE_INSERT:
-	case LFUN_BREAK_PARAGRAPH: {
+	case LFUN_BREAK_PARAGRAPH:
+		// multirow does not allow paragraph breaks
+		if (tabular.isMultiRow(cur.idx())) {
+			status.setEnabled(false);
+			return true;
+		}
+	case LFUN_NEWLINE_INSERT: {
 		if (tabular.getPWidth(cur.idx()).zero()) {
 			status.setEnabled(false);
 			return true;