summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-04-11 18:18:42 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-04-11 18:18:42 +0200
commit583508ced26a422145111242c027b3fbd5687dc5 (patch)
tree5b70ab5e93c7096d21ad7d041811a719cc87866f
parentf0454e72c1d1b11c3bcbacb23048a62fdecd037c (diff)
sal_Bool -> bool
Change-Id: I8df49f349308cc17d684d5c0e8215aa628dfaeda
-rw-r--r--include/jvmfwk/framework.hxx4
-rw-r--r--jvmfwk/inc/vendorplugin.hxx2
-rw-r--r--jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx2
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx2
-rw-r--r--jvmfwk/source/framework.cxx2
-rw-r--r--stoc/source/javavm/javavm.cxx2
6 files changed, 7 insertions, 7 deletions
diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx
index 99d25da9c03e..2373a3e713bc 100644
--- a/include/jvmfwk/framework.hxx
+++ b/include/jvmfwk/framework.hxx
@@ -716,7 +716,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_addJRELocation(rtl_uString * sLocation);
@param pInfo
[in] the JavaInfo object with information about the JRE.
@param pp_exist
- [out] the parameter is set to either sal_True or sal_False. The value is
+ [out] the parameter is set to either true or false. The value is
only valid if the function returns JFW_E_NONE.
@return
@@ -724,7 +724,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_addJRELocation(rtl_uString * sLocation);
JFW_E_ERROR an error occurred during execution.</br>
JFW_E_INVALID_ARG pInfo contains invalid data</br>
*/
-JVMFWK_DLLPUBLIC javaFrameworkError jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist);
+JVMFWK_DLLPUBLIC javaFrameworkError jfw_existJRE(const JavaInfo *pInfo, bool *exist);
/** locks this API so that it cannot be used by other threads.
diff --git a/jvmfwk/inc/vendorplugin.hxx b/jvmfwk/inc/vendorplugin.hxx
index 8d019f1c4474..6bae6370c710 100644
--- a/jvmfwk/inc/vendorplugin.hxx
+++ b/jvmfwk/inc/vendorplugin.hxx
@@ -314,7 +314,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
javaPluginError::Error an error occurred during execution.</br>
javaPluginError::InvalidArg pInfo contains invalid data</br>
*/
-javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist);
+javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, bool *exist);
#endif
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 3c1b1901eb75..4f422fd15f54 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -84,7 +84,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
else
{
//check if the JRE was not uninstalled
- sal_Bool bExist = false;
+ bool bExist = false;
errcode = jfw_existJRE(aInfo.get(), &bExist);
if (errcode == JFW_E_NONE)
{
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index d69b439f2f0a..860cbc4f2522 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -882,7 +882,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
return errorcode;
}
-javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist)
+javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, bool *exist)
{
javaPluginError ret = javaPluginError::NONE;
if (!pInfo || !exist)
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 218e2ecad297..c094ea6a8da1 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -973,7 +973,7 @@ javaFrameworkError jfw_addJRELocation(rtl_uString * sLocation)
}
-javaFrameworkError jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist)
+javaFrameworkError jfw_existJRE(const JavaInfo *pInfo, bool *exist)
{
//get the function jfw_plugin_existJRE
jfw::VendorSettings aVendorSettings;
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 41d786f91a82..3d023ce2373c 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -815,7 +815,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId)
std::unique_ptr<JavaInfo> aJavaInfo;
if (JFW_E_NONE == jfw_getSelectedJRE(&aJavaInfo))
{
- sal_Bool bExist = false;
+ bool bExist = false;
if (JFW_E_NONE == jfw_existJRE(aJavaInfo.get(), &bExist))
{
if (!bExist