diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-07-16 13:51:43 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-07-16 14:00:18 +0200 |
commit | a52ad6b1cca7ef4cd21386866c1e9b56d027db18 (patch) | |
tree | 7406c4c5cded8a058a47ac0301d1c0fc8bb89fbc /jvmfwk | |
parent | ecc9fc12f1fe60b3d6abf1b14f8b7a078e1c1151 (diff) |
loplugin:simplifybool
Change-Id: Iaa3c04ba936512f511de238f5a3ca5b0f9afc06d
Diffstat (limited to 'jvmfwk')
-rw-r--r-- | jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 2 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 2 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 4 | ||||
-rw-r--r-- | jvmfwk/source/framework.cxx | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx index f1ef2cd38aff..d4d67f6e58bb 100644 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx @@ -53,7 +53,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } sal_Bool bEnabled = sal_False; javaFrameworkError errcode = jfw_getEnabled( & bEnabled); - if (errcode == JFW_E_NONE && bEnabled == sal_False) + if (errcode == JFW_E_NONE && !bEnabled) { //Do not do any preparation because that may only slow startup time. return 0; diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index c7a273c82ae9..44a902091144 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -890,7 +890,7 @@ javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist) //contained within JAVA_HOME. Then the check for JAVA_HOME would return //true although the runtime library may not be loadable. //Or the JAVA_HOME directory of a deinstalled JRE left behind. - if (ret == JFW_PLUGIN_E_NONE && *exist == sal_True) + if (ret == JFW_PLUGIN_E_NONE && *exist) { OUString sRuntimeLib = getRuntimeLib(pInfo->arVendorData); JFW_TRACE2("Checking existence of Java runtime library"); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 6b5f8a293a9e..18dac9b0055e 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -421,8 +421,8 @@ bool getJavaProps(const OUString & exePath, //next to the plugin, except on OS X where it is in ../Resources/java relative //to the plugin. OUString sThisLib; - if (osl_getModuleURLFromAddress(reinterpret_cast<void *>(&getJavaProps), - & sThisLib.pData) == sal_False) + if (!osl_getModuleURLFromAddress(reinterpret_cast<void *>(&getJavaProps), + & sThisLib.pData)) { return false; } diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index f15a045f542d..5d18738a6ddc 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -808,7 +808,7 @@ javaFrameworkError SAL_CALL jfw_setSelectedJRE(JavaInfo const *pInfo) if (errcode != JFW_E_NONE && errcode != JFW_E_INVALID_SETTINGS) return errcode; - if (jfw_areEqualJavaInfo(currentInfo, pInfo) == sal_False) + if (!jfw_areEqualJavaInfo(currentInfo, pInfo)) { jfw::NodeJava node(jfw::NodeJava::USER); node.setJavaInfo(pInfo, false); @@ -836,7 +836,7 @@ javaFrameworkError SAL_CALL jfw_setEnabled(sal_Bool bEnabled) if (jfw::getMode() == jfw::JFW_MODE_DIRECT) return JFW_E_DIRECT_MODE; - if (!g_bEnabledSwitchedOn && bEnabled == sal_True) + if (!g_bEnabledSwitchedOn && bEnabled) { //When the process started then Enabled was false. //This is first time enabled is set to true. |