bool improvements

Change-Id: I571354540f1ab108c55d32c20786d34a799c3bed

10 files changed, 65 insertions, 65 deletions

diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index 4a35b1c01739..faa521abfc40 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -510,10 +510,10 @@ void SbiParser::DefVar( SbiOpcode eOp, bool bStatic )
                 }
                 pDef->SetDims( pDim->GetDims() );
                 if( bPersistantGlobal )
-                    pDef->SetGlobal( sal_True );
+                    pDef->SetGlobal( true );
                 SbiExpression aExpr( this, *pDef, pDim );
                 aExpr.Gen();
-                pDef->SetGlobal( sal_False );
+                pDef->SetGlobal( false );
                 aGen.Gen( (eOp == _STATIC) ? _DIM : eOp );
             }
         }
@@ -1100,7 +1100,7 @@ void SbiParser::DefDeclare( bool bPrivate )
                             if( pParDef->IsByVal() )
                             {
                                 // Reset to avoid additional byval in call to wrapper function
-                                pParDef->SetByVal( sal_False );
+                                pParDef->SetByVal( false );
                                 nTyp |= 0x8000;
                             }
                             aGen.Gen( _ARGTYP, nTyp );
@@ -1260,7 +1260,7 @@ void SbiParser::DefProc( bool bStatic, bool bPrivate )
     {
         if ( bVBASupportOn )
         {
-            pProc->SetStatic( sal_True );
+            pProc->SetStatic( true );
         }
         else
         {
@@ -1269,7 +1269,7 @@ void SbiParser::DefProc( bool bStatic, bool bPrivate )
     }
     else
     {
-        pProc->SetStatic( sal_False );
+        pProc->SetStatic( false );
     }
     // Normal case: Local variable->parameter->global variable
     pProc->GetLocals().SetParent( &pProc->GetParams() );
diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx
index 762e0e38958b..b24bbc2a8920 100644
--- a/basic/source/comp/exprgen.cxx
+++ b/basic/source/comp/exprgen.cxx
@@ -70,7 +70,7 @@ void SbiExprNode::Gen( RecursiveMode eRecMode )
             pGen->Gen( _CONST,  (short) nVal );
             break;
         case SbxSTRING:
-            nStringId = pGen->GetParser()->aGblStrings.Add( aStrVal, sal_True );
+            nStringId = pGen->GetParser()->aGblStrings.Add( aStrVal, true );
             pGen->Gen( _SCONST, nStringId );
             break;
         default:
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index 8346e566d400..8b7f8fd6386b 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -369,7 +369,7 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
     SbiExprNode* pNd = new SbiExprNode( pParser, *pDef, eType );
     if( !pPar )
     {
-        pPar = new SbiParameters( pParser,sal_False,sal_False );
+        pPar = new SbiParameters( pParser,false,false );
     }
     pNd->aVar.pPar = pPar;
     pNd->aVar.pvMorePar = pvMoreParLcl;
@@ -622,7 +622,7 @@ SbiExprNode* SbiExpression::Unary()
             pParser->TestToken( IS );
             OUString aDummy;
             SbiSymDef* pTypeDef = new SbiSymDef( aDummy );
-            pParser->TypeDecl( *pTypeDef, sal_True );
+            pParser->TypeDecl( *pTypeDef, true );
             pNd = new SbiExprNode( pParser, pObjNode, pTypeDef->GetTypeId() );
             break;
         }
@@ -631,7 +631,7 @@ SbiExprNode* SbiExpression::Unary()
             pParser->Next();
             OUString aStr;
             SbiSymDef* pTypeDef = new SbiSymDef( aStr );
-            pParser->TypeDecl( *pTypeDef, sal_True );
+            pParser->TypeDecl( *pTypeDef, true );
             pNd = new SbiExprNode( pParser, pTypeDef->GetTypeId() );
             break;
         }
