sal_Bool to bool

Change-Id: I6206ee7e17e12388ea644123e180842df3e3a7ee

8 files changed, 94 insertions, 94 deletions

diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index 7fa0c00e0b37..ea27e63cbfb5 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -29,7 +29,7 @@ SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj );
 // Return-value: a new instance, which were inserted and then deleted.
 // Array-Indexex were returned as SbiDimList
 
-SbiSymDef* SbiParser::VarDecl( SbiDimList** ppDim, sal_Bool bStatic, sal_Bool bConst )
+SbiSymDef* SbiParser::VarDecl( SbiDimList** ppDim, bool bStatic, bool bConst )
 {
     bool bWithEvents = false;
     if( Peek() == WITHEVENTS )
@@ -188,34 +188,34 @@ void SbiParser::TypeDecl( SbiSymDef& rDef, sal_Bool bAsNewAlreadyParsed )
 
 void SbiParser::Dim()
 {
-    DefVar( _DIM, ( pProc && bVBASupportOn ) ? pProc->IsStatic() : sal_False );
+    DefVar( _DIM, ( pProc && bVBASupportOn ) ? pProc->IsStatic() : false );
 }
 
-void SbiParser::DefVar( SbiOpcode eOp, sal_Bool bStatic )
+void SbiParser::DefVar( SbiOpcode eOp, bool bStatic )
 {
     SbiSymPool* pOldPool = pPool;
-    sal_Bool bSwitchPool = sal_False;
-    sal_Bool bPersistantGlobal = sal_False;
+    bool bSwitchPool = false;
+    bool bPersistantGlobal = false;
     SbiToken eFirstTok = eCurTok;
     if( pProc && ( eCurTok == GLOBAL || eCurTok == PUBLIC || eCurTok == PRIVATE ) )
         Error( SbERR_NOT_IN_SUBR, eCurTok );
     if( eCurTok == PUBLIC || eCurTok == GLOBAL )
     {
-        bSwitchPool = sal_True;     // at the right moment switch to the global pool
+        bSwitchPool = true;     // at the right moment switch to the global pool
         if( eCurTok == GLOBAL )
-            bPersistantGlobal = sal_True;
+            bPersistantGlobal = true;
     }
     // behavior in VBA is that a module scope variable's lifetime is
     // tied to the document. e.g. a module scope variable is global
        if(  GetBasic()->IsDocBasic() && bVBASupportOn && !pProc )
-        bPersistantGlobal = sal_True;
+        bPersistantGlobal = true;
     // PRIVATE is a synonymous for DIM
     // _CONST_?
-    sal_Bool bConst = sal_False;
+    bool bConst = false;
     if( eCurTok == _CONST_ )
-        bConst = sal_True;
+        bConst = true;
     else if( Peek() == _CONST_ )
-        Next(), bConst = sal_True;
+        Next(), bConst = true;
 
     // #110004 It can also be a sub/function
     if( !bConst && (eCurTok == SUB || eCurTok == FUNCTION || eCurTok == PROPERTY ||
@@ -236,7 +236,7 @@ void SbiParser::DefVar( SbiOpcode eOp, sal_Bool bStatic )
             if( bNewGblDefs && nGblChain == 0 )
             {
                 nGblChain = aGen.Gen( _JUMP, 0 );
-                bNewGblDefs = sal_False;
+                bNewGblDefs = false;
             }
             Next();
             DefProc( sal_False, bPrivate );
@@ -293,7 +293,7 @@ void SbiParser::DefVar( SbiOpcode eOp, sal_Bool bStatic )
         aGen.Statement();   // catch up on static here
     }
 
-    sal_Bool bDefined = sal_False;
+    bool bDefined = false;
     while( ( pDef = VarDecl( &pDim, bStatic, bConst ) ) != NULL )
     {
         EnableErrors();
@@ -302,12 +302,12 @@ void SbiParser::DefVar( SbiOpcode eOp, sal_Bool bStatic )
             pPool = &aGlobals;
         SbiSymDef* pOld = pPool->Find( pDef->GetName() );
         // search also in the Runtime-Library
-        sal_Bool bRtlSym = sal_False;
+        bool bRtlSym = false;
         if( !pOld )
         {
             pOld = CheckRTLForSym( pDef->GetName(), SbxVARIANT );
             if( pOld )
-                bRtlSym = sal_True;
+                bRtlSym = true;
         }
         if( pOld && !(eOp == _REDIM || eOp == _REDIMP) )
         {
@@ -316,7 +316,7 @@ void SbiParser::DefVar( SbiOpcode eOp, sal_Bool bStatic )
         }
         if( pOld )
         {
-            bDefined = sal_True;
+            bDefined = true;
             // always an error at a RTL-S
             if( !bRtlSym && (eOp == _REDIM || eOp == _REDIMP) )
             {
@@ -362,7 +362,7 @@ void SbiParser::DefVar( SbiOpcode eOp, sal_Bool bStatic )
                                 }
                 global:         aGen.BackChain( nGblChain );
                                 nGblChain = 0;
-                                bGblDefs = bNewGblDefs = sal_True;
+                                bGblDefs = bNewGblDefs = true;
                                 break;
                 default:        eOp2 = _LOCAL;
             }
@@ -515,7 +515,7 @@ void SbiParser::DefVar( SbiOpcode eOp, sal_Bool bStatic )
     {
         // maintain the global chain
         nGblChain = aGen.Gen( _JUMP, 0 );
-        bGblDefs = bNewGblDefs = sal_True;
+        bGblDefs = bNewGblDefs = true;
 
         // Register for Sub a jump to the end of statics
         aGen.BackChain( nEndOfStaticLbl );
@@ -527,7 +527,7 @@ void SbiParser::DefVar( SbiOpcode eOp, sal_Bool bStatic )
 
 void SbiParser::ReDim()
 {
-    DefVar( _REDIM, (  pProc && bVBASupportOn ) ? pProc->IsStatic() : sal_False );
+    DefVar( _REDIM, (  pProc && bVBASupportOn ) ? pProc->IsStatic() : false );
 }
 
 // ERASE array, ...
@@ -569,7 +569,7 @@ void SbiParser::DefType( sal_Bool bPrivate )
 
     SbiSymDef* pElem;
     SbiDimList* pDim = NULL;
-    sal_Bool bDone = sal_False;
+    bool bDone = false;
 
     while( !bDone && !IsEof() )
     {
@@ -577,7 +577,7 @@ void SbiParser::DefType( sal_Bool bPrivate )
         {
             case ENDTYPE :
                 pElem = NULL;
-                bDone = sal_True;
+                bDone = true;
                 Next();
             break;
 
@@ -588,9 +588,9 @@ void SbiParser::DefType( sal_Bool bPrivate )
             break;
 
             default:
-                pElem = VarDecl(&pDim,sal_False,sal_False);
+                pElem = VarDecl(&pDim, false, false);
                 if( !pElem )
-                    bDone = sal_True;   // Error occurred
+                    bDone = true;   // Error occurred
         }
         if( pElem )
         {
@@ -693,7 +693,7 @@ void SbiParser::DefEnum( sal_Bool bPrivate )
 
     SbiSymDef* pElem;
     SbiDimList* pDim;
-    sal_Bool bDone = sal_False;
+    bool bDone = false;
 
     // Starting with -1 to make first default value 0 after ++
     sal_Int32 nCurrentEnumValue = -1;
@@ -703,7 +703,7 @@ void SbiParser::DefEnum( sal_Bool bPrivate )
         {
             case ENDENUM :
                 pElem = NULL;
-                bDone = sal_True;
+                bDone = true;
                 Next();
             break;
 
@@ -716,20 +716,20 @@ void SbiParser::DefEnum( sal_Bool bPrivate )
             default:
             {
                 // TODO: Check existing!
-                sal_Bool bDefined = sal_False;
+                bool bDefined = false;
 
                 pDim = NULL;
-                pElem = VarDecl( &pDim, sal_False, sal_True );
+                pElem = VarDecl( &pDim, false, true );
                 if( !pElem )
                 {
-                    bDone = sal_True;   // Error occurred
+                    bDone = true;   // Error occurred
                     break;
                 }
                 else if( pDim )
                 {
                     delete pDim;
                     Error( SbERR_SYNTAX );
-                    bDone = sal_True;   // Error occurred
+                    bDone = true;   // Error occurred
                     break;
                 }
 
@@ -759,7 +759,7 @@ void SbiParser::DefEnum( sal_Bool bPrivate )
                 if( pOld )
                 {
                     Error( SbERR_VAR_DEFINED, pElem->GetName() );
-                    bDone = sal_True;   // Error occurred
+                    bDone = true;   // Error occurred
                     break;
                 }
 
@@ -770,7 +770,7 @@ void SbiParser::DefEnum( sal_Bool bPrivate )
                     SbiOpcode eOp = _GLOBAL;
                     aGen.BackChain( nGblChain );
                     nGblChain = 0;
-                    bGblDefs = bNewGblDefs = sal_True;
+                    bGblDefs = bNewGblDefs = true;
                     aGen.Gen(
                         eOp, pElem->GetId(),
                         sal::static_int_cast< sal_uInt16 >( pElem->GetType() ) );
@@ -807,10 +807,10 @@ void SbiParser::DefEnum( sal_Bool bPrivate )
 // the first Token is already read in (SUB/FUNCTION)
 // xxx Name [LIB "name"[ALIAS "name"]][(Parameter)][AS TYPE]
 
-SbiProcDef* SbiParser::ProcDecl( sal_Bool bDecl )
+SbiProcDef* SbiParser::ProcDecl( bool bDecl )
 {
-    sal_Bool bFunc = sal_Bool( eCurTok == FUNCTION );
-    sal_Bool bProp = sal_Bool( eCurTok == GET || eCurTok == SET || eCurTok == LET );
+    bool bFunc = ( eCurTok == FUNCTION );
+    bool bProp = ( eCurTok == GET || eCurTok == SET || eCurTok == LET );
     if( !TestSymbol() ) return NULL;
     String aName( aSym );
     SbxDataType eType = eScanType;
@@ -883,7 +883,7 @@ SbiProcDef* SbiParser::ProcDecl( sal_Bool bDecl )
                 Next();
                 bParamArray = true;
             }
-            SbiSymDef* pPar = VarDecl( NULL, sal_False, sal_False );
+            SbiSymDef* pPar = VarDecl( NULL, false, false );
             if( !pPar )
                 break;
             if( bByVal )
@@ -896,7 +896,7 @@ SbiProcDef* SbiParser::ProcDecl( sal_Bool bDecl )
             SbiToken eTok = Next();
             if( eTok != COMMA && eTok != RPAREN )
             {
-                sal_Bool bError2 = sal_True;
+                bool bError2 = true;
                 if( bOptional && bCompatible && eTok == EQ )
                 {
                     SbiConstExpression* pDefaultExpr = new SbiConstExpression( this );
@@ -913,7 +913,7 @@ SbiProcDef* SbiParser::ProcDecl( sal_Bool bDecl )
 
                     eTok = Next();
                     if( eTok == COMMA || eTok == RPAREN )
-                        bError2 = sal_False;
+                        bError2 = false;
                 }
                 if( bError2 )
                 {
@@ -949,7 +949,7 @@ void SbiParser::DefDeclare( sal_Bool bPrivate )
     {
         bool bFunction = (eCurTok == FUNCTION);
 
-        SbiProcDef* pDef = ProcDecl( sal_True );
+        SbiProcDef* pDef = ProcDecl( true );
         if( pDef )
         {
             if( !pDef->GetLib().Len() )
@@ -982,7 +982,7 @@ void SbiParser::DefDeclare( sal_Bool bPrivate )
                     if( bNewGblDefs && nGblChain == 0 )
                     {
                         nGblChain = aGen.Gen( _JUMP, 0 );
-                        bNewGblDefs = sal_False;
+                        bNewGblDefs = false;
                     }
 
                     sal_uInt16 nSavLine = nLine;
@@ -1079,8 +1079,8 @@ void SbiParser::SubFunc()
 void SbiParser::DefProc( sal_Bool bStatic, sal_Bool bPrivate )
 {
     sal_uInt16 l1 = nLine, l2 = nLine;
-    sal_Bool bSub = sal_Bool( eCurTok == SUB );
-    sal_Bool bProperty = sal_Bool( eCurTok == PROPERTY );
+    bool bSub = ( eCurTok == SUB );
+    bool bProperty = ( eCurTok == PROPERTY );
     PropertyMode ePropertyMode = PROPERTY_MODE_NONE;
     if( bProperty )
     {
@@ -1096,7 +1096,7 @@ void SbiParser::DefProc( sal_Bool bStatic, sal_Bool bPrivate )
     }
 
     SbiToken eExit = eCurTok;
-    SbiProcDef* pDef = ProcDecl( sal_False );
+    SbiProcDef* pDef = ProcDecl( false );
     if( !pDef )
         return;
     pDef->setPropertyMode( ePropertyMode );
@@ -1196,7 +1196,7 @@ void SbiParser::DefStatic( sal_Bool bPrivate )
             if( bNewGblDefs && nGblChain == 0 )
             {
                 nGblChain = aGen.Gen( _JUMP, 0 );
-                bNewGblDefs = sal_False;
+                bNewGblDefs = false;
             }
             Next();
             DefProc( sal_True, bPrivate );
@@ -1207,7 +1207,7 @@ void SbiParser::DefStatic( sal_Bool bPrivate )
             // Reset the Pool, so that STATIC-Declarations go into the
             // global Pool
             SbiSymPool* p = pPool; pPool = &aPublics;
-            DefVar( _STATIC, sal_True );
+            DefVar( _STATIC, true );
             pPool = p;
             } break;
     }
diff --git a/basic/source/comp/loops.cxx b/basic/source/comp/loops.cxx
index 23fa27820c5b..b2e7eb7736c4 100644
--- a/basic/source/comp/loops.cxx
+++ b/basic/source/comp/loops.cxx
@@ -103,7 +103,7 @@ void SbiParser::If()
     else
     {
         // single line IF
-        bSingleLineIf = sal_True;
+        bSingleLineIf = true;
         nEndLbl = aGen.Gen( _JUMPF, 0 );
         Push( eCurTok );
         while( !bAbort )
@@ -127,7 +127,7 @@ void SbiParser::If()
                     break;
             }
         }
-        bSingleLineIf = sal_False;
+        bSingleLineIf = false;
     }
     aGen.BackChain( nEndLbl );
 }
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 559852f5ee02..470f239be5f7 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -132,7 +132,7 @@ SbiParser::SbiParser( StarBASIC* pb, SbModule* pm )
     bGblDefs =
     bNewGblDefs =
     bSingleLineIf =
-    bExplicit = sal_False;
+    bExplicit = false;
     bClassModule = ( pm->GetModuleType() == com::sun::star::script::ModuleType::CLASS );
     OSL_TRACE("Parser - %s, bClassModule %d", rtl::OUStringToOString( pm->GetName(), RTL_TEXTENCODING_UTF8 ).getStr(), bClassModule );
     pPool    = &aPublics;
@@ -178,7 +178,7 @@ SbiSymDef* SbiParser::CheckRTLForSym( const String& rSym, SbxDataType eType )
 
 // close global chain
 
-sal_Bool SbiParser::HasGlobalCode()
+bool SbiParser::HasGlobalCode()
 {
     if( bGblDefs && nGblChain )
     {
@@ -427,7 +427,7 @@ sal_Bool SbiParser::Parse()
                     ( eCurTok == SUB || eCurTok == FUNCTION || eCurTok == PROPERTY ) )
                 {
                     nGblChain = aGen.Gen( _JUMP, 0 );
-                    bNewGblDefs = sal_False;
+                    bNewGblDefs = false;
                 }
                 // statement-opcode at the beginning of a sub, too, please
                 if( ( p->bSubr && (eCurTok != STATIC || Peek() == SUB || Peek() == FUNCTION ) ) ||
@@ -749,7 +749,7 @@ void SbiParser::Option()
     switch( Next() )
     {
         case EXPLICIT:
-            bExplicit = sal_True; break;
+            bExplicit = true; break;
         case BASE:
             if( Next() == NUMBER )
             {
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index cebfd582c111..cc5f67d271c3 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -228,8 +228,8 @@ protected:
     ModifiableHelper    maModifiable;
 
     NameContainer maNameContainer;
-    sal_Bool    mbOldInfoFormat;
-    sal_Bool    mbOasis2OOoFormat;
+    bool    mbOldInfoFormat;
+    bool    mbOasis2OOoFormat;
 
     ::rtl::OUString maInitialDocumentURL;
     ::rtl::OUString maInfoFileName;
@@ -240,7 +240,7 @@ protected:
 
     ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > mxStorage;
     BasicManager*   mpBasMgr;
-    sal_Bool        mbOwnBasMgr;
+    bool        mbOwnBasMgr;
 
     enum InitMode
     {
@@ -352,7 +352,7 @@ protected:
 
     void storeLibraries_Impl(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
-                            sal_Bool bComplete );
+                            bool bComplete );
 
     void SAL_CALL initializeFromDocumentURL( const ::rtl::OUString& _rInitialDocumentURL );
     void SAL_CALL initializeFromDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XStorageBasedDocument >& _rxDocument );
@@ -567,7 +567,7 @@ class SfxLibrary
 
     sal_Bool mbLoaded;
     sal_Bool mbIsModified;
-    sal_Bool mbInitialised;
+    bool mbInitialised;
 
 private:
 
@@ -584,11 +584,11 @@ private:
 
     sal_Bool mbPasswordProtected;
     sal_Bool mbPasswordVerified;
-    sal_Bool mbDoc50Password;
+    bool mbDoc50Password;
     ::rtl::OUString maPassword;
 
-    sal_Bool mbSharedIndexFile;
-    sal_Bool mbExtension;
+    bool mbSharedIndexFile;
+    bool mbExtension;
 
     // Additional functionality for localisation
     // Provide modify state including resources
diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx
index 5616246012e6..7649cc261b0d 100644
--- a/basic/source/inc/parser.hxx
+++ b/basic/source/inc/parser.hxx
@@ -39,15 +39,15 @@ class SbiParser : public SbiTokenizer
     SbiExprNode*  pWithVar;
     SbiToken    eEndTok;
     sal_uInt32      nGblChain;          // for global DIMs
-    sal_Bool        bGblDefs;           // sal_True global definitions general
-    sal_Bool        bNewGblDefs;        // sal_True globale definitions before sub
-    sal_Bool        bSingleLineIf;
+    bool        bGblDefs;           // true: global definitions general
+    bool        bNewGblDefs;        // true: globale definitions before sub
+    bool        bSingleLineIf;
 
-    SbiSymDef*  VarDecl( SbiDimList**,sal_Bool,sal_Bool );
-    SbiProcDef* ProcDecl(sal_Bool bDecl);
+    SbiSymDef*  VarDecl( SbiDimList**, bool, bool );
+    SbiProcDef* ProcDecl(bool bDecl);
     void DefStatic( sal_Bool bPrivate );
     void DefProc( sal_Bool bStatic, sal_Bool bPrivate ); // read in procedure
-    void DefVar( SbiOpcode eOp, sal_Bool bStatic ); // read in DIM/REDIM
+    void DefVar( SbiOpcode eOp, bool bStatic ); // read in DIM/REDIM
     void TypeDecl( SbiSymDef&, sal_Bool bAsNewAlreadyParsed=sal_False );    // AS-declaration
     void OpenBlock( SbiToken, SbiExprNode* = NULL );
     void CloseBlock();
@@ -71,7 +71,7 @@ public:
     SbiExprType   eCurExpr;
     short         nBase;            // OPTION BASE-value
     sal_Bool          bText;            // OPTION COMPARE TEXT
-    sal_Bool          bExplicit;        // sal_True: OPTION EXPLICIT
+    bool          bExplicit;        // true: OPTION EXPLICIT
     sal_Bool          bClassModule;     // sal_True: OPTION ClassModule
     StringVector  aIfaceVector;     // Holds all interfaces implemented by a class module
     StringVector  aRequiredTypes;   // Types used in Dim As New <type> outside subs
@@ -85,7 +85,7 @@ public:
     SbiSymDef* CheckRTLForSym( const String& rSym, SbxDataType eType );
     void AddConstants( void );
 
-    sal_Bool HasGlobalCode();
+    bool HasGlobalCode();
 
     sal_Bool TestToken( SbiToken );
     sal_Bool TestSymbol( sal_Bool=sal_False );
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index 2c9a369f4386..3f1101c4eac0 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -193,7 +193,7 @@ void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement
 
     Reference< XInputStream > xInput( xISP->createInputStream() );
 
-    bool bComplete = sal_False;
+    bool bComplete = false;
     if ( mbOasis2OOoFormat )
     {
         bComplete = writeOasis2OOoLibraryElement( xInput, xOutput );
@@ -219,7 +219,7 @@ void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement
 void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< embed::XStorage >& xStorage ) throw ( RuntimeException )
 {
     LibraryContainerMethodGuard aGuard( *this );
-    mbOasis2OOoFormat = sal_False;
+    mbOasis2OOoFormat = false;
 
     if ( mxStorage.is() && xStorage.is() )
     {
@@ -231,7 +231,7 @@ void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< e
             if ( nSource == SOFFICE_FILEFORMAT_CURRENT &&
                 nTarget != SOFFICE_FILEFORMAT_CURRENT )
             {
-                mbOasis2OOoFormat = sal_True;
+                mbOasis2OOoFormat = true;
             }
         }
         catch (const Exception& )
@@ -292,7 +292,7 @@ void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< e
             }
         }
     }
-    mbOasis2OOoFormat = sal_False;
+    mbOasis2OOoFormat = false;
 }
 
 
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 403514c53eb9..8af7fb1b40e5 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -368,10 +368,10 @@ SfxLibraryContainer::SfxLibraryContainer( void )
     , mbVBACompat( sal_False )
     , maModifiable( *this, maMutex )
     , maNameContainer( getCppuType( (Reference< XNameAccess >*) NULL ) )
-    , mbOldInfoFormat( sal_False )
-    , mbOasis2OOoFormat( sal_False )
+    , mbOldInfoFormat( false )
+    , mbOasis2OOoFormat( false )
     , mpBasMgr( NULL )
-    , mbOwnBasMgr( sal_False )
+    , mbOwnBasMgr( false )
 {
     DBG_CTOR( SfxLibraryContainer, NULL );
 
@@ -448,7 +448,7 @@ void SAL_CALL SfxLibraryContainer::storeLibrariesToStorage( const Reference< XSt
 
     try
     {
-        storeLibraries_Impl( _rxRootStorage, sal_True );
+        storeLibraries_Impl( _rxRootStorage, true );
     }
     catch( const Exception& )
     {
@@ -603,7 +603,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
         // We need a BasicManager to avoid problems
         StarBASIC* pBas = new StarBASIC();
         mpBasMgr = new BasicManager( pBas );
-        mbOwnBasMgr = sal_True;
+        mbOwnBasMgr = true;
 
         OUString aExtension = aInitUrlInetObj.getExtension();
         if( aExtension.compareToAscii( "xlc" ) == COMPARE_EQUAL )
@@ -926,14 +926,14 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
 
                 if( nPass == 1 )
                 {
-                    pImplLib->mbSharedIndexFile = sal_True;
+                    pImplLib->mbSharedIndexFile = true;
                     pImplLib->mbReadOnly = sal_True;
                 }
             }
 
             // Keep flag for documents to force writing the new index files
             if( !bStorage )
-                mbOldInfoFormat = sal_False;
+                mbOldInfoFormat = false;
 
             delete pLibArray;
         }
@@ -1719,13 +1719,13 @@ void SfxLibraryContainer::implImportLibDescriptor
         pLib->mbPreload  = rLib.bPreload;
         pLib->implSetModified( sal_False );
 
-        pLib->mbInitialised = sal_True;
+        pLib->mbInitialised = true;
     }
 }
 
 
 // Methods of new XLibraryStorage interface?
-void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XStorage >& i_rStorage, sal_Bool bComplete )
+void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XStorage >& i_rStorage, bool bComplete )
 {
     const Sequence< OUString > aNames = maNameContainer.getElementNames();
     sal_Int32 nNameCount = aNames.getLength();
@@ -1971,7 +1971,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
     if( !mbOldInfoFormat && !maModifiable.isModified() )
         return;
     maModifiable.setModified( sal_False );
-    mbOldInfoFormat = sal_False;
+    mbOldInfoFormat = false;
 
     // Write library container info
     // Create sax writer
@@ -2167,11 +2167,11 @@ Reference< XNameAccess > SAL_CALL SfxLibraryContainer::createLibraryLink
     OUString aBundledSearchStr(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.expand:$BUNDLED_EXTENSIONS"));
     if( StorageURL.indexOf( aUserSearchStr ) != -1 )
     {
-        pNewLib->mbExtension = sal_True;
+        pNewLib->mbExtension = true;
     }
     else if( StorageURL.indexOf( aSharedSearchStr ) != -1 || StorageURL.indexOf( aBundledSearchStr ) != -1 )
     {
-        pNewLib->mbExtension = sal_True;
+        pNewLib->mbExtension = true;
         pNewLib->mbReadOnly = sal_True;
     }
 
@@ -2905,16 +2905,16 @@ SfxLibrary::SfxLibrary( ModifiableHelper& _rModifiable, const Type& aType,
         , maNameContainer( aType )
         , mbLoaded( sal_True )
         , mbIsModified( sal_True )
-        , mbInitialised( sal_False )
+        , mbInitialised( false )
         , mbLink( sal_False )
         , mbReadOnly( sal_False )
         , mbReadOnlyLink( sal_False )
         , mbPreload( sal_False )
         , mbPasswordProtected( sal_False )
         , mbPasswordVerified( sal_False )
-        , mbDoc50Password( sal_False )
-        , mbSharedIndexFile( sal_False )
-        , mbExtension( sal_False )
+        , mbDoc50Password( false )
+        , mbSharedIndexFile( false )
+        , mbExtension( false )
 {
 }
 
@@ -2928,7 +2928,7 @@ SfxLibrary::SfxLibrary( ModifiableHelper& _rModifiable, const Type& aType,
         , maNameContainer( aType )
         , mbLoaded( sal_False )
         , mbIsModified( sal_True )
-        , mbInitialised( sal_False )
+        , mbInitialised( false )
         , maLibInfoFileURL( aLibInfoFileURL )
         , maStorageURL( aStorageURL )
         , mbLink( sal_True )
@@ -2937,9 +2937,9 @@ SfxLibrary::SfxLibrary( ModifiableHelper& _rModifiable, const Type& aType,
         , mbPreload( sal_False )
         , mbPasswordProtected( sal_False )
         , mbPasswordVerified( sal_False )
-        , mbDoc50Password( sal_False )
-        , mbSharedIndexFile( sal_False )
-        , mbExtension( sal_False )
+        , mbDoc50Password( false )
+        , mbSharedIndexFile( false )
+        , mbExtension( false )
 {
 }
 
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index bc758f292228..1ccdc06a761e 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -90,7 +90,7 @@ void SfxScriptLibraryContainer::setLibraryPassword
         SfxLibrary* pImplLib = getImplLib( rLibraryName );
         if( rPassword.Len() )
         {
-            pImplLib->mbDoc50Password = sal_True;
+            pImplLib->mbDoc50Password = true;
             pImplLib->mbPasswordProtected = sal_True;
             pImplLib->maPassword = rPassword;
         }
@@ -112,7 +112,7 @@ void SfxScriptLibraryContainer::clearLibraryPassword( const String& rLibraryName
     try
     {
         SfxLibrary* pImplLib = getImplLib( rLibraryName );
-        pImplLib->mbDoc50Password = sal_False;
+        pImplLib->mbDoc50Password = false;
         pImplLib->mbPasswordProtected = sal_False;
         pImplLib->maPassword = OUString();
     }
@@ -503,7 +503,7 @@ void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString&
             {
                 // Store application basic uncrypted
                 uno::Reference< embed::XStorage > xStorage;
-                storeLibraries_Impl( xStorage, sal_False );
+                storeLibraries_Impl( xStorage, false );
                 bKillCryptedFiles = sal_True;
             }
         }
@@ -523,7 +523,7 @@ void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString&
         {
             // Store applictaion basic crypted
             uno::Reference< embed::XStorage > xStorage;
-            storeLibraries_Impl( xStorage, sal_False );
+            storeLibraries_Impl( xStorage, false );
             bKillUncryptedFiles = sal_True;
         }
     }