From 050ec93722993a2b78bc28a39b2c7f3de00a4f2b Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Mon, 26 May 2008 10:23:07 +0000
Subject: [PATCH] remove some useless workarounds in getStatus

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24942 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/Text3.cpp               | 2 +-
 src/insets/InsetBox.cpp     | 3 +--
 src/insets/InsetCommand.cpp | 4 ++--
 src/insets/InsetNewline.cpp | 3 +--
 src/insets/InsetNewpage.cpp | 5 ++---
 src/insets/InsetSpace.cpp   | 3 +--
 src/insets/InsetVSpace.cpp  | 5 ++---
 7 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 583e1cd315..17b8d474db 100644
--- 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 0e8ab19dc6..b716e7dab4 100644
--- 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 bbe8184133..cf860e3079 100644
--- 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 d4ee618dac..cd48f96a51 100644
--- 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 756ba851c1..7a6667a8e5 100644
--- 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 a637bf4b35..89325bae7c 100644
--- 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 9d0a766651..f93a7e2ee6 100644
--- 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);
-- 
2.39.2