diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-27 10:44:30 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-27 10:47:32 +0100 |
commit | 65191cda819ee8f4d14f6cdf12568c35e46b5c66 (patch) | |
tree | 47d394c5e3b93ab7eb98f286bab1281175671325 /jvmfwk | |
parent | 5de65dc2d6887a9c7a5b4faa23caa53f8c05c2d0 (diff) |
bool improvements
Change-Id: I757e19313576d2c3d13af1cb720f182f0de91613
Diffstat (limited to 'jvmfwk')
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 2 | ||||
-rw-r--r-- | jvmfwk/source/framework.cxx | 8 | ||||
-rw-r--r-- | jvmfwk/source/fwkbase.cxx | 18 |
3 files changed, 14 insertions, 14 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 8310d794f625..aa4091c7c991 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -360,7 +360,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath( return JFW_PLUGIN_E_INVALID_ARG; rtl::Reference<VendorBase> aVendorInfo = getJREInfoByPath(ouPath); - if (aVendorInfo.is() == sal_False) + if (!aVendorInfo.is()) return JFW_PLUGIN_E_NO_JRE; //Check if the detected JRE matches the version requirements diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 4b2bbefb10d0..38109892a23d 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -130,7 +130,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi arModules[cModule].load(library.sPath); osl::Module & pluginLib = arModules[cModule]; - if (pluginLib.is() == sal_False) + if (!pluginLib.is()) { OString msg = OUStringToOString( library.sPath, osl_getThreadTextEncoding()); @@ -504,7 +504,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo) #ifndef DISABLE_DYNLOADING arModules[cModule].load(library.sPath); osl::Module & pluginLib = arModules[cModule]; - if (pluginLib.is() == sal_False) + if (!pluginLib.is()) return JFW_E_NO_PLUGIN; jfw_plugin_getAllJavaInfos_ptr getAllJavaFunc = @@ -588,7 +588,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo) aVendorSettings.getVersionInformation(library.sVendor); #ifndef DISABLE_DYNLOADING osl::Module pluginLib(library.sPath); - if (pluginLib.is() == sal_False) + if (!pluginLib.is()) return JFW_E_NO_PLUGIN; //Check if the current plugin can detect JREs at the location // of the paths added by jfw_setJRELocations or jfw_addJRELocation @@ -815,7 +815,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath( #ifndef DISABLE_DYNLOADING arModules[cModule].load(library.sPath); osl::Module & pluginLib = arModules[cModule]; - if (pluginLib.is() == sal_False) + if (!pluginLib.is()) { OString msg = OUStringToOString( library.sPath, osl_getThreadTextEncoding()); diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index 79903707009b..29949c6ce474 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -319,7 +319,7 @@ OUString VendorSettings::getPluginLibrary(const OUString& sVendor) { OUString sName = OUString(UNO_JAVA_JFW_PARAMETER) + OUString::number(i); OUString sValue; - if (Bootstrap::get()->getFrom(sName, sValue) == sal_True) + if (Bootstrap::get()->getFrom(sName, sValue)) { OString sParam = OUStringToOString(sValue, osl_getThreadTextEncoding()); @@ -352,7 +352,7 @@ OString BootParams::getClasspath() OUString sCP; if (Bootstrap::get()->getFrom( OUString(UNO_JAVA_JFW_CLASSPATH), - sCP) == sal_True) + sCP)) { sClassPath = OUStringToOString(sCP, osl_getThreadTextEncoding()); #if OSL_DEBUG_LEVEL >=2 @@ -364,7 +364,7 @@ OString BootParams::getClasspath() OUString sEnvCP; if (Bootstrap::get()->getFrom( OUString(UNO_JAVA_JFW_ENV_CLASSPATH), - sEnvCP) == sal_True) + sEnvCP)) { char * pCp = getenv("CLASSPATH"); if (pCp) @@ -386,7 +386,7 @@ OUString BootParams::getVendorSettings() OUString sVendor; OUString sName( UNO_JAVA_JFW_VENDOR_SETTINGS); - if (Bootstrap::get()->getFrom(sName ,sVendor) == sal_True) + if (Bootstrap::get()->getFrom(sName ,sVendor)) { //check the value of the bootstrap variable jfw::FileStatus s = checkFileURL(sVendor); @@ -510,21 +510,21 @@ JFW_MODE getMode() OUString sValue; const rtl::Bootstrap * aBoot = Bootstrap::get(); OUString sJREHome(UNO_JAVA_JFW_JREHOME); - if (aBoot->getFrom(sJREHome, sValue) == sal_False) + if (!aBoot->getFrom(sJREHome, sValue)) { OUString sEnvJRE(UNO_JAVA_JFW_ENV_JREHOME); - if (aBoot->getFrom(sEnvJRE, sValue) == sal_False) + if (!aBoot->getFrom(sEnvJRE, sValue)) { OUString sClasspath(UNO_JAVA_JFW_CLASSPATH); - if (aBoot->getFrom(sClasspath, sValue) == sal_False) + if (!aBoot->getFrom(sClasspath, sValue)) { OUString sEnvClasspath(UNO_JAVA_JFW_ENV_CLASSPATH); - if (aBoot->getFrom(sEnvClasspath, sValue) == sal_False) + if (!aBoot->getFrom(sEnvClasspath, sValue)) { OUString sParams = OUString( UNO_JAVA_JFW_PARAMETER) + OUString::number(1); - if (aBoot->getFrom(sParams, sValue) == sal_False) + if (!aBoot->getFrom(sParams, sValue)) { bDirectMode = false; } |