remove some useless workarounds in getStatus

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24942 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 583e1cd315a8a6f55f0efa402abd2050aaee851f..17b8d474db3440c105f65ebf9ba46fffd4aa278e 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -1907,7 +1907,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 
        case LFUN_APPENDIX:
                flag.setOnOff(cur.paragraph().params().startOfAppendix());
-               return true;
+               break;
 
        case LFUN_BIBITEM_INSERT:
                enable = (cur.paragraph().layout().labeltype == LABEL_BIBLIO

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index 0e8ab19dc6bd3cc3ee7484334c56e4723dbd93c9..b716e7dab456bffa9d3b5312719c0ddd6d0cc8ea 100644 (file)
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -223,8 +223,7 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_INSET_MODIFY:
                if (cmd.getArg(0) == "changetype")
                        flag.setOnOff(cmd.getArg(1) == params_.type);
-               else
-                       flag.enabled(true);
+               flag.enabled(true);
                return true;
 
        case LFUN_INSET_DIALOG_UPDATE:

diff --git a/src/insets/InsetCommand.cpp b/src/insets/InsetCommand.cpp
index bbe81841338d323d46584a85032ed8db0f1e9df3..cf860e3079dfb0d51fdc1991f2b6bcbaeb5f0093 100644 (file)
--- a/src/insets/InsetCommand.cpp
+++ b/src/insets/InsetCommand.cpp
@@ -164,8 +164,8 @@ bool InsetCommand::getStatus(Cursor & cur, FuncRequest const & cmd,
                        string const newtype = cmd.getArg(1);
                        status.enabled(p_.isCompatibleCommand(p_.code(), newtype));
                        status.setOnOff(newtype == p_.getCmdName());
-               } else
-                       status.enabled(true);
+               } 
+               status.enabled(true);
                return true;
        case LFUN_INSET_DIALOG_UPDATE:
                status.enabled(true);

diff --git a/src/insets/InsetNewline.cpp b/src/insets/InsetNewline.cpp
index d4ee618dac0701c280cadd13e59c447601c79813..cd48f96a515308fcf02e366733cbecc44e4708d1 100644 (file)
--- a/src/insets/InsetNewline.cpp
+++ b/src/insets/InsetNewline.cpp
@@ -115,9 +115,8 @@ bool InsetNewline::getStatus(Cursor & cur, FuncRequest const & cmd,
                        InsetNewlineParams params;
                        string2params(to_utf8(cmd.argument()), params);
                        status.setOnOff(params_.kind == params.kind);
-               } else {
-                       status.enabled(true);
                }
+               status.enabled(true);
                return true;
        default:
                return Inset::getStatus(cur, cmd, status);

diff --git a/src/insets/InsetNewpage.cpp b/src/insets/InsetNewpage.cpp
index 756ba851c1db5178b4a0c04407b98fa77b0356ee..7a6667a8e536989cc5ead60f8eb0a6765e1c2da8 100644 (file)
--- a/src/insets/InsetNewpage.cpp
+++ b/src/insets/InsetNewpage.cpp
@@ -163,9 +163,8 @@ bool InsetNewpage::getStatus(Cursor & cur, FuncRequest const & cmd,
                        InsetNewpageParams params;
                        string2params(to_utf8(cmd.argument()), params);
                        status.setOnOff(params_.kind == params.kind);
-               } else {
-                       status.enabled(true);
-               }
+               } 
+               status.enabled(true);
                return true;
        default:
                return Inset::getStatus(cur, cmd, status);

diff --git a/src/insets/InsetSpace.cpp b/src/insets/InsetSpace.cpp
index a637bf4b3539398582d7158925d0950953011be6..89325bae7c0c1a4d216bd821f1d8ed6c6e0699a6 100644 (file)
--- a/src/insets/InsetSpace.cpp
+++ b/src/insets/InsetSpace.cpp
@@ -158,9 +158,8 @@ bool InsetSpace::getStatus(Cursor & cur, FuncRequest const & cmd,
                        InsetSpaceParams params;
                        string2params(to_utf8(cmd.argument()), params);
                        status.setOnOff(params_.kind == params.kind);
-               } else {
-                       status.enabled(true);
                }
+               status.enabled(true);
                return true;
        default:
                return Inset::getStatus(cur, cmd, status);

diff --git a/src/insets/InsetVSpace.cpp b/src/insets/InsetVSpace.cpp
index 9d0a766651741ccdb3b784d80e2c20fbf5433807..f93a7e2ee65f00274553169ba3255d2edd76bee1 100644 (file)
--- a/src/insets/InsetVSpace.cpp
+++ b/src/insets/InsetVSpace.cpp
@@ -89,9 +89,8 @@ bool InsetVSpace::getStatus(Cursor & cur, FuncRequest const & cmd,
                        VSpace vspace;
                        InsetVSpace::string2params(to_utf8(cmd.argument()), vspace);
                        status.setOnOff(vspace == space_);
-               } else {
-                       status.enabled(true);
-               }
+               } 
+               status.enabled(true);
                return true;
        default:
                return Inset::getStatus(cur, cmd, status);