break;
case LFUN_BRANCH_INSERT:
code = BRANCH_CODE;
- if (cur.buffer().getMasterBuffer()->params().branchlist().empty())
+ if (cur.buffer().masterBuffer()->params().branchlist().empty())
enable = false;
break;
case LFUN_LABEL_INSERT:
break;
case LFUN_OPTIONAL_INSERT:
code = OPTARG_CODE;
- enable = numberOfOptArgs(cur.paragraph())
+ enable = cur.paragraph().numberOfOptArgs()
< cur.paragraph().layout()->optionalargs;
break;
case LFUN_ENVIRONMENT_INSERT:
case LFUN_INSET_DISSOLVE:
if (!cmd.argument().empty()) {
InsetLayout il = cur.inset().getLayout(cur.buffer().params());
- enable = (cur.inset().lyxCode() == FLEX_CODE)
- && (il.lyxtype == to_utf8(cmd.argument()));
- } else
+ enable = cur.inset().lyxCode() == FLEX_CODE
+ && il.lyxtype == to_utf8(cmd.argument());
+ } else {
enable = !isMainText(cur.bv().buffer())
- && cur.inset().nargs() == 1;
+ && cur.inset().nargs() == 1;
+ }
break;
case LFUN_CHANGE_ACCEPT: