sal_Bool to bool

Change-Id: I38141187c4f0809343a93c5765c0773d2321968a

15 files changed, 84 insertions, 84 deletions

diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index 6a75304ee9f2..68765f4c79f8 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -148,7 +148,7 @@ public:
     static void     MakeErrorText( SbError, const ::rtl::OUString& aMsg );
     static const    String& GetErrorText();
     static SbError  GetErrorCode();
-    static sal_Bool     IsCompilerError();
+    static bool     IsCompilerError();
     static sal_uInt16   GetVBErrorCode( SbError nError );
     static SbError  GetSfxFromVBError( sal_uInt16 nError );
     sal_Bool            IsBreak() const             { return bBreak; }
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 1a625bdb9a75..06ec0263ed85 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1416,7 +1416,7 @@ sal_uInt16 StarBASIC::GetCol2()     { return GetSbData()->nCol2; }
 // Specific to error handler
 SbError StarBASIC::GetErrorCode()       { return GetSbData()->nCode; }
 const String& StarBASIC::GetErrorText() { return GetSbData()->aErrMsg; }
-sal_Bool StarBASIC::IsCompilerError()       { return GetSbData()->bCompiler; }
+bool StarBASIC::IsCompilerError()       { return GetSbData()->bCompiler; }
 
 // From 1996-03-29:
 // The mapping between the old and the new error codes take place by searching
@@ -1597,7 +1597,7 @@ sal_Bool StarBASIC::CError
     }
 
     // set flag, so that GlobalRunInit notice the error
-    GetSbData()->bGlobalInitErr = sal_True;
+    GetSbData()->bGlobalInitErr = true;
 
     // tinker the error message
     MakeErrorText( code, rMsg );
@@ -1607,13 +1607,13 @@ sal_Bool StarBASIC::CError
         code = (sal_uIntPtr)*new StringErrorInfo( code, rMsg );
 
     SetErrorData( code, l, c1, c2 );
-    GetSbData()->bCompiler = sal_True;
+    GetSbData()->bCompiler = true;
     sal_Bool bRet;
     if( GetSbData()->aErrHdl.IsSet() )
         bRet = (sal_Bool) GetSbData()->aErrHdl.Call( this );
     else
         bRet = ErrorHdl();
-    GetSbData()->bCompiler = sal_False;     // only true for error handler
+    GetSbData()->bCompiler = false;     // only true for error handler
     return bRet;
 }
 
diff --git a/basic/source/classes/sbintern.cxx b/basic/source/classes/sbintern.cxx
index 292897b7e57e..fb3f802e6bbd 100644
--- a/basic/source/classes/sbintern.cxx
+++ b/basic/source/classes/sbintern.cxx
@@ -49,11 +49,11 @@ SbiGlobals::SbiGlobals()
     nCode = 0;
     nLine = 0;
     nCol1 = nCol2 = 0;
-    bCompiler = sal_False;
-    bGlobalInitErr = sal_False;
-    bRunInit = sal_False;
+    bCompiler = false;
+    bGlobalInitErr = false;
+    bRunInit = false;
     pTransliterationWrapper = NULL;
-    bBlockCompilerError = sal_False;
+    bBlockCompilerError = false;
     pAppBasMgr = NULL;
     pMSOMacroRuntimLib = NULL;
 }
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index b9ec529876b2..6005c7a76eec 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -2306,7 +2306,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                 }
 
                 // call the method
-                GetSbData()->bBlockCompilerError = sal_True;  // #106433 Block compiler errors for API calls
+                GetSbData()->bBlockCompilerError = true;  // #106433 Block compiler errors for API calls
                 try
                 {
                     if( !bInvocation && mxUnoAccess.is() )
@@ -2350,7 +2350,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                 {
                     implHandleAnyException( ::cppu::getCaughtException() );
                 }
-                GetSbData()->bBlockCompilerError = sal_False;  // #106433 Unblock compiler errors
+                GetSbData()->bBlockCompilerError = false;  // #106433 Unblock compiler errors
             }
         }
         else
@@ -2361,8 +2361,8 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
 
 SbUnoObject::SbUnoObject( const rtl::OUString& aName_, const Any& aUnoObj_ )
     : SbxObject( aName_ )
-    , bNeedIntrospection( sal_True )
-    , bNativeCOMObject( sal_False )
+    , bNeedIntrospection( true )
+    , bNativeCOMObject( false )
 {
     static Reference< XIntrospection > xIntrospection;
 
@@ -2396,7 +2396,7 @@ SbUnoObject::SbUnoObject( const rtl::OUString& aName_, const Any& aUnoObj_ )
         // The remainder refers only to the introspection
         if( !xTypeProvider.is() )
         {
-            bNeedIntrospection = sal_False;
+            bNeedIntrospection = false;
             return;
         }
 
@@ -2404,7 +2404,7 @@ SbUnoObject::SbUnoObject( const rtl::OUString& aName_, const Any& aUnoObj_ )
         // hiding of equally named COM symbols, e.g. XInvocation::getValue
         Reference< oleautomation::XAutomationObject > xAutomationObject( aUnoObj_, UNO_QUERY );
         if( xAutomationObject.is() )
-            bNativeCOMObject = sal_True;
+            bNativeCOMObject = true;
     }
 
     maTmpUnoObj = aUnoObj_;
@@ -2462,7 +2462,7 @@ void SbUnoObject::doIntrospection( void )
 
     if( !bNeedIntrospection )
         return;
-    bNeedIntrospection = sal_False;
+    bNeedIntrospection = false;
 
     if( !xIntrospection.is() )
     {
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 61b7f0da6404..6c423947d8dd 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1166,7 +1166,7 @@ sal_uInt16 SbModule::Run( SbMethod* pMeth )
         GlobalRunInit( /* bBasicStart = */ bDelInst );
 
         // Appeared a compiler error? Then we don't launch
-        if( GetSbData()->bGlobalInitErr == sal_False )
+        if( !GetSbData()->bGlobalInitErr )
         {
             if( bDelInst )
             {
@@ -1300,7 +1300,7 @@ void SbModule::RunInit()
      && pImage->GetFlag( SBIMG_INITCODE ) )
     {
         // Set flag, so that RunInit get activ (Testtool)
-        GetSbData()->bRunInit = sal_True;
+        GetSbData()->bRunInit = true;
 
         SbModule* pOldMod = GetSbData()->pMod;
         GetSbData()->pMod = this;
@@ -1318,7 +1318,7 @@ void SbModule::RunInit()
         pImage->bFirstInit = false;
 
         // RunInit is not activ anymore
-        GetSbData()->bRunInit = sal_False;
+        GetSbData()->bRunInit = false;
     }
 }
 
@@ -1458,7 +1458,7 @@ void SbModule::GlobalRunInit( sal_Bool bBasicStart )
     // With the help of this flags could be located in SbModule::Run() after the call of
     // GlobalRunInit, if at the intialising of the module
     // an error occurred. Then it will not be launched.
-    GetSbData()->bGlobalInitErr = sal_False;
+    GetSbData()->bGlobalInitErr = false;
 
     // Parent of the module is a Basic
     StarBASIC *pBasic = PTR_CAST(StarBASIC,GetParent());
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 7dbb9104d697..e2c795718736 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -263,11 +263,11 @@ class SbiRuntime
     SbxArrayRef   refArgv;
     // #74254, one refSaveObj is not enough! new: pRefSaveList (see above)
     short         nArgc;
-    sal_Bool          bRun;
+    bool          bRun;
     bool          bError;           // true: handle errors
-    sal_Bool          bInError;         // sal_True: in an error handler
-    sal_Bool          bBlocked;         // sal_True: blocked by next call level, #i48868
-    sal_Bool          bVBAEnabled;
+    bool          bInError;         // true: in an error handler
+    bool          bBlocked;         // true: blocked by next call level, #i48868
+    bool          bVBAEnabled;
     sal_uInt16        nFlags;           // Debugging-Flags
     SbError       nError;
     sal_uInt16        nOps;             // opcode counter
@@ -299,7 +299,7 @@ class SbiRuntime
     }
 
     SbxVariable* FindElement
-    ( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError, sal_Bool bLocal, sal_Bool bStatic = sal_False );
+    ( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError, bool bLocal, bool bStatic = false );
     void SetupArgs( SbxVariable*, sal_uInt32 );
     SbxVariable* CheckArray( SbxVariable* );
 
@@ -307,7 +307,7 @@ class SbiRuntime
     SbxVariableRef PopVar();
     SbxVariable* GetTOS( short=0 );
     void TOSMakeTemp();
-    sal_Bool ClearExprStack();
+    bool ClearExprStack();
 
     void PushGosub( const sal_uInt8* );
     void PopGosub();
@@ -329,7 +329,7 @@ class SbiRuntime
     void SetParameters( SbxArray* );
 
     // HAS TO BE IMPLEMENTED SOME TIME
-    void DllCall( const String&, const String&, SbxArray*, SbxDataType, sal_Bool );
+    void DllCall( const String&, const String&, SbxArray*, SbxDataType, bool );
 
     // #56204 swap out DIM-functionality into help method (step0.cxx)
     void DimImpl( SbxVariableRef refVar );
@@ -371,7 +371,7 @@ class SbiRuntime
     // all opcodes with two operands
     void StepRTL( sal_uInt32, sal_uInt32 ),     StepPUBLIC( sal_uInt32, sal_uInt32 ),   StepPUBLIC_P( sal_uInt32, sal_uInt32 );
     void StepPUBLIC_Impl( sal_uInt32, sal_uInt32, bool bUsedForClassModule );
-    void StepFIND_Impl( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError, sal_Bool bLocal, sal_Bool bStatic = sal_False );
+    void StepFIND_Impl( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError, bool bLocal, bool bStatic = false );
     void StepFIND( sal_uInt32, sal_uInt32 ),    StepELEM( sal_uInt32, sal_uInt32 );
     void StepGLOBAL( sal_uInt32, sal_uInt32 ),  StepLOCAL( sal_uInt32, sal_uInt32 );
     void StepPARAM( sal_uInt32, sal_uInt32),    StepCREATE( sal_uInt32, sal_uInt32 );
@@ -400,10 +400,10 @@ public:
     void FatalError( SbError, const String& );  // error handling = standard, set error
     static sal_Int32 translateErrorToVba( SbError nError, String& rMsg );
     void DumpPCode();
-    sal_Bool Step();                    // single step (one opcode)
-    void Stop()            { bRun = sal_False;   }
-    void block( void )     { bBlocked = sal_True; }
-    void unblock( void )   { bBlocked = sal_False; }
+    bool Step();                    // single step (one opcode)
+    void Stop()            { bRun = false;   }
+    void block( void )     { bBlocked = true; }
+    void unblock( void )   { bBlocked = false; }
     SbMethod* GetMethod()  { return pMeth;   }
     SbModule* GetModule()  { return pMod;    }
     sal_uInt16 GetDebugFlags() { return nFlags;  }
@@ -441,12 +441,12 @@ StarBASIC* GetCurrentBasic( StarBASIC* pRTBasic );
 // no DDE functionality, no DLLCALL) in basic because
 // of portal "virtual" users (portal user != UNIX user)
 // (Implemented in iosys.cxx)
-sal_Bool needSecurityRestrictions( void );
+bool needSecurityRestrictions( void );
 
-// Returns sal_True if UNO is available, otherwise the old
+// Returns true if UNO is available, otherwise the old
 // file system implementation has to be used
 // (Implemented in iosys.cxx)
-sal_Bool hasUno( void );
+bool hasUno( void );
 
 // Converts possibly relative paths to absolute paths
 // according to the setting done by ChDir/ChDrive
diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx
index 3ed8e5f4359f..a4ff91f6d268 100644
--- a/basic/source/inc/sbintern.hxx
+++ b/basic/source/inc/sbintern.hxx
@@ -95,12 +95,12 @@ struct SbiGlobals
     SbError         nCode;
     xub_StrLen      nLine;
     xub_StrLen      nCol1,nCol2;    // from... to...
-    sal_Bool            bCompiler;      // flag for compiler error
-    sal_Bool            bGlobalInitErr;
-    sal_Bool            bRunInit;       // sal_True, if RunInit active from the Basic
+    bool            bCompiler;      // flag for compiler error
+    bool            bGlobalInitErr;
+    bool            bRunInit;       // true, if RunInit active from the Basic
     String          aErrMsg;        // buffer for GetErrorText()
     ::utl::TransliterationWrapper* pTransliterationWrapper;    // For StrComp
-    sal_Bool            bBlockCompilerError;
+    bool            bBlockCompilerError;
     BasicManager*   pAppBasMgr;
     StarBASIC*      pMSOMacroRuntimLib; // Lib containing MSO Macro Runtime API entry symbols
 
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index 222943f87df7..ab0f43901099 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -106,8 +106,8 @@ class SbUnoObject: public SbxObject
     ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > mxInvocation;
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XExactName > mxExactName;
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XExactName > mxExactNameInvocation;
-    sal_Bool bNeedIntrospection;
-    sal_Bool bNativeCOMObject;
+    bool bNeedIntrospection;
+    bool bNativeCOMObject;
     ::com::sun::star::uno::Any maTmpUnoObj; // Only to save obj for doIntrospection!
     ::boost::shared_ptr< SbUnoStructRefObject > maStructInfo;
     // help method to establish the dbg_-properties
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index a3e848d6a914..372a298dcac4 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -142,8 +142,8 @@ class SfxScriptLibrary : public SfxLibrary, public SfxScriptLibrary_BASE
 
     typedef boost::unordered_map< ::rtl::OUString, ::com::sun::star::script::ModuleInfo, ::rtl::OUStringHash > ModuleInfoMap;
 
-    sal_Bool mbLoadedSource;
-    sal_Bool mbLoadedBinary;
+    bool mbLoadedSource;
+    bool mbLoadedBinary;
     ModuleInfoMap mModuleInfos;
 
     // Provide modify state including resources
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 8ec4614f9fea..893ba364d75b 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -194,14 +194,14 @@ void SbiStream::MapError()
     return user;
 }
 
