diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-10 15:10:39 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-07-13 21:37:51 +0200 |
| commit | 763d2d2de29139c36e14c1a22844f4f4744a4be7 (patch) | |
| tree | acc957d41640eddd2b08e73d34d59794b1df4fdf /jvmfwk | |
| parent | 88df7efb5164cb2e7ecb8f84a1bf1707743ed980 (diff) | |
No need for extern "C" here
...and fix resulting loplugin:salbool fallout
Change-Id: I5ae1497608d31c20b0d10676450a7673dee1c651
(cherry picked from commit 8471ba7b97a2a01039133674d3960c5c16803833)
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/source/framework.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 4f02abe9fc6b..f68ab2e5ae28 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 |