Let C++ inline functions return bool instead of sal_Bool

...to improve diagnosing misuses of boolean expressions in client code (cf.
compilerplugins/clang/implicitboolconversion.cxx).  This change should be
transparent to client code.

Missing overloads of insert() for bool have been added to OStringBuffer and
OUStringBuffer (which required dropping one !VALID_CONVERSION check that would
now pick that overload, but would be flagged by
compilerplugins/clang/pointertobool.cxx).

Change-Id: I2d64cd923b8f47bfaa31e753def6515c29a3f8c9

3 files changed, 9 insertions, 9 deletions

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 981b8278385f..099ff835dc23 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -240,7 +240,7 @@ javaPluginError jfw_plugin_getAllJavaInfos(
     {
         const rtl::Reference<VendorBase>& cur = *i;
 
-        if (ouVendor.equals(cur->getVendor()) == sal_False)
+        if (!ouVendor.equals(cur->getVendor()))
             continue;
 
         if (!ouMinVer.isEmpty())
@@ -364,7 +364,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
         return JFW_PLUGIN_E_NO_JRE;
 
     //Check if the detected JRE matches the version requirements
-    if (ouVendor.equals(aVendorInfo->getVendor()) == sal_False)
+    if (!ouVendor.equals(aVendorInfo->getVendor()))
         return JFW_PLUGIN_E_NO_JRE;
 
     if (!ouMinVer.isEmpty())
@@ -646,7 +646,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
     // Until java 1.5 we need to put a plugin.jar or javaplugin.jar (<1.4.2)
     // in the class path in order to have applet support.
         OString sClassPath = arOptions[i].optionString;
-        if (sClassPath.match(sClassPathProp, 0) == sal_True)
+        if (sClassPath.match(sClassPathProp, 0))
         {
             char sep[] =  {SAL_PATHSEPARATOR, 0};
             OString sAddPath = getPluginJarPath(pInfo->sVendor, pInfo->sLocation,pInfo->sVersion);
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
index 33ff7e35b530..103b3f4610db 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
@@ -59,7 +59,7 @@ struct InfoFindSame
 
     bool operator () (const rtl::Reference<VendorBase> & aVendorInfo)
     {
-        return aVendorInfo->getHome().equals(sJava) == sal_True ? true : false;
+        return aVendorInfo->getHome().equals(sJava);
     }
 };
 
@@ -75,7 +75,7 @@ struct SameOrSubDirJREMap
             return true;
         OUString sSub;
         sSub = s2.first + OUString("/");
-        if (s1.match(sSub) == sal_True)
+        if (s1.match(sSub))
             return true;
         return false;
     }
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 688864e48819..4b2bbefb10d0 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -686,9 +686,9 @@ sal_Bool SAL_CALL jfw_areEqualJavaInfo(
     OUString sLocation(pInfoA->sLocation);
     OUString sVersion(pInfoA->sVersion);
     rtl::ByteSequence sData(pInfoA->arVendorData);
-    if (sVendor.equals(pInfoB->sVendor) == sal_True
-        && sLocation.equals(pInfoB->sLocation) == sal_True
-        && sVersion.equals(pInfoB->sVersion) == sal_True
+    if (sVendor.equals(pInfoB->sVendor)
+        && sLocation.equals(pInfoB->sLocation)
+        && sVersion.equals(pInfoB->sVersion)
         && pInfoA->nFeatures == pInfoB->nFeatures
         && pInfoA->nRequirements == pInfoB->nRequirements
         && sData == pInfoB->arVendorData)
@@ -751,7 +751,7 @@ javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo **ppInfo)
         // /java/javaInfo/@vendorUpdate != javaSelection/updated (javavendors.xml)
         OString sUpdated = jfw::getElementUpdated();
 
-        if (sUpdated.equals(settings.getJavaInfoAttrVendorUpdate()) == sal_False)
+        if (!sUpdated.equals(settings.getJavaInfoAttrVendorUpdate()))
             return JFW_E_INVALID_SETTINGS;
         *ppInfo = aInfo.detach();
     }