@@ -1051,7 +1051,7 @@ SbiParameters::SbiParameters( SbiParser* p, bool bStandaloneExpression, bool bPa
             if( bAssumeExprLParenMode )
             {
                 pExpr = new SbiExpression( pParser, SbSTDEXPR, EXPRMODE_LPAREN_PENDING );
-                bAssumeExprLParenMode = sal_False;
+                bAssumeExprLParenMode = false;
 
                 SbiExprMode eModeAfter = pExpr->m_eMode;
                 if( eModeAfter == EXPRMODE_LPAREN_NOT_NEEDED )
diff --git a/basic/source/comp/loops.cxx b/basic/source/comp/loops.cxx
index e486039f14ad..396f2833c99e 100644
--- a/basic/source/comp/loops.cxx
+++ b/basic/source/comp/loops.cxx
@@ -48,7 +48,7 @@ void SbiParser::If()
             eTok = Peek();
             if( IsEof() )
             {
-                Error( SbERR_BAD_BLOCK, IF ); bAbort = sal_True; return;
+                Error( SbERR_BAD_BLOCK, IF ); bAbort = true; return;
             }
         }
         while( eTok == ELSEIF )
@@ -56,7 +56,7 @@ void SbiParser::If()
             // jump to ENDIF in case of a successful IF/ELSEIF
             if( iJmp >= JMP_TABLE_SIZE )
             {
-                Error( SbERR_PROG_TOO_LARGE );  bAbort = sal_True;  return;
+                Error( SbERR_PROG_TOO_LARGE );  bAbort = true;  return;
             }
             pnJmpToEndLbl[iJmp++] = aGen.Gen( _JUMP, 0 );
 
@@ -76,7 +76,7 @@ void SbiParser::If()
                 eTok = Peek();
                 if( IsEof() )
                 {
-                    Error( SbERR_BAD_BLOCK, ELSEIF );  bAbort = sal_True; return;
+                    Error( SbERR_BAD_BLOCK, ELSEIF );  bAbort = true; return;
                 }
             }
         }
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index ea51a48ed07f..2ffbc66c408a 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -305,7 +305,7 @@ void SbiParser::StmntBlock( SbiToken eEnd )
     if( IsEof() )
     {
         Error( SbERR_BAD_BLOCK, eEnd );
-        bAbort = sal_True;
+        bAbort = true;
     }
 }
 
@@ -594,7 +594,7 @@ void SbiParser::Set()
         Next();
         OUString aStr;
         SbiSymDef* pTypeDef = new SbiSymDef( aStr );
-        TypeDecl( *pTypeDef, sal_True );
+        TypeDecl( *pTypeDef, true );
 
         aLvalue.Gen();
         aGen.Gen( _CREATE, pDef->GetId(), pTypeDef->GetTypeId() );
