[Libreoffice-commits] core.git: include/jvmfwk jvmfwk/inc jvmfwk/plugins jvmfwk/source stoc/source

[Stephan Bergmann]

 include/jvmfwk/framework.hxx                        |    4 ++--
 jvmfwk/inc/vendorplugin.hxx                         |    2 +-
 jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx    |    2 +-
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |    2 +-
 jvmfwk/source/framework.cxx                         |    2 +-
 stoc/source/javavm/javavm.cxx                       |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 583508ced26a422145111242c027b3fbd5687dc5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Apr 11 18:18:42 2017 +0200

    sal_Bool -> bool
    
    Change-Id: I8df49f349308cc17d684d5c0e8215aa628dfaeda

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