From a5e061ce427e0d2b1fd9498bbae9cfa55fddd69e Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= Date: Thu, 28 Jul 2005 09:45:43 +0000 Subject: [PATCH] Disable newlines and paragraph breaks in non-fixed width tabular cells (bug 1938) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10366 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/ChangeLog | 5 +++++ src/insets/insettabular.C | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index f6d4646741..4d77c36db5 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,8 @@ +2005-07-28 Jürgen Spitzmüller + + * insettabular.C (getStatus): disable line and paragraph breaks + in non-fixed-width cells (bug 1938). + 2005-07-27 Jürgen Spitzmüller * insetfloat.C: diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C index ac76e28039..55db9855af 100644 --- a/src/insets/insettabular.C +++ b/src/insets/insettabular.C @@ -1006,6 +1006,17 @@ bool InsetTabular::getStatus(LCursor & cur, FuncRequest const & cmd, } } + // disable in non-fixed-width cells + case LFUN_BREAKLINE: + case LFUN_BREAKPARAGRAPH: + case LFUN_BREAKPARAGRAPHKEEPLAYOUT: + case LFUN_BREAKPARAGRAPH_SKIP: { + if (tabular.getPWidth(cur.idx()).zero()) { + status.enabled(false); + return true; + } + } + case LFUN_INSET_MODIFY: if (translate(cmd.getArg(0)) == TABULAR_CODE) { status.enabled(true); -- 2.39.5