-sal_Bool needSecurityRestrictions( void )
+bool needSecurityRestrictions( void )
 {
-    static sal_Bool bNeedInit = sal_True;
-    static sal_Bool bRetVal = sal_True;
+    static bool bNeedInit = true;
+    static bool bRetVal = true;
 
     if( bNeedInit )
     {
-        bNeedInit = sal_False;
+        bNeedInit = false;
 
         // Get system user to compare to portal user
         oslSecurity aSecurity = osl_getCurrentSecurity();
@@ -210,12 +210,12 @@ sal_Bool needSecurityRestrictions( void )
         if( !bRet )
         {
             // No valid security! -> Secure mode!
-            return sal_True;
+            return true;
         }
 
         Reference< XMultiServiceFactory > xSMgr = getProcessServiceFactory();
         if( !xSMgr.is() )
-            return sal_True;
+            return true;
         Reference< XBridgeFactory > xBridgeFac( xSMgr->createInstance
             ( ::rtl::OUString("com.sun.star.bridge.BridgeFactory" ) ), UNO_QUERY );
 
@@ -230,13 +230,13 @@ sal_Bool needSecurityRestrictions( void )
         if( nBridgeCount == 0 )
         {
             // No bridges -> local
-            bRetVal = sal_False;
+            bRetVal = false;
             return bRetVal;
         }
 
         // Iterate through all bridges to find (portal) user property
         const Reference< XBridge >* pBridges = aBridgeSeq.getConstArray();
-        bRetVal = sal_False;    // Now only sal_True if user different from portal user is found
+        bRetVal = false;    // Now only sal_True if user different from portal user is found
         sal_Int32 i;
         for( i = 0 ; i < nBridgeCount ; i++ )
         {
@@ -254,7 +254,7 @@ sal_Bool needSecurityRestrictions( void )
                 else
                 {
                     // Different user -> Secure mode!
-                    bRetVal = sal_True;
+                    bRetVal = true;
                     break;
                 }
             }
@@ -268,19 +268,19 @@ sal_Bool needSecurityRestrictions( void )
 // Returns sal_True if UNO is available, otherwise the old file
 // system implementation has to be used
 // #89378 New semantic: Don't just ask for UNO but for UCB
-sal_Bool hasUno( void )
+bool hasUno( void )
 {
-    static sal_Bool bNeedInit = sal_True;
-    static sal_Bool bRetVal = sal_True;
+    static bool bNeedInit = true;
+    static bool bRetVal = true;
 
     if( bNeedInit )
     {
-        bNeedInit = sal_False;
+        bNeedInit = false;
         Reference< XMultiServiceFactory > xSMgr = getProcessServiceFactory();
         if( !xSMgr.is() )
         {
             // No service manager at all
-            bRetVal = sal_False;
+            bRetVal = false;
         }
         else
         {
@@ -290,7 +290,7 @@ sal_Bool hasUno( void )
             if ( !( xManager.is() && xManager->queryContentProvider( ::rtl::OUString("file:///" ) ).is() ) )
             {
                 // No UCB
-                bRetVal = sal_False;
+                bRetVal = false;
             }
         }
     }
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 32d0abb71954..f81e99dd89a5 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -527,8 +527,8 @@ SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, sal_uInt32 nStart )
     pStmnt    = (const sal_uInt8* ) pImg->GetCode() + nStart;
     bRun      =
     bError    = true;
-    bInError  = sal_False;
-    bBlocked  = sal_False;
+    bInError  = false;
+    bBlocked  = false;
     nLine     = 0;
     nCol1     = 0;
     nCol2     = 0;
@@ -678,7 +678,7 @@ void SbiRuntime::SetParameters( SbxArray* pParams )
 
 // execute a P-Code
 
-sal_Bool SbiRuntime::Step()
+bool SbiRuntime::Step()
 {
     if( bRun )
     {
@@ -751,7 +751,7 @@ sal_Bool SbiRuntime::Step()
             // in the error handler? so std-error
             if ( !bInError )
             {
-                bInError = sal_True;
+                bInError = true;
 
                 if( !bError )           // On Error Resume Next
                     StepRESUME( 1 );
@@ -791,7 +791,7 @@ sal_Bool SbiRuntime::Step()
                     {
                         pRt->nError = err;
                         if( pRt != pRtErrHdl )
-                            pRt->bRun = sal_False;
+                            pRt->bRun = false;
                         else
                             break;
                         pRt = pRt->pNext;
@@ -924,7 +924,7 @@ SbxVariableRef SbiRuntime::PopVar()
     return xVar;
 }
 
-sal_Bool SbiRuntime::ClearExprStack()
+bool SbiRuntime::ClearExprStack()
 {
     // Attention: Clear() doesn't suffice as methods must be deleted
     while ( nExprLvl )
@@ -932,7 +932,7 @@ sal_Bool SbiRuntime::ClearExprStack()
         PopVar();
     }
     refExprStk->Clear();
-    return sal_False;
+    return false;
 }
 
 // Take variable from the expression-stack without removing it
@@ -1198,7 +1198,7 @@ void SbiRuntime::DllCall
       const String& aDLLName,
       SbxArray* pArgs,          // parameter (from index 1, can be NULL)
       SbxDataType eResType,     // return value
-      sal_Bool bCDecl )         // sal_True: according to C-conventions
+      bool bCDecl )         // true: according to C-conventions
 {
     // No DllCall for "virtual" portal users
     if( needSecurityRestrictions() )
diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx
index 869ddcc32ca1..9ea8ed40a3e8 100644
--- a/basic/source/runtime/step0.cxx
+++ b/basic/source/runtime/step0.cxx
@@ -576,7 +576,7 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b
         }
 
         // Handle Dim As New
-        sal_Bool bDimAsNew = bVBAEnabled && refVar->IsSet( SBX_DIM_AS_NEW );
+        bool bDimAsNew = bVBAEnabled && refVar->IsSet( SBX_DIM_AS_NEW );
         SbxBaseRef xPrevVarObj;
         if( bDimAsNew )
             xPrevVarObj = refVar->GetObject();
@@ -1264,7 +1264,7 @@ void SbiRuntime::StepNOERROR()
 
 void SbiRuntime::StepLEAVE()
 {
-    bRun = sal_False;
+    bRun = false;
         // If VBA and we are leaving an ErrorHandler then clear the error ( it's been processed )
     if ( bInError && pError )
         SbxErrObject::getUnoErrObject()->Clear();
diff --git a/basic/source/runtime/step1.cxx b/basic/source/runtime/step1.cxx
index cd63c8091eea..a9466faae69b 100644
--- a/basic/source/runtime/step1.cxx
+++ b/basic/source/runtime/step1.cxx
@@ -387,7 +387,7 @@ void SbiRuntime::StepRESUME( sal_uInt32 nOp1 )
     pInst->nErr = 0;
     pInst->nErl = 0;
     nError = 0;
-    bInError = sal_False;
+    bInError = false;
 }
 
 // close channel (+channel, 0=all)
diff --git a/basic/source/runtime/step2.cxx b/basic/source/runtime/step2.cxx
index a75ebe8e30aa..e2d898cf429c 100644
--- a/basic/source/runtime/step2.cxx
+++ b/basic/source/runtime/step2.cxx
@@ -46,7 +46,7 @@ SbxVariable* getVBAConstant( const String& rName );
 // 0x8000 - Argv is reserved
 
 SbxVariable* SbiRuntime::FindElement
-    ( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError nNotFound, sal_Bool bLocal, sal_Bool bStatic )
+    ( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError nNotFound, bool bLocal, bool bStatic )
 {
     bool bIsVBAInterOp = SbiRuntime::isVBAEnabled();
     if( bIsVBAInterOp )
@@ -604,11 +604,11 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
 
 void SbiRuntime::StepRTL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
-    PushVar( FindElement( rBasic.pRtl, nOp1, nOp2, SbERR_PROC_UNDEFINED, sal_False ) );
+    PushVar( FindElement( rBasic.pRtl, nOp1, nOp2, SbERR_PROC_UNDEFINED, false ) );
 }
 
 void
-SbiRuntime::StepFIND_Impl( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError nNotFound, sal_Bool bLocal, sal_Bool bStatic )
+SbiRuntime::StepFIND_Impl( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError nNotFound, bool bLocal, bool bStatic )
 {
     if( !refLocals )
         refLocals = new SbxArray;
@@ -618,7 +618,7 @@ SbiRuntime::StepFIND_Impl( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, Sb
 
 void SbiRuntime::StepFIND( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
-    StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, sal_True );
+    StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, true );
 }
 
 // Search inside a class module (CM) to enable global search in time
@@ -629,7 +629,7 @@ void SbiRuntime::StepFIND_CM( sal_uInt32 nOp1, sal_uInt32 nOp2 )
     if( pClassModuleObject )
         pMod->SetFlag( SBX_GBLSEARCH );
 
-    StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, sal_True );
+    StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, true );
 
     if( pClassModuleObject )
         pMod->ResetFlag( SBX_GBLSEARCH );
