anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-28 06:49:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix in r20895 was not fully correct.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20897 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2007-10-11 10:05:04 +00:00
parent 9a458ec6e9
commit c2b139d5a0
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/LyXFunc.cpp
View File

@ -530,9 +530,10 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
break;
case LFUN_INSET_SETTINGS: {
enable = false;
if (!cur)
if (!cur) {
enable = false;
break;
}
Inset::Code code = cur->inset().lyxCode();
switch (code) {
case Inset::TABULAR_CODE:
@ -566,9 +567,10 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
}
case LFUN_INSET_APPLY: {
enable = false;
if (!cur)
if (!cur) {
enable = false;
break;
}
string const name = cmd.getArg(0);
Inset * inset = lyx_view_->getDialogs().getOpenInset(name);
if (inset) {
@ -591,9 +593,10 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
flag.setOnOff(lyx_view_->getDialogs().visible(cmd.getArg(0)));
// fall through to set "enable"
case LFUN_DIALOG_SHOW: {
enable = false;
if (!cur)
if (!cur) {
enable = false;
break;
}
string const name = cmd.getArg(0);
if (!buf)
enable = name == "aboutlyx"
@ -620,9 +623,10 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
}
case LFUN_DIALOG_SHOW_NEW_INSET:
enable = false;
if (!cur)
if (!cur) {
enable = false;
break;
}
enable = cur->inset().lyxCode() != Inset::ERT_CODE &&
cur->inset().lyxCode() != Inset::LISTINGS_CODE;
if (cur->inset().lyxCode() == Inset::CAPTION_CODE) {
@ -764,9 +768,10 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
break;
default:
enable = false;
if (!cur)
if (!cur) {
enable = false;
break;
}
if (!getLocalStatus(*cur, cmd, flag))
flag = view()->getStatus(cmd);
}