various: sal_Bool->bool

Change-Id: I30fa5227f30373f95060148f269450d2945c1bb9

2 files changed, 21 insertions, 21 deletions

diff --git a/cpputools/source/sp2bv/sp2bv.cxx b/cpputools/source/sp2bv/sp2bv.cxx
index a4147dfaafb8..b3853fc07985 100644
--- a/cpputools/source/sp2bv/sp2bv.cxx
+++ b/cpputools/source/sp2bv/sp2bv.cxx
@@ -24,7 +24,7 @@
 #include "rtl/ustring.hxx"
 #include "rtl/ustrbuf.h"
 
-static sal_Bool hasOption(char const * szOption, int argc, char** argv);
+static bool hasOption(char const * szOption, int argc, char** argv);
 
 
 #define HELP_TEXT    \
@@ -109,14 +109,14 @@ int main(int argc, char **argv)
 
 
 
-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/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index 05b1fd49e768..687c6e7bb003 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -59,7 +59,7 @@ using namespace com::sun::star::container;
 namespace unoexe
 {
 
-static sal_Bool s_quiet = false;
+static bool s_quiet = false;
 
 static inline void out( const sal_Char * pText )
 {
@@ -84,18 +84,18 @@ static const char arUsingText[] =
 "    [--quiet]\n"
 "    [-- Argument1 Argument2 ...]\n";
 
-static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
-                            sal_uInt32 * pnIndex, const OUString & aArg)
+static bool readOption( OUString * pValue, const sal_Char * pOpt,
+                        sal_uInt32 * pnIndex, const OUString & aArg)
     throw (RuntimeException)
 {
     const OUString dash("-");
     if(!aArg.startsWith(dash))
-        return sal_False;
+        return false;
 
     OUString aOpt = OUString::createFromAscii( pOpt );
 
     if (aArg.getLength() < aOpt.getLength())
-        return sal_False;
+        return false;
 
     if (aOpt.equalsIgnoreAsciiCase( aArg.copy(1) ))
     {
@@ -119,7 +119,7 @@ static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
               out( tmp.getStr() );
 #endif
             ++(*pnIndex);
-            return sal_True;
+            return true;
         }
     }
       else if (aArg.indexOf(aOpt) == 1)
@@ -134,13 +134,13 @@ static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
 #endif
         ++(*pnIndex);
 
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
-static sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt,
-                            sal_uInt32 * pnIndex, const OUString & aArg)
+static bool readOption( bool * pbOpt, const sal_Char * pOpt,
+                        sal_uInt32 * pnIndex, const OUString & aArg)
 {
     const OUString dashdash("--");
     OUString aOpt = OUString::createFromAscii(pOpt);
@@ -148,14 +148,14 @@ static sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt,
     if(aArg.startsWith(dashdash) && aOpt.equals(aArg.copy(2)))
     {
         ++(*pnIndex);
-        *pbOpt = sal_True;
+        *pbOpt = true;
 #if OSL_DEBUG_LEVEL > 1
         out( "\n> identified option --" );
         out( pOpt );
 #endif
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 template< class T >
@@ -270,7 +270,7 @@ class OInstanceProvider
 
     Mutex                             _aSingleInstanceMutex;
     Reference< XInterface >           _xSingleInstance;
-    sal_Bool                          _bSingleInstance;
+    bool                              _bSingleInstance;
 
     OUString                          _aImplName;
     OUString                          _aLocation;
@@ -285,7 +285,7 @@ public:
     OInstanceProvider( const Reference< XComponentContext > & xContext,
                        const OUString & rImplName, const OUString & rLocation,
                        const OUString & rServiceName, const Sequence< Any > & rInitParams,
-                       sal_Bool bSingleInstance, const OUString & rInstanceName )
+                       bool bSingleInstance, const OUString & rInstanceName )
         : _xContext( xContext )
         , _bSingleInstance( bSingleInstance )
         , _aImplName( rImplName )
@@ -408,8 +408,8 @@ SAL_IMPLEMENT_MAIN()
     {
         OUString aImplName, aLocation, aServiceName, aUnoUrl;
         Sequence< OUString > aParams;
-        sal_Bool bSingleAccept = sal_False;
-        sal_Bool bSingleInstance = sal_False;
+        bool bSingleAccept = false;
+        bool bSingleInstance = false;
 
         // read command line arguments