@@ -637,7 +637,7 @@ void SbiRuntime::StepFIND_CM( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 
 void SbiRuntime::StepFIND_STATIC( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
-    StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, sal_True, sal_True );
+    StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, true, true );
 }
 
 // loading an object-element (+StringID+type)
@@ -661,7 +661,7 @@ void SbiRuntime::StepELEM( sal_uInt32 nOp1, sal_uInt32 nOp2 )
     if( pObj )
         SaveRef( (SbxVariable*)pObj );
 
-    PushVar( FindElement( pObj, nOp1, nOp2, SbERR_NO_METHOD, sal_False ) );
+    PushVar( FindElement( pObj, nOp1, nOp2, SbERR_NO_METHOD, false ) );
 }
 
 // loading a parameter (+offset+type)
@@ -767,7 +767,7 @@ void SbiRuntime::StepCALL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
     SbxArray* pArgs = NULL;
     if( nOp1 & 0x8000 )
         pArgs = refArgv;
-    DllCall( aName, aLibName, pArgs, (SbxDataType) nOp2, sal_False );
+    DllCall( aName, aLibName, pArgs, (SbxDataType) nOp2, false );
     aLibName = String();
     if( nOp1 & 0x8000 )
         PopArgv();
@@ -781,7 +781,7 @@ void SbiRuntime::StepCALLC( sal_uInt32 nOp1, sal_uInt32 nOp2 )
     SbxArray* pArgs = NULL;
     if( nOp1 & 0x8000 )
         pArgs = refArgv;
