]> git.lyx.org Git - lyx.git/commitdiff
* InsetTabular.cpp: multirow does not allow paragraph breaks (bug 7051).
authorJürgen Spitzmüller <spitz@lyx.org>
Fri, 11 Feb 2011 09:42:33 +0000 (09:42 +0000)
committerJürgen Spitzmüller <spitz@lyx.org>
Fri, 11 Feb 2011 09:42:33 +0000 (09:42 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37597 a592a061-630c-0410-9148-cb99ea01b6c8

src/insets/InsetTabular.cpp

index 4b2463ded229774b895a34e59d83b8310d3f372e..f38646dfe2a6ceceaed32e158f9de2219ed4c093 100644 (file)
@@ -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;