anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 15:01:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

branch: Fix bug #7755: Unknown tabular feature "from-dialog"

Browse Source 
"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.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40653 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2012-01-22 15:31:44 +00:00
parent 441e7f6c03
commit 17370a9462
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/insets/InsetTabular.cpp
View File

@ -4159,10 +4159,16 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
cur.bv().showDialog("tabular"); cur.bv().showDialog("tabular");
break; break;
case LFUN_INSET_MODIFY: case LFUN_INSET_MODIFY: {
if (!tabularFeatures(cur, to_utf8(cmd.argument()))) 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(); cur.undispatched();
break; break;
}
// insert file functions // insert file functions
case LFUN_FILE_INSERT_PLAINTEXT_PARA: case LFUN_FILE_INSERT_PLAINTEXT_PARA:

2
status.20x
View File

@ -206,6 +206,8 @@ What's new
- Show entire index entry in outliner (bug 7774). - Show entire index entry in outliner (bug 7774).
- Fix a warning when changing table settings via the dialog (bug 7755).
* DOCUMENTATION AND LOCALIZATION * DOCUMENTATION AND LOCALIZATION