@@ -749,7 +749,7 @@ void SbiParser::EnableCompatibility()
 {
     if( !bCompatible )
         AddConstants();
-    bCompatible = sal_True;
+    bCompatible = true;
 }
 
 // OPTION
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index efa3ea9d8c6b..aeb5000d68ac 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2818,7 +2818,7 @@ bool isRootDir( OUString aDirURLStr )
     // or Windows  "file:///c:/"  -> root
     else if( nCount == 1 )
     {
-        OUString aSeg1 = aDirURLObj.getName( 0, sal_True,
+        OUString aSeg1 = aDirURLObj.getName( 0, true,
                                              INetURLObject::DECODE_WITH_CHARSET );
         if( aSeg1[1] == (sal_Unicode)':' )
         {
@@ -2985,7 +2985,7 @@ RTLFUNC(Dir)
                             }
 
                             INetURLObject aURL( aFile );
-                            aPath = aURL.getName( INetURLObject::LAST_SEGMENT, sal_True,
+                            aPath = aURL.getName( INetURLObject::LAST_SEGMENT, true,
                                                   INetURLObject::DECODE_WITH_CHARSET );
                         }
 
diff --git a/basic/source/runtime/sbdiagnose.cxx b/basic/source/runtime/sbdiagnose.cxx
index c06bc8fefede..e29d3db07918 100644
--- a/basic/source/runtime/sbdiagnose.cxx
+++ b/basic/source/runtime/sbdiagnose.cxx
@@ -115,7 +115,7 @@ RTLFUNC(CaptureAssertions)
 
         // ensure OSL assertions are captured, too
         DbgData aData( *DbgGetData() );
-        aData.bHookOSLAssert = sal_True;
+        aData.bHookOSLAssert = true;
         DbgUpdateOslHook( &aData );
     }
 
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index 5af135fe88fa..a7ced3816d5d 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -144,7 +144,7 @@ bool writeOasis2OOoLibraryElement(
 
     xParser->parseStream( source );
 
-    return sal_True;
+    return true;
 }
 
 void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement
@@ -208,7 +208,7 @@ void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< e
         {
             // if we cannot get the version then the
             // Oasis2OOoTransformer will not be used
-            OSL_ASSERT(sal_False);
+            OSL_ASSERT(false);
         }
     }
 
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index f6cb5b265f16..fdb21052b87a 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -575,15 +575,15 @@ static void checkAndCopyFileImpl( const INetURLObject& rSourceFolderInetObj,
                                   Reference< XSimpleFileAccess3 > xSFI )
 {
     INetURLObject aTargetFolderInetObj( rTargetFolderInetObj );
-    aTargetFolderInetObj.insertName( rCheckFileName, sal_True, INetURLObject::LAST_SEGMENT,
-                                     sal_True, INetURLObject::ENCODE_ALL );
+    aTargetFolderInetObj.insertName( rCheckFileName, true, INetURLObject::LAST_SEGMENT,
+                                     true, INetURLObject::ENCODE_ALL );
     aTargetFolderInetObj.setExtension( rCheckExtension );
     OUString aTargetFile = aTargetFolderInetObj.GetMainURL( INetURLObject::NO_DECODE );
     if( !xSFI->exists( aTargetFile ) )
     {
         INetURLObject aSourceFolderInetObj( rSourceFolderInetObj );
-        aSourceFolderInetObj.insertName( rCheckFileName, sal_True, INetURLObject::LAST_SEGMENT,
-                                         sal_True, INetURLObject::ENCODE_ALL );
+        aSourceFolderInetObj.insertName( rCheckFileName, true, INetURLObject::LAST_SEGMENT,
+                                         true, INetURLObject::ENCODE_ALL );
         aSourceFolderInetObj.setExtension( rCheckExtension );
         OUString aSourceFile = aSourceFolderInetObj.GetMainURL( INetURLObject::NO_DECODE );
         xSFI->copy( aSourceFile, aTargetFile );
@@ -780,7 +780,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
                 {
                     pLibInfoInetObj = new INetURLObject( maLibraryPath.getToken(1, (sal_Unicode)';') );
                 }
-                pLibInfoInetObj->insertName( maInfoFileName, sal_False, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
+                pLibInfoInetObj->insertName( maInfoFileName, false, INetURLObject::LAST_SEGMENT, true, INetURLObject::ENCODE_ALL );
                 pLibInfoInetObj->setExtension( OUString("xlc") );
                 aFileName = pLibInfoInetObj->GetMainURL( INetURLObject::NO_DECODE );
             }
@@ -799,7 +799,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
             if( !xInput.is() && nPass == 0 )
             {
                 INetURLObject aLibInfoInetObj( maLibraryPath.getToken(1, (sal_Unicode)';') );
-                aLibInfoInetObj.insertName( maOldInfoFileName, sal_False, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
+                aLibInfoInetObj.insertName( maOldInfoFileName, false, INetURLObject::LAST_SEGMENT, true, INetURLObject::ENCODE_ALL );
                 aLibInfoInetObj.setExtension( OUString( "xli") );
                 aFileName = aLibInfoInetObj.GetMainURL( INetURLObject::NO_DECODE );
 
@@ -862,8 +862,8 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
                     }
                     INetURLObject aInetObj( aLibraryPath );
 
-                    aInetObj.insertName( rLib.aName, sal_True, INetURLObject::LAST_SEGMENT,
-                                         sal_True, INetURLObject::ENCODE_ALL );
+                    aInetObj.insertName( rLib.aName, true, INetURLObject::LAST_SEGMENT,
+                                         true, INetURLObject::ENCODE_ALL );
                     OUString aLibDirPath = aInetObj.GetMainURL( INetURLObject::NO_DECODE );
                     if( mxSFI->isFolder( aLibDirPath ) )
                     {
@@ -874,8 +874,8 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
                     {
                         // Check "share" path
                         INetURLObject aShareInetObj( maLibraryPath.getToken(0, (sal_Unicode)';') );
-                        aShareInetObj.insertName( rLib.aName, sal_True, INetURLObject::LAST_SEGMENT,
-                                                  sal_True, INetURLObject::ENCODE_ALL );
+                        aShareInetObj.insertName( rLib.aName, true, INetURLObject::LAST_SEGMENT,
+                                                  true, INetURLObject::ENCODE_ALL );
                         OUString aShareLibDirPath = aShareInetObj.GetMainURL( INetURLObject::NO_DECODE );
                         if( mxSFI->isFolder( aShareLibDirPath ) )
                         {
@@ -1038,11 +1038,11 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
             {
                 // Check if Standard folder exists and is complete
                 INetURLObject aUserBasicStandardInetObj( aUserBasicInetObj );
-                aUserBasicStandardInetObj.insertName( aStandardStr, sal_True, INetURLObject::LAST_SEGMENT,
-                                                      sal_True, INetURLObject::ENCODE_ALL );
+                aUserBasicStandardInetObj.insertName( aStandardStr, true, INetURLObject::LAST_SEGMENT,
+                                                      true, INetURLObject::ENCODE_ALL );
                 INetURLObject aPrevUserBasicStandardInetObj( aPrevUserBasicInetObj );
-                aPrevUserBasicStandardInetObj.insertName( aStandardStr, sal_True, INetURLObject::LAST_SEGMENT,
-                                                        sal_True, INetURLObject::ENCODE_ALL );
+                aPrevUserBasicStandardInetObj.insertName( aStandardStr, true, INetURLObject::LAST_SEGMENT,
+                                                        true, INetURLObject::ENCODE_ALL );
                 OUString aPrevStandardFolder = aPrevUserBasicStandardInetObj.GetMainURL( INetURLObject::NO_DECODE );
                 if( mxSFI->isFolder( aPrevStandardFolder ) )
                 {
@@ -1113,8 +1113,8 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
                 }
 
                 INetURLObject aPrevUserBasicLibInfoInetObj( aUserBasicInetObj );
-                aPrevUserBasicLibInfoInetObj.insertName( maInfoFileName, sal_False, INetURLObject::LAST_SEGMENT,
-                                                    sal_True, INetURLObject::ENCODE_ALL );
+                aPrevUserBasicLibInfoInetObj.insertName( maInfoFileName, false, INetURLObject::LAST_SEGMENT,
+                                                    true, INetURLObject::ENCODE_ALL );
                 aPrevUserBasicLibInfoInetObj.setExtension( OUString("xlc"));
                 OUString aLibInfoFileName = aPrevUserBasicLibInfoInetObj.GetMainURL( INetURLObject::NO_DECODE );
                 Sequence<Any> aInitSeq( 1 );
@@ -1320,7 +1320,7 @@ void SfxLibraryContainer::checkStorageURL( const OUString& aSourceURL,
     {
         // URL to library folder
         aStorageURL = aExpandedSourceURL;
-        aInetObj.insertName( maInfoFileName, sal_False, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
+        aInetObj.insertName( maInfoFileName, false, INetURLObject::LAST_SEGMENT, true, INetURLObject::ENCODE_ALL );
         aInetObj.setExtension( OUString("xlb") );
         aLibInfoFileURL = aInetObj.GetMainURL( INetURLObject::NO_DECODE );
     }
@@ -1377,7 +1377,7 @@ OUString SfxLibraryContainer::createAppLibraryFolder( SfxLibrary* pLib, const OU
     if( aLibDirPath.isEmpty() )
     {
         INetURLObject aInetObj( maLibraryPath.getToken(1, (sal_Unicode)';') );
-        aInetObj.insertName( aName, sal_True, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
+        aInetObj.insertName( aName, true, INetURLObject::LAST_SEGMENT, true, INetURLObject::ENCODE_ALL );
         checkStorageURL( aInetObj.GetMainURL( INetURLObject::NO_DECODE ), pLib->maLibInfoFileURL,
                          pLib->maStorageURL, pLib->maUnexpandedStorageURL );
         aLibDirPath = pLib->maStorageURL;
@@ -1487,7 +1487,7 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib,
             if( bExport )
             {
                 INetURLObject aInetObj( aTargetURL );
-                aInetObj.insertName( aName, sal_True, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
+                aInetObj.insertName( aName, true, INetURLObject::LAST_SEGMENT, true, INetURLObject::ENCODE_ALL );
                 aLibDirPath = aInetObj.GetMainURL( INetURLObject::NO_DECODE );
 
                 if( !xSFI->isFolder( aLibDirPath ) )
@@ -1507,8 +1507,8 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib,
                 OUString aElementName = pNames[ i ];
 
                 INetURLObject aElementInetObj( aLibDirPath );
-                aElementInetObj.insertName( aElementName, sal_False,
-                                            INetURLObject::LAST_SEGMENT, sal_True,
+                aElementInetObj.insertName( aElementName, false,
+                                            INetURLObject::LAST_SEGMENT, true,
                                             INetURLObject::ENCODE_ALL );
                 aElementInetObj.setExtension( maLibElementFileExtension );
                 OUString aElementPath( aElementInetObj.GetMainURL( INetURLObject::NO_DECODE ) );
@@ -1622,13 +1622,13 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib,
         if( bExport )
         {
             INetURLObject aInetObj( aTargetURL );
-            aInetObj.insertName( rLib.aName, sal_True, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
+            aInetObj.insertName( rLib.aName, true, INetURLObject::LAST_SEGMENT, true, INetURLObject::ENCODE_ALL );
             OUString aLibDirPath = aInetObj.GetMainURL( INetURLObject::NO_DECODE );
             if( !xSFI->isFolder( aLibDirPath ) )
             {
                 xSFI->createFolder( aLibDirPath );
             }
-            aInetObj.insertName( maInfoFileName, sal_False, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
+            aInetObj.insertName( maInfoFileName, false, INetURLObject::LAST_SEGMENT, true, INetURLObject::ENCODE_ALL );
             aInetObj.setExtension( OUString( "xlb" ) );
             aLibInfoPath = aInetObj.GetMainURL( INetURLObject::NO_DECODE );
         }
@@ -2088,7 +2088,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
     {
         // Create Output stream
         INetURLObject aLibInfoInetObj( maLibraryPath.getToken(1, (sal_Unicode)';') );
-        aLibInfoInetObj.insertName( maInfoFileName, sal_False, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
+        aLibInfoInetObj.insertName( maInfoFileName, false, INetURLObject::LAST_SEGMENT, true, INetURLObject::ENCODE_ALL );
         aLibInfoInetObj.setExtension( OUString("xlc") );
         OUString aLibInfoPath( aLibInfoInetObj.GetMainURL( INetURLObject::NO_DECODE ) );
 
@@ -2298,8 +2298,8 @@ void SAL_CALL SfxLibraryContainer::removeLibrary( const OUString& Name )
 
         // Delete folder if empty
         INetURLObject aInetObj( maLibraryPath.getToken(1, (sal_Unicode)';') );
-        aInetObj.insertName( Name, sal_True, INetURLObject::LAST_SEGMENT,
-                             sal_True, INetURLObject::ENCODE_ALL );
+        aInetObj.insertName( Name, true, INetURLObject::LAST_SEGMENT,
+                             true, INetURLObject::ENCODE_ALL );
         OUString aLibDirPath = aInetObj.GetMainURL( INetURLObject::NO_DECODE );
 
         try
@@ -2442,8 +2442,8 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name )
             {
                 OUString aLibDirPath = pImplLib->maStorageURL;
                 INetURLObject aElementInetObj( aLibDirPath );
-                aElementInetObj.insertName( aElementName, sal_False,
-                                            INetURLObject::LAST_SEGMENT, sal_True,
+                aElementInetObj.insertName( aElementName, false,
+                                            INetURLObject::LAST_SEGMENT, true,
                                             INetURLObject::ENCODE_ALL );
                 aElementInetObj.setExtension( maLibElementFileExtension );
                 aFile = aElementInetObj.GetMainURL( INetURLObject::NO_DECODE );
@@ -2562,8 +2562,8 @@ void SAL_CALL SfxLibraryContainer::renameLibrary( const OUString& Name, const OU
         OUString aLibDirPath = pImplLib->maStorageURL;
 
         INetURLObject aDestInetObj( maLibraryPath.getToken(1, (sal_Unicode)';'));
-        aDestInetObj.insertName( NewName, sal_True, INetURLObject::LAST_SEGMENT,
-                                 sal_True, INetURLObject::ENCODE_ALL );
+        aDestInetObj.insertName( NewName, true, INetURLObject::LAST_SEGMENT,
+                                 true, INetURLObject::ENCODE_ALL );
         OUString aDestDirPath = aDestInetObj.GetMainURL( INetURLObject::NO_DECODE );
 
         // Store new URL
@@ -2600,14 +2600,14 @@ void SAL_CALL SfxLibraryContainer::renameLibrary( const OUString& Name, const OU
                     OUString aElementName = pNames[ i ];
 
                     INetURLObject aElementInetObj( aLibDirPath );
-                    aElementInetObj.insertName( aElementName, sal_False,
-                        INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
+                    aElementInetObj.insertName( aElementName, false,
+                        INetURLObject::LAST_SEGMENT, true, INetURLObject::ENCODE_ALL );
                     aElementInetObj.setExtension( maLibElementFileExtension );
                     OUString aElementPath( aElementInetObj.GetMainURL( INetURLObject::NO_DECODE ) );
 
                     INetURLObject aElementDestInetObj( aDestDirPath );
-                    aElementDestInetObj.insertName( aElementName, sal_False,
-                                                    INetURLObject::LAST_SEGMENT, sal_True,
+                    aElementDestInetObj.insertName( aElementName, false,
+                                                    INetURLObject::LAST_SEGMENT, true,
                                                     INetURLObject::ENCODE_ALL );
                     aElementDestInetObj.setExtension( maLibElementFileExtension );
                     OUString aDestElementPath( aElementDestInetObj.GetMainURL( INetURLObject::NO_DECODE ) );
@@ -3162,8 +3162,8 @@ void SfxLibrary::impl_removeWithoutChecks( const OUString& _rElementName )
     if( !maStorageURL.isEmpty() )
     {
         INetURLObject aElementInetObj( maStorageURL );
-        aElementInetObj.insertName( _rElementName, sal_False,
-                                    INetURLObject::LAST_SEGMENT, sal_True,
+        aElementInetObj.insertName( _rElementName, false,
+                                    INetURLObject::LAST_SEGMENT, true,
                                     INetURLObject::ENCODE_ALL );
         aElementInetObj.setExtension( maLibElementFileExtension );
         OUString aFile = aElementInetObj.GetMainURL( INetURLObject::NO_DECODE );
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index e8c92cff7183..6e9385557d9f 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -362,7 +362,7 @@ SfxLibraryContainer* SfxScriptLibraryContainer::createInstanceImpl( void )
 void SAL_CALL SfxScriptLibraryContainer::importFromOldStorage( const OUString& aFile )
 {
     // TODO: move loading from old storage to binary filters?
-    SotStorageRef xStorage = new SotStorage( sal_False, aFile );
+    SotStorageRef xStorage = new SotStorage( false, aFile );
     if( xStorage.Is() && xStorage->GetError() == ERRCODE_NONE )
     {
         BasicManager* pBasicManager = new BasicManager( *(SotStorage*)xStorage, aFile );
@@ -540,8 +540,8 @@ void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString&
                 OUString aElementName = pNames[ i ];
 
                 INetURLObject aElementInetObj( aLibDirPath );
-                aElementInetObj.insertName( aElementName, sal_False,
-                                            INetURLObject::LAST_SEGMENT, sal_True,
+                aElementInetObj.insertName( aElementName, false,
+                                            INetURLObject::LAST_SEGMENT, true,
                                             INetURLObject::ENCODE_ALL );
                 if( bKillUncryptedFiles )
                 {
@@ -738,7 +738,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
             if( bExport )
             {
                 INetURLObject aInetObj( aTargetURL );
-                aInetObj.insertName( aName, sal_True, INetURLObject::LAST_SEGMENT, sal_True,
+                aInetObj.insertName( aName, true, INetURLObject::LAST_SEGMENT, true,
                                      INetURLObject::ENCODE_ALL );
                 aLibDirPath = aInetObj.GetMainURL( INetURLObject::NO_DECODE );
 
@@ -757,8 +757,8 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
                 OUString aElementName = pNames[ i ];
 
                 INetURLObject aElementInetObj( aLibDirPath );
-                aElementInetObj.insertName( aElementName, sal_False,
-                                            INetURLObject::LAST_SEGMENT, sal_True,
+                aElementInetObj.insertName( aElementName, false,
+                                            INetURLObject::LAST_SEGMENT, true,
                                             INetURLObject::ENCODE_ALL );
                 aElementInetObj.setExtension( OUString( "pba" ) );
                 OUString aElementPath = aElementInetObj.GetMainURL( INetURLObject::NO_DECODE );
@@ -1058,8 +1058,8 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
                 OUString aElementName = pNames[ i ];
 
                 INetURLObject aElementInetObj( aLibDirPath );
-                aElementInetObj.insertName( aElementName, sal_False,
-                    INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
+                aElementInetObj.insertName( aElementName, false,
+                    INetURLObject::LAST_SEGMENT, true, INetURLObject::ENCODE_ALL );
                 aElementInetObj.setExtension( OUString( "pba" ) );
                 OUString aElementPath = aElementInetObj.GetMainURL( INetURLObject::NO_DECODE );