summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-03-10 15:10:39 +0100
committerStephan Bergmann <sbergman@redhat.com>2016-03-10 21:41:22 +0100
commit8471ba7b97a2a01039133674d3960c5c16803833 (patch)
tree2011f7b8b395ed5195b283002add798463958db0 /jvmfwk
parentb6dbc5e70805fd5905ac6e1ec46234ae0020c4cb (diff)
No need for extern "C" here
...and fix resulting loplugin:salbool fallout Change-Id: I5ae1497608d31c20b0d10676450a7673dee1c651
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/source/framework.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 501bf7143a0c..819b6a1acef3 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -624,13 +624,13 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
return errcode;
}
-sal_Bool SAL_CALL jfw_areEqualJavaInfo(
+bool SAL_CALL jfw_areEqualJavaInfo(
JavaInfo const * pInfoA,JavaInfo const * pInfoB)
{
if (pInfoA == pInfoB)
- return sal_True;
+ return true;
if (pInfoA == nullptr || pInfoB == nullptr)
- return sal_False;
+ return false;
OUString sVendor(pInfoA->sVendor);
OUString sLocation(pInfoA->sLocation);
OUString sVersion(pInfoA->sVersion);
@@ -642,9 +642,9 @@ sal_Bool SAL_CALL jfw_areEqualJavaInfo(
&& pInfoA->nRequirements == pInfoB->nRequirements
&& sData == pInfoB->arVendorData)
{
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
@@ -827,7 +827,7 @@ javaFrameworkError SAL_CALL jfw_setSelectedJRE(JavaInfo const *pInfo)
}
return errcode;
}
-javaFrameworkError SAL_CALL jfw_setEnabled(sal_Bool bEnabled)
+javaFrameworkError SAL_CALL jfw_setEnabled(bool bEnabled)
{
javaFrameworkError errcode = JFW_E_NONE;
try