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

[Stephan Bergmann]

 connectivity/source/drivers/hsqldb/HDriver.cxx   |    2 +-
 connectivity/source/drivers/jdbc/JDriver.cxx     |    2 +-
 cui/source/options/optjava.cxx                   |    4 ++--
 include/jvmfwk/framework.hxx                     |    2 +-
 jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx |    2 +-
 jvmfwk/source/framework.cxx                      |    2 +-
 stoc/source/javavm/javavm.cxx                    |    2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 7635e0c1c7f821a1081f8e3868f641ae74a172d6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Apr 11 18:38:51 2017 +0200

    sal_Bool -> bool
    
    Change-Id: If632eb547aa5082ad13eac8c2ad39a1742309fc7

diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 36abefe200d3..4d35689f2f31 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -384,7 +384,7 @@ namespace connectivity
 
     sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString& url )
     {
-        sal_Bool bEnabled = false;
+        bool bEnabled = false;
         javaFrameworkError e = jfw_getEnabled(&bEnabled);
         switch (e) {
         case JFW_E_NONE:
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx
index 2a9c894aa4f9..2ae3deb0f27d 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -108,7 +108,7 @@ sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const OUString& url )
 {
     // don't ask the real driver for the url
     // I feel responsible for all jdbc url's
-    sal_Bool bEnabled = false;
+    bool bEnabled = false;
     javaFrameworkError e = jfw_getEnabled(&bEnabled);
     switch (e) {
     case JFW_E_NONE:
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 843fc2e5eb52..41430d586db2 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -690,7 +690,7 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ )
         }
     }
 
-    sal_Bool bEnabled = false;
+    bool bEnabled = false;
     eErr = jfw_getEnabled( &bEnabled );
     DBG_ASSERT( JFW_E_NONE == eErr,
                 "SvxJavaOptionsPage::FillItemSet(): error in jfw_getEnabled" );
@@ -715,7 +715,7 @@ void SvxJavaOptionsPage::Reset( const SfxItemSet* /*rSet*/ )
     SvtMiscOptions aMiscOpt;
 
 #if HAVE_FEATURE_JAVA
-    sal_Bool bEnabled = false;
+    bool bEnabled = false;
     javaFrameworkError eErr = jfw_getEnabled( &bEnabled );
     if ( eErr != JFW_E_NONE )
         bEnabled = false;
diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx
index d212ed224455..a3612a99e25a 100644
--- a/include/jvmfwk/framework.hxx
+++ b/include/jvmfwk/framework.hxx
@@ -582,7 +582,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_setEnabled(bool bEnabled);
     were not met.<br/>
     JFW_E_DIRECT_MODE the function cannot be used in this mode.
  */
-JVMFWK_DLLPUBLIC javaFrameworkError jfw_getEnabled(sal_Bool *pbEnabled);
+JVMFWK_DLLPUBLIC javaFrameworkError jfw_getEnabled(bool *pbEnabled);
 
 /** determines parameters which are passed to VM during its creation.
 
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 4f422fd15f54..8649bd121b89 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -54,7 +54,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
             fprintf(stdout, HELP_TEXT);// default
             return 0;
         }
-        sal_Bool bEnabled = false;
+        bool bEnabled = false;
         javaFrameworkError errcode = jfw_getEnabled( & bEnabled);
         if (errcode == JFW_E_NONE && !bEnabled)
         {
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 751068cabf0e..9eeee6a75249 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -823,7 +823,7 @@ javaFrameworkError jfw_setEnabled(bool bEnabled)
     return errcode;
 }
 
-javaFrameworkError jfw_getEnabled(sal_Bool *pbEnabled)
+javaFrameworkError jfw_getEnabled(bool *pbEnabled)
 {
     javaFrameworkError errcode = JFW_E_NONE;
     try
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 3d023ce2373c..18ab9084c78e 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -938,7 +938,7 @@ sal_Bool SAL_CALL JavaVirtualMachine::isVMEnabled()
 //    initVMConfiguration(&aJvm, m_xContext->getServiceManager(), m_xContext);
 //    return aJvm.isEnabled();
     //ToDo
-    sal_Bool bEnabled = false;
+    bool bEnabled = false;
     if (jfw_getEnabled( & bEnabled) != JFW_E_NONE)
         throw css::uno::RuntimeException();
     return bEnabled;