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

[Stephan Bergmann]

 jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx |    8 ++++----
 jvmfwk/source/elements.cxx                       |    2 +-
 jvmfwk/source/elements.hxx                       |    2 +-
 jvmfwk/source/framework.cxx                      |    2 +-
 jvmfwk/source/fwkbase.cxx                        |   12 ++++++------
 5 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit f2529fc7441ced32daef09c0ca767080998d1792
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Feb 18 12:01:43 2014 +0100

    jvmfwk: sal_Bool -> bool
    
    Change-Id: I35f302006cb9ef6e98a041dea811818b98c0e876

diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index fb99974..09e0435 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -29,7 +29,7 @@
 #include "jvmfwk/framework.h"
 
 
-static sal_Bool hasOption(char const * szOption, int argc, char** argv);
+static bool hasOption(char const * szOption, int argc, char** argv);
 static OString getLD_LIBRARY_PATH(const rtl::ByteSequence & vendorData);
 static bool findAndSelect(JavaInfo**);
 
@@ -132,14 +132,14 @@ OString getLD_LIBRARY_PATH(const rtl::ByteSequence & vendorData)
     return paths;
 }
 
-static sal_Bool hasOption(char const * szOption, int argc, char** argv)
+static bool hasOption(char const * szOption, int argc, char** argv)
 {
-    sal_Bool retVal= sal_False;
+    bool retVal= false;
     for(sal_Int16 i= 1; i < argc; i++)
     {
         if( ! strcmp(argv[i], szOption))
         {
-            retVal= sal_True;
+            retVal= true;
             break;
         }
     }
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 9fdab7a..ec30fc2 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -586,7 +586,7 @@ void NodeJava::write() const
         throw FrameworkException(JFW_E_ERROR, sExcMsg);
 }
 
-void NodeJava::setEnabled(sal_Bool bEnabled)
+void NodeJava::setEnabled(bool bEnabled)
 {
     m_enabled =  boost::optional<sal_Bool>(bEnabled);
 }
diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx
index 36fbd3e..f716fe4 100644
--- a/jvmfwk/source/elements.hxx
+++ b/jvmfwk/source/elements.hxx
@@ -186,7 +186,7 @@ public:
     /** sets m_enabled.
         /java/enabled at xsi:nil will be set to false when write is called.
      */
-    void setEnabled(sal_Bool bEnabled);
+    void setEnabled(bool bEnabled);
 
     /** sets m_sUserClassPath. See setEnabled.
      */
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index f0b9d69..dcaac1b 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -40,7 +40,7 @@ static bool g_bEnabledSwitchedOn = false;
 
 static JavaVM * g_pJavaVM = NULL;
 
-sal_Bool areEqualJavaInfo(
+bool areEqualJavaInfo(
     JavaInfo const * pInfoA,JavaInfo const * pInfoB)
 {
     return jfw_areEqualJavaInfo(pInfoA, pInfoB);
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index 29949c6..3b4fba3 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -424,12 +424,12 @@ OUString BootParams::getJREHome()
 {
     OUString sJRE;
     OUString sEnvJRE;
-    sal_Bool bJRE = Bootstrap::get()->getFrom(
+    bool bJRE = Bootstrap::get()->getFrom(
         OUString(UNO_JAVA_JFW_JREHOME) ,sJRE);
-    sal_Bool bEnvJRE = Bootstrap::get()->getFrom(
+    bool bEnvJRE = Bootstrap::get()->getFrom(
         OUString(UNO_JAVA_JFW_ENV_JREHOME) ,sEnvJRE);
 
-    if (bJRE == sal_True && bEnvJRE == sal_True)
+    if (bJRE && bEnvJRE)
     {
         throw FrameworkException(
             JFW_E_CONFIGURATION,
@@ -439,7 +439,7 @@ OUString BootParams::getJREHome()
                              "Check bootstrap parameters: environment variables, command line "
                              "arguments, rc/ini files for executable and java framework library."));
     }
-    else if (bEnvJRE == sal_True)
+    else if (bEnvJRE)
     {
         const char * pJRE = getenv("JAVA_HOME");
         if (pJRE == NULL)
@@ -463,8 +463,8 @@ OUString BootParams::getJREHome()
 #endif
     }
     else if (getMode() == JFW_MODE_DIRECT
-        && bEnvJRE == sal_False
-        && bJRE == sal_False)
+        && !bEnvJRE
+        && !bJRE)
     {
         throw FrameworkException(
             JFW_E_CONFIGURATION,