-    DllCall( aName, aLibName, pArgs, (SbxDataType) nOp2, sal_True );
+    DllCall( aName, aLibName, pArgs, (SbxDataType) nOp2, true );
     aLibName = String();
     if( nOp1 & 0x8000 )
         PopArgv();
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 1ccdc06a761e..cdd4b9ef6b56 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -876,14 +876,14 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
             return sal_False;
 
         bLoadBinary = sal_True;
-        pScriptLib->mbLoadedBinary = sal_True;
+        pScriptLib->mbLoadedBinary = true;
     }
 
     sal_Bool bLoadSource = sal_False;
     if( !pScriptLib->mbLoadedSource && pLib->mbPasswordVerified && !bVerifyPasswordOnly )
     {
         bLoadSource = sal_True;
-        pScriptLib->mbLoadedSource = sal_True;
+        pScriptLib->mbLoadedSource = true;
     }
 
     Sequence< OUString > aElementNames = pLib->getElementNames();
@@ -1182,8 +1182,8 @@ SfxScriptLibrary::SfxScriptLibrary( ModifiableHelper& _rModifiable,
                                     const Reference< XMultiServiceFactory >& xMSF,
                                     const Reference< XSimpleFileAccess2 >& xSFI )
     : SfxLibrary( _rModifiable, getCppuType( (const OUString *)0 ), xMSF, xSFI )
-    , mbLoadedSource( sal_False )
-    , mbLoadedBinary( sal_False )
+    , mbLoadedSource( false )
+    , mbLoadedBinary( false )
 {
 }
 
@@ -1195,8 +1195,8 @@ SfxScriptLibrary::SfxScriptLibrary( ModifiableHelper& _rModifiable,
                                     sal_Bool ReadOnly )
     : SfxLibrary( _rModifiable, getCppuType( (const OUString *)0 ), xMSF, xSFI,
                         aLibInfoFileURL, aStorageURL, ReadOnly)
-    , mbLoadedSource( sal_False )
-    , mbLoadedBinary( sal_False )
+    , mbLoadedSource( false )
+    , mbLoadedBinary( false )
 {
 }