Author: vfr
Date: Sun Jan 22 16:31:44 2012
New Revision: 40653
URL: http://www.lyx.org/trac/changeset/40653
Log:
branch: Fix bug #7755: Unknown tabular feature "from-dialog"
"from-dialog" is added to the LFUN_INSET_MODIFY function when it is issued from
the table settings dialog. This is done to prevent the checking of the
individual parameters, because it has to consider all parameters alltogether.
Besides, when issued from the dialog it is already guaranteed that the
parameters are valid.
This parameter should not be passed onto tabularfeatures.
see r40376.
Modified:
lyx-devel/branches/BRANCH_2_0_X/src/insets/InsetTabular.cpp
lyx-devel/branches/BRANCH_2_0_X/status.20x
Modified: lyx-devel/branches/BRANCH_2_0_X/src/insets/InsetTabular.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/insets/InsetTabular.cpp Sun Jan 22
15:37:13 2012 (r40652)
+++ lyx-devel/branches/BRANCH_2_0_X/src/insets/InsetTabular.cpp Sun Jan 22
16:31:44 2012 (r40653)
@@ -4159,10 +4159,16 @@
cur.bv().showDialog("tabular");
break;
- case LFUN_INSET_MODIFY:
- if (!tabularFeatures(cur, to_utf8(cmd.argument())))
+ case LFUN_INSET_MODIFY: {
+ string arg;
+ if (cmd.getArg(1) == "from-dialog")
+ arg = cmd.getArg(0) +
to_utf8(cmd.argument().substr(19));
+ else
+ arg = to_utf8(cmd.argument());
+ if (!tabularFeatures(cur, arg))
cur.undispatched();
break;
+ }
// insert file functions
case LFUN_FILE_INSERT_PLAINTEXT_PARA:
Modified: lyx-devel/branches/BRANCH_2_0_X/status.20x
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/status.20x Sun Jan 22 15:37:13 2012
(r40652)
+++ lyx-devel/branches/BRANCH_2_0_X/status.20x Sun Jan 22 16:31:44 2012
(r40653)
@@ -206,6 +206,8 @@
- Show entire index entry in outliner (bug 7774).
+- Fix a warning when changing table settings via the dialog (bug 7755).
+
* DOCUMENTATION AND LOCALIZATION
