svl: sal_Bool -> bool

Change-Id: Ic31455a1f5ffffa35d4fdde901dd70734207b6f4

23 files changed, 182 insertions, 182 deletions

diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx
index d69880aad0ab..7c9538f101a9 100644
--- a/svl/source/config/cjkoptions.cxx
+++ b/svl/source/config/cjkoptions.cxx
@@ -34,30 +34,30 @@
 using namespace ::com::sun::star::uno;
 using namespace ::rtl;
 
-#define CFG_READONLY_DEFAULT sal_False
+#define CFG_READONLY_DEFAULT false
 
 class SvtCJKOptions_Impl : public utl::ConfigItem
 {
-    sal_Bool        bIsLoaded;
-    sal_Bool        bCJKFont;
-    sal_Bool        bVerticalText;
-    sal_Bool        bAsianTypography;
-    sal_Bool        bJapaneseFind;
-    sal_Bool        bRuby;
-    sal_Bool        bChangeCaseMap;
-    sal_Bool        bDoubleLines;
-    sal_Bool        bEmphasisMarks;
-    sal_Bool        bVerticalCallOut;
-
-    sal_Bool        bROCJKFont;
-    sal_Bool        bROVerticalText;
-    sal_Bool        bROAsianTypography;
-    sal_Bool        bROJapaneseFind;
-    sal_Bool        bRORuby;
-    sal_Bool        bROChangeCaseMap;
-    sal_Bool        bRODoubleLines;
-    sal_Bool        bROEmphasisMarks;
-    sal_Bool        bROVerticalCallOut;
+    bool        bIsLoaded;
+    bool        bCJKFont;
+    bool        bVerticalText;
+    bool        bAsianTypography;
+    bool        bJapaneseFind;
+    bool        bRuby;
+    bool        bChangeCaseMap;
+    bool        bDoubleLines;
+    bool        bEmphasisMarks;
+    bool        bVerticalCallOut;
+
+    bool        bROCJKFont;
+    bool        bROVerticalText;
+    bool        bROAsianTypography;
+    bool        bROJapaneseFind;
+    bool        bRORuby;
+    bool        bROChangeCaseMap;
+    bool        bRODoubleLines;
+    bool        bROEmphasisMarks;
+    bool        bROVerticalCallOut;
 
 public:
     SvtCJKOptions_Impl();
@@ -67,21 +67,21 @@ public:
     virtual void    Commit();
     void            Load();
 
-    sal_Bool IsLoaded()                         { return bIsLoaded;         }
+    bool IsLoaded()                         { return bIsLoaded;         }
 
-    sal_Bool IsCJKFontEnabled() const           { return bCJKFont;          }
-    sal_Bool IsVerticalTextEnabled() const      { return bVerticalText;     }
-    sal_Bool IsAsianTypographyEnabled() const   { return bAsianTypography;  }
-    sal_Bool IsJapaneseFindEnabled() const      { return bJapaneseFind;     }
-    sal_Bool IsRubyEnabled() const              { return bRuby;             }
-    sal_Bool IsChangeCaseMapEnabled() const     { return bChangeCaseMap;    }
-    sal_Bool IsDoubleLinesEnabled() const       { return bDoubleLines;      }
+    bool IsCJKFontEnabled() const           { return bCJKFont;          }
+    bool IsVerticalTextEnabled() const      { return bVerticalText;     }
+    bool IsAsianTypographyEnabled() const   { return bAsianTypography;  }
+    bool IsJapaneseFindEnabled() const      { return bJapaneseFind;     }
+    bool IsRubyEnabled() const              { return bRuby;             }
+    bool IsChangeCaseMapEnabled() const     { return bChangeCaseMap;    }
+    bool IsDoubleLinesEnabled() const       { return bDoubleLines;      }
 
-    sal_Bool IsAnyEnabled() const {
+    bool IsAnyEnabled() const {
         return  bCJKFont||bVerticalText||bAsianTypography||bJapaneseFind||
                 bRuby||bChangeCaseMap||bDoubleLines||bEmphasisMarks||bVerticalCallOut;   }
-    void    SetAll(sal_Bool bSet);
-    sal_Bool IsReadOnly(SvtCJKOptions::EOption eOption) const;
+    void    SetAll(bool bSet);
+    bool IsReadOnly(SvtCJKOptions::EOption eOption) const;
 };
 
 namespace
@@ -92,16 +92,16 @@ namespace
 
 SvtCJKOptions_Impl::SvtCJKOptions_Impl() :
     utl::ConfigItem("Office.Common/I18N/CJK"),
-    bIsLoaded(sal_False),
-    bCJKFont(sal_True),
-    bVerticalText(sal_True),
-    bAsianTypography(sal_True),
-    bJapaneseFind(sal_True),
-    bRuby(sal_True),
-    bChangeCaseMap(sal_True),
-    bDoubleLines(sal_True),
-    bEmphasisMarks(sal_True),
-    bVerticalCallOut(sal_True),
+    bIsLoaded(false),
+    bCJKFont(true),
+    bVerticalText(true),
+    bAsianTypography(true),
+    bJapaneseFind(true),
+    bRuby(true),
+    bChangeCaseMap(true),
+    bDoubleLines(true),
+    bEmphasisMarks(true),
+    bVerticalCallOut(true),
     bROCJKFont(CFG_READONLY_DEFAULT),
     bROVerticalText(CFG_READONLY_DEFAULT),
     bROAsianTypography(CFG_READONLY_DEFAULT),
@@ -118,7 +118,7 @@ SvtCJKOptions_Impl::~SvtCJKOptions_Impl()
 {
 }
 
-void    SvtCJKOptions_Impl::SetAll(sal_Bool bSet)
+void    SvtCJKOptions_Impl::SetAll(bool bSet)
 {
     if (
         !bROCJKFont          &&
@@ -180,7 +180,7 @@ void SvtCJKOptions_Impl::Load()
         {
             if( pValues[nProp].hasValue() )
             {
-                sal_Bool bValue = *(sal_Bool*)pValues[nProp].getValue();
+                bool bValue = *(sal_Bool*)pValues[nProp].getValue();
                 switch ( nProp )
                 {
                     case 0: { bCJKFont = bValue; bROCJKFont = pROStates[nProp]; } break;
@@ -224,10 +224,10 @@ void SvtCJKOptions_Impl::Load()
 
         if (bAutoEnableCJK)
         {
-            SetAll(sal_True);
+            SetAll(true);
         }
     }
-    bIsLoaded = sal_True;
+    bIsLoaded = true;
 }
 
 void    SvtCJKOptions_Impl::Notify( const Sequence< OUString >& )
@@ -359,9 +359,9 @@ void    SvtCJKOptions_Impl::Commit()
     PutProperties(aNames, aValues);
 }
 
-sal_Bool SvtCJKOptions_Impl::IsReadOnly(SvtCJKOptions::EOption eOption) const
+bool SvtCJKOptions_Impl::IsReadOnly(SvtCJKOptions::EOption eOption) const
 {
-    sal_Bool bReadOnly = CFG_READONLY_DEFAULT;
+    bool bReadOnly = CFG_READONLY_DEFAULT;
     switch(eOption)
     {
         case SvtCJKOptions::E_CJKFONT : bReadOnly = bROCJKFont; break;
@@ -374,7 +374,7 @@ sal_Bool SvtCJKOptions_Impl::IsReadOnly(SvtCJKOptions::EOption eOption) const
         case SvtCJKOptions::E_EMPHASISMARKS : bReadOnly = bROEmphasisMarks; break;
         case SvtCJKOptions::E_VERTICALCALLOUT : bReadOnly = bROVerticalCallOut; break;
         case SvtCJKOptions::E_ALL : if (bROCJKFont || bROVerticalText || bROAsianTypography || bROJapaneseFind || bRORuby || bROChangeCaseMap || bRODoubleLines || bROEmphasisMarks || bROVerticalCallOut)
-                                        bReadOnly = sal_True;
+                                        bReadOnly = true;
                                 break;
     }
     return bReadOnly;
@@ -389,7 +389,7 @@ namespace { struct theCJKOptionsMutex : public rtl::Static< ::osl::Mutex , theCJ
 
 // class SvtCJKOptions --------------------------------------------------
 
-SvtCJKOptions::SvtCJKOptions(sal_Bool bDontLoad)
+SvtCJKOptions::SvtCJKOptions(bool bDontLoad)
 {
     // Global access, must be guarded (multithreading)
     ::osl::MutexGuard aGuard( theCJKOptionsMutex::get() );
@@ -415,61 +415,61 @@ SvtCJKOptions::~SvtCJKOptions()
         DELETEZ( pCJKOptions );
 }
 // -----------------------------------------------------------------------
-sal_Bool SvtCJKOptions::IsCJKFontEnabled() const
+bool SvtCJKOptions::IsCJKFontEnabled() const
 {
     DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
     return pCJKOptions->IsCJKFontEnabled();
 }
 // -----------------------------------------------------------------------
-sal_Bool SvtCJKOptions::IsVerticalTextEnabled() const
+bool SvtCJKOptions::IsVerticalTextEnabled() const
 {
     DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
     return pCJKOptions->IsVerticalTextEnabled();
 }
 // -----------------------------------------------------------------------
-sal_Bool SvtCJKOptions::IsAsianTypographyEnabled() const
+bool SvtCJKOptions::IsAsianTypographyEnabled() const
 {
     DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
     return pCJKOptions->IsAsianTypographyEnabled();
 }
 // -----------------------------------------------------------------------
-sal_Bool SvtCJKOptions::IsJapaneseFindEnabled() const
+bool SvtCJKOptions::IsJapaneseFindEnabled() const
 {
     DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
     return pCJKOptions->IsJapaneseFindEnabled();
 }
 // -----------------------------------------------------------------------
-sal_Bool SvtCJKOptions::IsRubyEnabled() const
+bool SvtCJKOptions::IsRubyEnabled() const
 {
     DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
     return pCJKOptions->IsRubyEnabled();
 }
 // -----------------------------------------------------------------------
-sal_Bool SvtCJKOptions::IsChangeCaseMapEnabled() const
+bool SvtCJKOptions::IsChangeCaseMapEnabled() const
 {
     DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
     return pCJKOptions->IsChangeCaseMapEnabled();
 }
 // -----------------------------------------------------------------------
-sal_Bool SvtCJKOptions::IsDoubleLinesEnabled() const
+bool SvtCJKOptions::IsDoubleLinesEnabled() const
 {
     DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
     return pCJKOptions->IsDoubleLinesEnabled();
 }
 
-void        SvtCJKOptions::SetAll(sal_Bool bSet)
+void        SvtCJKOptions::SetAll(bool bSet)
 {
     DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
     pCJKOptions->SetAll(bSet);
 }
 
-sal_Bool    SvtCJKOptions::IsAnyEnabled() const
+bool    SvtCJKOptions::IsAnyEnabled() const
 {
     DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
     return pCJKOptions->IsAnyEnabled();
 }
 
-sal_Bool    SvtCJKOptions::IsReadOnly(EOption eOption) const
+bool    SvtCJKOptions::IsReadOnly(EOption eOption) const
 {
     DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
     return pCJKOptions->IsReadOnly(eOption);
diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx
index bbad8e9e14f0..561f2f59e20b 100644
--- a/svl/source/config/ctloptions.cxx
+++ b/svl/source/config/ctloptions.cxx
@@ -255,7 +255,7 @@ void SvtCTLOptions_Impl::Load()
     DBG_ASSERT( aROStates.getLength() == rPropertyNames.getLength(), "GetReadOnlyStates failed" );
     if ( aValues.getLength() == rPropertyNames.getLength() && aROStates.getLength() == rPropertyNames.getLength() )
     {
-        sal_Bool bValue = sal_False;
+        bool bValue = false;
         sal_Int32 nValue = 0;
 
         for ( int nProp = 0; nProp < rPropertyNames.getLength(); nProp++ )
diff --git a/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx
index 9bebe8afe0b0..0bdfea1af765 100644
--- a/svl/source/config/languageoptions.cxx
+++ b/svl/source/config/languageoptions.cxx
@@ -39,7 +39,7 @@ namespace { struct ALMutex : public rtl::Static< ::osl::Mutex, ALMutex > {}; }
 
 // class SvtLanguageOptions ----------------------------------------------------
 
-SvtLanguageOptions::SvtLanguageOptions( sal_Bool _bDontLoad )
+SvtLanguageOptions::SvtLanguageOptions( bool _bDontLoad )
 {
     // Global access, must be guarded (multithreading)
     ::osl::MutexGuard aGuard( ALMutex::get() );
@@ -61,57 +61,57 @@ SvtLanguageOptions::~SvtLanguageOptions()
     delete m_pCTLOptions;
 }
 // CJK options -----------------------------------------------------------------
-sal_Bool SvtLanguageOptions::IsCJKFontEnabled() const
+bool SvtLanguageOptions::IsCJKFontEnabled() const
 {
     return m_pCJKOptions->IsCJKFontEnabled();
 }
-sal_Bool SvtLanguageOptions::IsVerticalTextEnabled() const
+bool SvtLanguageOptions::IsVerticalTextEnabled() const
 {
     return m_pCJKOptions->IsVerticalTextEnabled();
 }
-sal_Bool SvtLanguageOptions::IsAsianTypographyEnabled() const
+bool SvtLanguageOptions::IsAsianTypographyEnabled() const
 {
     return m_pCJKOptions->IsAsianTypographyEnabled();
 }
-sal_Bool SvtLanguageOptions::IsJapaneseFindEnabled() const
+bool SvtLanguageOptions::IsJapaneseFindEnabled() const
 {
     return m_pCJKOptions->IsJapaneseFindEnabled();
 }
-void SvtLanguageOptions::SetAll( sal_Bool _bSet )
+void SvtLanguageOptions::SetAll( bool _bSet )
 {
     m_pCJKOptions->SetAll( _bSet );
 }
-sal_Bool SvtLanguageOptions::IsAnyEnabled() const
+bool SvtLanguageOptions::IsAnyEnabled() const
 {
     return m_pCJKOptions->IsAnyEnabled();
 }
 // CTL options -----------------------------------------------------------------
-void SvtLanguageOptions::SetCTLFontEnabled( sal_Bool _bEnabled )
+void SvtLanguageOptions::SetCTLFontEnabled( bool _bEnabled )
 {
     m_pCTLOptions->SetCTLFontEnabled( _bEnabled );
 }
-sal_Bool SvtLanguageOptions::IsCTLFontEnabled() const
+bool SvtLanguageOptions::IsCTLFontEnabled() const
 {
     return m_pCTLOptions->IsCTLFontEnabled();
 }
-void SvtLanguageOptions::SetCTLSequenceChecking( sal_Bool _bEnabled )
+void SvtLanguageOptions::SetCTLSequenceChecking( bool _bEnabled )
 {
     m_pCTLOptions->SetCTLSequenceChecking( _bEnabled );
 }
 
-void SvtLanguageOptions::SetCTLSequenceCheckingRestricted( sal_Bool _bEnable )
+void SvtLanguageOptions::SetCTLSequenceCheckingRestricted( bool _bEnable )
 {
     m_pCTLOptions->SetCTLSequenceCheckingRestricted( _bEnable );
 }
 
-void SvtLanguageOptions::SetCTLSequenceCheckingTypeAndReplace( sal_Bool _bEnable )
+void SvtLanguageOptions::SetCTLSequenceCheckingTypeAndReplace( bool _bEnable )
 {
     m_pCTLOptions->SetCTLSequenceCheckingTypeAndReplace( _bEnable );
 }
 
-sal_Bool SvtLanguageOptions::IsReadOnly(SvtLanguageOptions::EOption eOption) const
+bool SvtLanguageOptions::IsReadOnly(SvtLanguageOptions::EOption eOption) const
 {
-    sal_Bool bReadOnly = sal_False;
+    bool bReadOnly = false;
     switch(eOption)
     {
         // cjk options
diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index 6a43a0ca10d3..728820375152 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -64,7 +64,7 @@ using namespace ::com::sun::star;
 
 
 // TODO: move to a standard helper
-sal_Bool isLocalFile_Impl( OUString aURL )
+bool isLocalFile_Impl( OUString aURL )
 {
     OUString aSystemPath;
 
@@ -160,7 +160,7 @@ FSStorage::~FSStorage()
     }
 }
 
-sal_Bool FSStorage::MakeFolderNoUI( const OUString& rFolder )
+bool FSStorage::MakeFolderNoUI( const OUString& rFolder )
 {
     INetURLObject aURL( rFolder );
     OUString aTitle = aURL.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
@@ -174,7 +174,7 @@ sal_Bool FSStorage::MakeFolderNoUI( const OUString& rFolder )
                                  aParent ) )
         return ::utl::UCBContentHelper::MakeFolder( aParent, aTitle, aResultContent, false );
 
-    return sal_False;
+    return false;
 }
 
 ::ucbhelper::Content* FSStorage::GetContent()
@@ -248,7 +248,7 @@ void FSStorage::CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, const
             while ( xResultSet->next() )
             {
                 OUString aSourceURL( xRow->getString( 1 ) );
-                sal_Bool bIsFolder( xRow->getBoolean(2) );
+                bool bIsFolder( xRow->getBoolean(2) );
 
                 // TODO/LATER: not sure whether the entry name must be encoded
                 OUString aNewEntryName( INetURLObject( aSourceURL ).getName( INetURLObject::LAST_SEGMENT,
@@ -558,7 +558,7 @@ uno::Reference< embed::XStorage > SAL_CALL FSStorage::openStorageElement(
     INetURLObject aFolderURL( m_pImpl->m_aURL );
     aFolderURL.Append( aStorName );
 
-    sal_Bool bFolderExists = ::utl::UCBContentHelper::IsFolder( aFolderURL.GetMainURL( INetURLObject::NO_DECODE ) );
+    bool bFolderExists = ::utl::UCBContentHelper::IsFolder( aFolderURL.GetMainURL( INetURLObject::NO_DECODE ) );
     if ( !bFolderExists && ::utl::UCBContentHelper::IsDocument( aFolderURL.GetMainURL( INetURLObject::NO_DECODE ) ) )
         throw io::IOException(); // TODO:
 
diff --git a/svl/source/fsstor/fsstorage.hxx b/svl/source/fsstor/fsstorage.hxx
index eb7bd3d9ec6a..48de36fa7831 100644
--- a/svl/source/fsstor/fsstorage.hxx
+++ b/svl/source/fsstor/fsstorage.hxx
@@ -64,7 +64,7 @@ public:
     void CopyContentToStorage_Impl( ::ucbhelper::Content* pContent,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest );
 
-    static sal_Bool MakeFolderNoUI( const OUString& rFolder );
+    static bool MakeFolderNoUI( const OUString& rFolder );
 
     //  XInterface
 
diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx
index 13f8509de84a..237e0a714492 100644
--- a/svl/source/items/aeitem.cxx
+++ b/svl/source/items/aeitem.cxx
@@ -252,16 +252,16 @@ void SfxAllEnumItem::DisableValue( sal_uInt16 nValue )
     pDisabledValues->push_back( nValue );
 }
 
-sal_Bool SfxAllEnumItem::IsEnabled( sal_uInt16 nValue ) const
+bool SfxAllEnumItem::IsEnabled( sal_uInt16 nValue ) const
 {
     if ( pDisabledValues )
     {
         for ( size_t i=0; i<pDisabledValues->size(); i++ )
             if ( (*pDisabledValues)[i] == nValue )
-                return sal_False;
+                return false;
     }
 
-    return sal_True;
+    return true;
 }
 
 // -----------------------------------------------------------------------
diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index 157a4f6043bc..74a631430b78 100644
--- a/svl/source/items/cenumitm.cxx
+++ b/svl/source/items/cenumitm.cxx
@@ -97,9 +97,9 @@ sal_uInt16 SfxEnumItemInterface::GetPosByValue(sal_uInt16 nValue) const
     return USHRT_MAX;
 }
 
-sal_Bool SfxEnumItemInterface::IsEnabled(sal_uInt16) const
+bool SfxEnumItemInterface::IsEnabled(sal_uInt16) const
 {
-    return sal_True;
+    return true;
 }
 
 // virtual
@@ -109,7 +109,7 @@ bool SfxEnumItemInterface::HasBoolValue() const
 }
 
 // virtual
-sal_Bool SfxEnumItemInterface::GetBoolValue() const
+bool SfxEnumItemInterface::GetBoolValue() const
 {
     return false;
 }
@@ -169,7 +169,7 @@ TYPEINIT1_AUTOFACTORY(SfxBoolItem, SfxPoolItem);
 SfxBoolItem::SfxBoolItem(sal_uInt16 const nWhich, SvStream & rStream)
     : SfxPoolItem(nWhich)
 {
-    sal_Bool tmp = false;
+    unsigned char tmp = 0;
     rStream.ReadUChar( tmp );
     m_bValue = tmp;
 }
@@ -210,7 +210,7 @@ bool SfxBoolItem::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const
 // virtual
 bool SfxBoolItem::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8)
 {
-    sal_Bool bTheValue = sal_Bool();
+    bool bTheValue = bool();
     if (rVal >>= bTheValue)
     {
         m_bValue = bTheValue;
@@ -229,7 +229,7 @@ SfxPoolItem * SfxBoolItem::Create(SvStream & rStream, sal_uInt16) const
 // virtual
 SvStream & SfxBoolItem::Store(SvStream & rStream, sal_uInt16) const
 {
-    rStream.WriteUChar( static_cast<sal_Bool>(m_bValue) ); // not bool for serialization!
+    rStream.WriteUChar( m_bValue ); // not bool for serialization!
     return rStream;
 }
 
diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx
index d829aac1f00f..d2299ae61ce5 100644
--- a/svl/source/items/ctypeitm.cxx
+++ b/svl/source/items/ctypeitm.cxx
@@ -71,7 +71,7 @@ SfxPoolItem* CntContentTypeItem::Create( SvStream& rStream,
     rStream.ReadUInt32( nMagic );
     if (nMagic == CNTSTRINGITEM_STREAM_MAGIC)
     {
-        sal_Bool bEncrypted = sal_False;
+        unsigned char bEncrypted = sal_False;
         rStream.ReadUChar( bEncrypted );
         DBG_ASSERT(!bEncrypted,
                    "CntContentTypeItem::Create() reads encrypted data");
@@ -88,7 +88,7 @@ SvStream & CntContentTypeItem::Store(SvStream & rStream, sal_uInt16) const
     // CntContentTypeItem used to be derived from CntStringItem, so take that
     // into account:
     writeUnicodeString(rStream, GetValue());
-    rStream.WriteUInt32( CNTSTRINGITEM_STREAM_MAGIC ).WriteUChar( sal_Bool(sal_False) );
+    rStream.WriteUInt32( CNTSTRINGITEM_STREAM_MAGIC ).WriteUChar( false );
     return rStream;
 }
 
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index b5000d6783c1..706f7fa4bba2 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -209,7 +209,7 @@ SfxItemPool::SfxItemPool
 SfxItemPool::SfxItemPool
 (
     const SfxItemPool&  rPool,                  //  von dieser Instanz kopieren
-    sal_Bool                bCloneStaticDefaults    /*  sal_True
+    bool                bCloneStaticDefaults    /*  sal_True
                                                     statische Defaults kopieren
 
                                                     sal_False
@@ -308,7 +308,7 @@ void SfxItemPool::SetDefaults( SfxPoolItem **pDefaults )
 
 void SfxItemPool::ReleaseDefaults
 (
-    sal_Bool    bDelete     /*  sal_True
+    bool    bDelete     /*  sal_True
                             l"oscht sowohl das Array als auch die einzelnen
                             statischen Defaults
 
@@ -344,7 +344,7 @@ void SfxItemPool::ReleaseDefaults
 
     sal_uInt16          nCount,     /*  Anzahl der statischen Defaults */
 
-    sal_Bool            bDelete     /*  sal_True
+    bool            bDelete     /*  sal_True
                                     l"oscht sowohl das Array als auch die
                                     einzelnen statischen Defaults
 
@@ -1012,7 +1012,7 @@ sal_uInt32 SfxItemPool::GetItemCount2(sal_uInt16 nWhich) const
 
 // -----------------------------------------------------------------------
 
-sal_uInt16 SfxItemPool::GetWhich( sal_uInt16 nSlotId, sal_Bool bDeep ) const
+sal_uInt16 SfxItemPool::GetWhich( sal_uInt16 nSlotId, bool bDeep ) const
 {
     if ( !IsSlot(nSlotId) )
         return nSlotId;
@@ -1028,7 +1028,7 @@ sal_uInt16 SfxItemPool::GetWhich( sal_uInt16 nSlotId, sal_Bool bDeep ) const
 
 // -----------------------------------------------------------------------
 
-sal_uInt16 SfxItemPool::GetSlotId( sal_uInt16 nWhich, sal_Bool bDeep ) const
+sal_uInt16 SfxItemPool::GetSlotId( sal_uInt16 nWhich, bool bDeep ) const
 {
     if ( !IsWhich(nWhich) )
         return nWhich;
@@ -1047,7 +1047,7 @@ sal_uInt16 SfxItemPool::GetSlotId( sal_uInt16 nWhich, sal_Bool bDeep ) const
 
 // -----------------------------------------------------------------------
 
-sal_uInt16 SfxItemPool::GetTrueWhich( sal_uInt16 nSlotId, sal_Bool bDeep ) const
+sal_uInt16 SfxItemPool::GetTrueWhich( sal_uInt16 nSlotId, bool bDeep ) const
 {
     if ( !IsSlot(nSlotId) )
         return 0;
@@ -1063,7 +1063,7 @@ sal_uInt16 SfxItemPool::GetTrueWhich( sal_uInt16 nSlotId, sal_Bool bDeep ) const
 
 // -----------------------------------------------------------------------
 
-sal_uInt16 SfxItemPool::GetTrueSlotId( sal_uInt16 nWhich, sal_Bool bDeep ) const
+sal_uInt16 SfxItemPool::GetTrueSlotId( sal_uInt16 nWhich, bool bDeep ) const
 {
     if ( !IsWhich(nWhich) )
         return 0;
diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index 8e88b781b22e..d7d3a81be093 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -172,9 +172,9 @@ SfxItemPropertySet::~SfxItemPropertySet()
 {
 }
 
-sal_Bool SfxItemPropertySet::FillItem(SfxItemSet&, sal_uInt16, sal_Bool) const
+bool SfxItemPropertySet::FillItem(SfxItemSet&, sal_uInt16, sal_Bool) const
 {
-    return sal_False;
+    return false;
 }
 
 void SfxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry& rEntry,
@@ -183,7 +183,7 @@ void SfxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry& rEn
 {
     // get the SfxPoolItem
     const SfxPoolItem* pItem = 0;
-    SfxItemState eState = rSet.GetItemState( rEntry.nWID, sal_True, &pItem );
+    SfxItemState eState = rSet.GetItemState( rEntry.nWID, true, &pItem );
     if(SFX_ITEM_SET != eState && SFX_WHICH_MAX > rEntry.nWID )
         pItem = &rSet.GetPool()->GetDefaultItem(rEntry.nWID);
     // return item values as uno::Any
@@ -243,7 +243,7 @@ void SfxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry& rEn
     // get the SfxPoolItem
     const SfxPoolItem* pItem = 0;
     SfxPoolItem *pNewItem = 0;
-    SfxItemState eState = rSet.GetItemState( rEntry.nWID, sal_True, &pItem );
+    SfxItemState eState = rSet.GetItemState( rEntry.nWID, true, &pItem );
     if(SFX_ITEM_SET != eState && SFX_WHICH_MAX > rEntry.nWID )
         pItem = &rSet.GetPool()->GetDefaultItem(rEntry.nWID);
     //maybe there's another way to find an Item
@@ -295,7 +295,7 @@ PropertyState SfxItemPropertySet::getPropertyState(const SfxItemPropertySimpleEn
     sal_uInt16 nWhich = rEntry.nWID;
 
     // item state holen
-    SfxItemState eState = rSet.GetItemState( nWhich, sal_False );
+    SfxItemState eState = rSet.GetItemState( nWhich, false );
     // item-Wert als UnoAny zurueckgeben
     if(eState == SFX_ITEM_DEFAULT)
         eRet = PropertyState_DEFAULT_VALUE;
@@ -319,7 +319,7 @@ PropertyState   SfxItemPropertySet::getPropertyState(const OUString& rName, cons
 
     // item holen
     const SfxPoolItem* pItem = 0;
-    SfxItemState eState = rSet.GetItemState( nWhich, sal_False, &pItem );
+    SfxItemState eState = rSet.GetItemState( nWhich, false, &pItem );
     if(!pItem && nWhich != rSet.GetPool()->GetSlotId(nWhich))
         pItem = &rSet.GetPool()->GetDefaultItem(nWhich);
     // item-Wert als UnoAny zurueckgeben
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index d68655f0414f..5403f2c95fb9 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -84,7 +84,7 @@ SfxItemSet::SfxItemSet
     SfxItemPool&    rPool,          /* der Pool, in dem die SfxPoolItems,
                                        welche in dieses SfxItemSet gelangen,
                                        aufgenommen werden sollen */
-    sal_Bool        bTotalRanges    /* komplette Pool-Ranges uebernehmen,
+    bool        bTotalRanges    /* komplette Pool-Ranges uebernehmen,
                                        muss auf sal_True gesetzt werden */
 )
 /*  [Beschreibung]
@@ -487,7 +487,7 @@ void SfxItemSet::InvalidateAllItems()
 // -----------------------------------------------------------------------
 
 SfxItemState SfxItemSet::GetItemState( sal_uInt16 nWhich,
-                                        sal_Bool bSrchInParent,
+                                        bool bSrchInParent,
                                         const SfxPoolItem **ppItem ) const
 {
     DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
@@ -760,7 +760,7 @@ void SfxItemSet::MergeRange( sal_uInt16 nFrom, sal_uInt16 nTo )
 
 {
     // special case: exactly one sal_uInt16 which is already included?
-    if ( nFrom == nTo && SFX_ITEM_AVAILABLE <= GetItemState(nFrom, sal_False) )
+    if ( nFrom == nTo && SFX_ITEM_AVAILABLE <= GetItemState(nFrom, false) )
         return;
 
     // merge new range
@@ -807,7 +807,7 @@ void SfxItemSet::SetRanges( const sal_uInt16 *pNewRanges )
             for ( sal_uInt16 nWID = *pRange; nWID <= pRange[1]; ++nWID, ++n )
             {
                 // direct move of pointer (not via pool)
-                SfxItemState eState = GetItemState( nWID, sal_False, aNewItems+n );
+                SfxItemState eState = GetItemState( nWID, false, aNewItems+n );
                 if ( SFX_ITEM_SET == eState )
                 {
                     // increment new item count and possibly increment ref count
@@ -917,7 +917,7 @@ bool SfxItemSet::Set
         while ( nWhich )
         {
             const SfxPoolItem* pItem;
-            if( SFX_ITEM_SET == rSet.GetItemState( nWhich, sal_True, &pItem ) )
+            if( SFX_ITEM_SET == rSet.GetItemState( nWhich, true, &pItem ) )
                 bRet |= 0 != Put( *pItem, pItem->Which() );
             nWhich = aIter.NextWhich();
         }
@@ -932,7 +932,7 @@ bool SfxItemSet::Set
 const SfxPoolItem* SfxItemSet::GetItem
 (
     sal_uInt16              nId,            // Slot-Id oder Which-Id des Items
-    sal_Bool                bSrchInParent,  // sal_True: auch in Parent-ItemSets suchen
+    bool                bSrchInParent,  // sal_True: auch in Parent-ItemSets suchen
     TypeId              aItemType       // != 0 =>  RTTI Pruefung mit Assertion
 )   const
 
@@ -1124,7 +1124,7 @@ void SfxItemSet::Intersect( const SfxItemSet& rSet )
             sal_uInt16 nWhich = IsInvalidItem( pItem )
                                 ? GetWhichByPos( aIter.GetCurPos() )
                                 : pItem->Which();
-            if( 0 == rSet.GetItemState( nWhich, sal_False ) )
+            if( 0 == rSet.GetItemState( nWhich, false ) )
                 ClearItem( nWhich );        // loeschen
             if( aIter.IsAtEnd() )
                 break;
@@ -1195,7 +1195,7 @@ void SfxItemSet::Differentiate( const SfxItemSet& rSet )
             sal_uInt16 nWhich = IsInvalidItem( pItem )
                                 ? GetWhichByPos( aIter.GetCurPos() )
                                 : pItem->Which();
-            if( SFX_ITEM_SET == rSet.GetItemState( nWhich, sal_False ) )
+            if( SFX_ITEM_SET == rSet.GetItemState( nWhich, false ) )
                 ClearItem( nWhich );        // loeschen
             if( aIter.IsAtEnd() )
                 break;
@@ -1287,7 +1287,7 @@ unknown     unknown     !=      sal_True            -           -           -
 
 static void MergeItem_Impl( SfxItemPool *_pPool, sal_uInt16 &rCount,
                             const SfxPoolItem **ppFnd1, const SfxPoolItem *pFnd2,
-                            sal_Bool bIgnoreDefaults )
+                            bool bIgnoreDefaults )
 {
     DBG_ASSERT( ppFnd1 != 0, "Merging to 0-Item" );
 
@@ -1392,7 +1392,7 @@ void SfxItemSet::MergeValues( const SfxItemSet& rSet, sal_Bool bIgnoreDefaults )
         while( 0 != ( nWhich = aIter.NextWhich() ) )
         {
             const SfxPoolItem* pItem = 0;
-            rSet.GetItemState( nWhich, sal_True, &pItem );
+            rSet.GetItemState( nWhich, true, &pItem );
             if( !pItem )
             {
                 // nicht gesetzt, also default
@@ -1659,8 +1659,8 @@ bool SfxItemSet::operator==(const SfxItemSet &rCmp) const
                 // wenn die Pointer von poolable Items ungleich sind,
                 // muessen die Items gleich sein
                 const SfxPoolItem *pItem1 = 0, *pItem2 = 0;
-                if ( GetItemState( nWh, sal_False, &pItem1 ) !=
-                        rCmp.GetItemState( nWh, sal_False, &pItem2 ) ||
+                if ( GetItemState( nWh, false, &pItem1 ) !=
+                        rCmp.GetItemState( nWh, false, &pItem2 ) ||
                      ( pItem1 != pItem2 &&
                         ( !pItem1 || IsInvalidItem(pItem1) ||
                           ( _pPool->IsItemFlag(*pItem1, SFX_ITEM_POOLABLE) &&
@@ -1711,7 +1711,7 @@ SfxItemSet *SfxItemSet::Clone(sal_Bool bItems, SfxItemPool *pToPool ) const
             while ( nWhich )
             {
                 const SfxPoolItem* pItem;
-                if ( SFX_ITEM_SET == GetItemState( nWhich, sal_False, &pItem ) )
+                if ( SFX_ITEM_SET == GetItemState( nWhich, false, &pItem ) )
                     pNewSet->Put( *pItem, pItem->Which() );
                 nWhich = aIter.NextWhich();
             }
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index c5a6f28760f3..393f4c9b0cf1 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -179,15 +179,15 @@ SvxMacro& SvxMacroTableDtor::Insert(sal_uInt16 nEvent, const SvxMacro& rMacro)
 }
 
 // If the entry exists, remove it from the map and release it's storage
-sal_Bool SvxMacroTableDtor::Erase(sal_uInt16 nEvent)
+bool SvxMacroTableDtor::Erase(sal_uInt16 nEvent)
 {
     SvxMacroTable::iterator it = aSvxMacroTable.find(nEvent);
     if ( it != aSvxMacroTable.end())
     {
         aSvxMacroTable.erase(it);
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 // -----------------------------------------------------------------------
diff --git a/svl/source/items/poolcach.cxx b/svl/source/items/poolcach.cxx
index 909c33b78c67..d49a4319218d 100644
--- a/svl/source/items/poolcach.cxx
+++ b/svl/source/items/poolcach.cxx
@@ -67,7 +67,7 @@ SfxItemPoolCache::~SfxItemPoolCache()
 }
 
 
-const SfxSetItem& SfxItemPoolCache::ApplyTo( const SfxSetItem &rOrigItem, sal_Bool bNew )
+const SfxSetItem& SfxItemPoolCache::ApplyTo( const SfxSetItem &rOrigItem, bool bNew )
 {
     DBG_CHKTHIS(SfxItemPoolCache, 0);
     DBG_ASSERT( pPool == rOrigItem.GetItemSet().GetPool(), "invalid Pool" );
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index 45c1e4c82d51..a6ec3016555d 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -187,7 +187,7 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const
                      pImp->bInSetItem == (bool) (*ppDefItem)->ISA(SfxSetItem) )
                 {
                     // eigene Kennung, globale Which-Id und Item-Version
-                    sal_uInt16 nSlotId = GetSlotId( (*ppDefItem)->Which(), sal_False );
+                    sal_uInt16 nSlotId = GetSlotId( (*ppDefItem)->Which(), false );
                     aWhichIdsRec.NewContent(nSlotId, 0);
                     rStream.WriteUInt16( (*ppDefItem)->Which() );
                     rStream.WriteUInt16( nItemVersion );
@@ -256,7 +256,7 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const
                     continue;
 
                 // eigene Kennung, globale Kennung, Version
-                sal_uInt16 nSlotId = GetSlotId( pDefaultItem->Which(), sal_False );
+                sal_uInt16 nSlotId = GetSlotId( pDefaultItem->Which(), false );
                 aDefsRec.NewContent( nSlotId, 0 );
                 rStream.WriteUInt16( pDefaultItem->Which() );
                 rStream.WriteUInt16( nItemVersion );
@@ -1059,7 +1059,7 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate
     {
         // Bei einem anders aufgebauten Pool im Stream, mu\s die SlotId
         // aus dem Stream in eine Which-Id gemappt werden k"onnen.
-        sal_uInt16 nMappedWhich = nSlotId ? GetWhich(nSlotId, sal_True) : 0;
+        sal_uInt16 nMappedWhich = nSlotId ? GetWhich(nSlotId, true) : 0;
         if ( IsWhich(nMappedWhich) )
         {
             // gemappte SlotId kann "ubernommen werden
@@ -1479,7 +1479,7 @@ bool SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem,
     DBG_ASSERT( !pImp->bInSetItem || !rItem.ISA(SfxSetItem),
                 "SetItem contains ItemSet with SetItem" );
 
-    sal_uInt16 nSlotId = pPool->GetSlotId( rItem.Which(), sal_True );
+    sal_uInt16 nSlotId = pPool->GetSlotId( rItem.Which(), true );
     sal_uInt16 nItemVersion = rItem.GetVersion(pImp->mnFileFormatVersion);
     if ( USHRT_MAX == nItemVersion )
         return false;
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 5e4ee561b2ab..9da71b854baa 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -398,19 +398,19 @@ bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMembe
         case MID_SEARCH_CELLTYPE:
             rVal <<= (sal_Int32) nCellType; break;
         case MID_SEARCH_ROWDIRECTION:
-            rVal <<= (sal_Bool) bRowDirection; break;
+            rVal <<= bRowDirection; break;
         case MID_SEARCH_ALLTABLES:
-            rVal <<= (sal_Bool) bAllTables; break;
+            rVal <<= bAllTables; break;
         case MID_SEARCH_SEARCHFILTERED:
-            rVal <<= (sal_Bool) bSearchFiltered; break;
+            rVal <<= bSearchFiltered; break;
         case MID_SEARCH_BACKWARD:
-            rVal <<= (sal_Bool) bBackward; break;
+            rVal <<= bBackward; break;
         case MID_SEARCH_PATTERN:
-            rVal <<= (sal_Bool) bPattern; break;
+            rVal <<= bPattern; break;
         case MID_SEARCH_CONTENT:
-            rVal <<= (sal_Bool) bContent; break;
+            rVal <<= bContent; break;
         case MID_SEARCH_ASIANOPTIONS:
-            rVal <<= (sal_Bool) bAsianOptions; break;
+            rVal <<= bAsianOptions; break;
         case MID_SEARCH_ALGORITHMTYPE:
             rVal <<= (sal_Int16) aSearchOpt.algorithmType; break;
         case MID_SEARCH_FLAGS:
diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx
index 9bceaf6559d1..dbd8ec5c37cf 100644
--- a/svl/source/items/visitem.cxx
+++ b/svl/source/items/visitem.cxx
@@ -33,7 +33,7 @@ SfxVisibilityItem::SfxVisibilityItem(sal_uInt16 which, SvStream & rStream):
     SfxPoolItem(which)
 {
     DBG_CTOR(SfxVisibilityItem, 0);
-    sal_Bool bValue = 0;
+    unsigned char bValue = 0;
     rStream.ReadUChar( bValue );
     m_nValue.bVisible = bValue;
 }
diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx
index 0b77892b1ef8..14745c1d653b 100644
--- a/svl/source/misc/documentlockfile.cxx
+++ b/svl/source/misc/documentlockfile.cxx
@@ -214,7 +214,7 @@ void DocumentLockFile::RemoveFile()
     uno::Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv;
     ::ucbhelper::Content aCnt(m_aURL, xEnv, comphelper::getProcessComponentContext());
     aCnt.executeCommand(OUString("delete"),
-        uno::makeAny(sal_Bool(sal_True)));
+        uno::makeAny(true));
 }
 
 } // namespace svt
diff --git a/svl/source/misc/fstathelper.cxx b/svl/source/misc/fstathelper.cxx
index 0184425ee172..a9781b03e94c 100644
--- a/svl/source/misc/fstathelper.cxx
+++ b/svl/source/misc/fstathelper.cxx
@@ -30,10 +30,10 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::ucb;
 using namespace ::rtl;
 
-sal_Bool FStatHelper::GetModifiedDateTimeOfFile( const OUString& rURL,
+bool FStatHelper::GetModifiedDateTimeOfFile( const OUString& rURL,
                                         Date* pDate, Time* pTime )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     try
     {
         ::ucbhelper::Content aTestContent( rURL,
@@ -43,7 +43,7 @@ sal_Bool FStatHelper::GetModifiedDateTimeOfFile( const OUString& rURL,
             OUString("DateModified") );
         if( aAny.hasValue() )
         {
-            bRet = sal_True;
+            bRet = true;
             const util::DateTime* pDT = (util::DateTime*)aAny.getValue();
             if( pDate )
                 *pDate = Date( pDT->Day, pDT->Month, pDT->Year );
@@ -59,9 +59,9 @@ sal_Bool FStatHelper::GetModifiedDateTimeOfFile( const OUString& rURL,
     return bRet;
 }
 
-sal_Bool FStatHelper::IsDocument( const OUString& rURL )
+bool FStatHelper::IsDocument( const OUString& rURL )
 {
-    sal_Bool bExist = sal_False;
+    bool bExist = false;
     try
     {
         ::ucbhelper::Content aTestContent( rURL,
@@ -75,9 +75,9 @@ sal_Bool FStatHelper::IsDocument( const OUString& rURL )
     return bExist;
 }
 
-sal_Bool FStatHelper::IsFolder( const OUString& rURL )
+bool FStatHelper::IsFolder( const OUString& rURL )
 {
-    sal_Bool bExist = sal_False;
+    bool bExist = false;
     try
     {
         ::ucbhelper::Content aTestContent( rURL,
diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx
index cb14845a3b3a..37e9c41fcba3 100644
--- a/svl/source/misc/inethist.cxx
+++ b/svl/source/misc/inethist.cxx
@@ -201,7 +201,7 @@ public:
     /** putUrl/queryUrl.
     */
     void putUrl   (const OUString &rUrl);
-    sal_Bool queryUrl (const OUString &rUrl);
+    bool queryUrl (const OUString &rUrl);
 };
 
 /*========================================================================
@@ -348,19 +348,19 @@ void INetURLHistory_Impl::putUrl (const OUString &rUrl)
 /*
  * queryUrl.
  */
-sal_Bool INetURLHistory_Impl::queryUrl (const OUString &rUrl)
+bool INetURLHistory_Impl::queryUrl (const OUString &rUrl)
 {
     sal_uInt32 h = crc32 (rUrl);
     sal_uInt16 k = find (h);
     if ((k < capacity()) && (m_pHash[k] == h))
     {
         // Cache hit.
-        return sal_True;
+        return true;
     }
     else
     {
         // Cache miss.
-        return sal_False;
+        return false;
     }
 }
 
@@ -473,7 +473,7 @@ void INetURLHistory::PutUrl_Impl (const INetURLObject &rUrl)
 /*
  * QueryUrl_Impl.
  */
-sal_Bool INetURLHistory::QueryUrl_Impl (const INetURLObject &rUrl)
+bool INetURLHistory::QueryUrl_Impl (const INetURLObject &rUrl)
 {
     DBG_ASSERT (m_pImpl, "QueryUrl_Impl(): no Implementation");
     if (m_pImpl)
@@ -483,7 +483,7 @@ sal_Bool INetURLHistory::QueryUrl_Impl (const INetURLObject &rUrl)
 
         return m_pImpl->queryUrl (aHistUrl.GetMainURL(INetURLObject::NO_DECODE));
     }
-    return sal_False;
+    return false;
 }
 
 
diff --git a/svl/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx
index a6946bcb543a..ad004e7d8199 100644
--- a/svl/source/notify/lstner.cxx
+++ b/svl/source/notify/lstner.cxx
@@ -73,7 +73,7 @@ void SfxListener::RemoveBroadcaster_Impl( SfxBroadcaster& rBroadcaster )
 
 // registers a specific SfxBroadcaster
 
-sal_Bool SfxListener::StartListening( SfxBroadcaster& rBroadcaster, sal_Bool bPreventDups )
+bool SfxListener::StartListening( SfxBroadcaster& rBroadcaster, bool bPreventDups )
 {
     DBG_CHKTHIS(SfxListener, 0);
 
@@ -83,21 +83,21 @@ sal_Bool SfxListener::StartListening( SfxBroadcaster& rBroadcaster, sal_Bool bPr
         aBCs.push_back( &rBroadcaster );
 
         DBG_ASSERT( IsListening(rBroadcaster), "StartListening failed" );
-        return sal_True;
+        return true;
     }
 
-    return sal_False;
+    return false;
 }
 
 
 // unregisters a specific SfxBroadcaster
 
-sal_Bool SfxListener::EndListening( SfxBroadcaster& rBroadcaster, sal_Bool bAllDups )
+bool SfxListener::EndListening( SfxBroadcaster& rBroadcaster, bool bAllDups )
 {
     DBG_CHKTHIS(SfxListener, 0);
 
     if ( !IsListening( rBroadcaster ) )
-        return sal_False;
+        return false;
 
     do
     {
@@ -105,7 +105,7 @@ sal_Bool SfxListener::EndListening( SfxBroadcaster& rBroadcaster, sal_Bool bAllD
         aBCs.erase( std::find( aBCs.begin(), aBCs.end(), &rBroadcaster ) );
     }
     while ( bAllDups && IsListening( rBroadcaster ) );
-    return sal_True;
+    return true;
 }
 
 
@@ -125,7 +125,7 @@ void SfxListener::EndListeningAll()
 }
 
 
-sal_Bool SfxListener::IsListening( SfxBroadcaster& rBroadcaster ) const
+bool SfxListener::IsListening( SfxBroadcaster& rBroadcaster ) const
 {
     return aBCs.end() != std::find( aBCs.begin(), aBCs.end(), &rBroadcaster );
 }
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index b733602d564a..3b36695b18db 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -632,7 +632,7 @@ sal_Bool SAL_CALL SvNumberFormatsObj::isTypeCompatible( sal_Int16 nOldType, sal_
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SvNumberFormatter* pFormatter = rSupplier.GetNumberFormatter();
     if (pFormatter)
         bRet = pFormatter->IsCompatible( nOldType, nNewType );
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 3b873527a3ab..73072a3cb283 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -173,7 +173,7 @@ void ImpSvNumberformatInfo::Save(SvStream& rStream, sal_uInt16 nAnz) const
         }
 
     }
-    rStream.WriteInt16( eScannedType ).WriteUChar( sal_Bool(bThousand) ).WriteUInt16( nThousand )
+    rStream.WriteInt16( eScannedType ).WriteUChar( bThousand ).WriteUInt16( nThousand )
            .WriteUInt16( nCntPre ).WriteUInt16( nCntPost ).WriteUInt16( nCntExp );
 }
 
@@ -184,7 +184,7 @@ void ImpSvNumberformatInfo::Load(SvStream& rStream, sal_uInt16 nAnz)
         sStrArray[i] = SvNumberformat::LoadString( rStream );
         rStream.ReadInt16( nTypeArray[i] );
     }
-    sal_Bool bStreamThousand;
+    unsigned char bStreamThousand;
     rStream.ReadInt16( eScannedType ).ReadUChar( bStreamThousand ).ReadUInt16( nThousand )
            .ReadUInt16( nCntPre ).ReadUInt16( nCntPost ).ReadUInt16( nCntExp );
     bThousand = bStreamThousand;
@@ -1702,7 +1702,7 @@ NfHackConversion SvNumberformat::Load( SvStream& rStream,
     rHdr.StartEntry();
     sal_uInt16 nOp1, nOp2;
     sFormatstring = SvNumberformat::LoadString( rStream );
-    sal_Bool bStreamStandard, bStreamUsed;
+    unsigned char bStreamStandard, bStreamUsed;
     rStream.ReadInt16( eType ).ReadDouble( fLimit1 ).ReadDouble( fLimit2 )
            .ReadUInt16( nOp1 ).ReadUInt16( nOp2 ).ReadUChar( bStreamStandard ).ReadUChar( bStreamUsed );
     bStandard = bStreamStandard;
@@ -1778,7 +1778,7 @@ NfHackConversion SvNumberformat::Load( SvStream& rStream,
     {
         // as of SV_NUMBERFORMATTER_VERSION_NEW_CURR
         sal_uInt16 nId;
-        sal_Bool bStreamCurr;
+        unsigned char bStreamCurr;
         rStream.ReadUInt16( nId );
         switch ( nId )
         {
@@ -1972,7 +1972,7 @@ void SvNumberformat::Save( SvStream& rStream, ImpSvNumMultipleWriteHeader& rHdr
     rHdr.StartEntry();
     rStream.WriteUniOrByteString( aFormatstring, rStream.GetStreamCharSet() );
     rStream.WriteInt16( eType ).WriteDouble( fLimit1 ).WriteDouble( fLimit2 ).WriteUInt16( (sal_uInt16) eOp1 ).WriteUInt16( (sal_uInt16) eOp2 )
-           .WriteUChar( sal_Bool(bOldStandard) ).WriteUChar( sal_Bool(bIsUsed) );
+           .WriteUChar( bOldStandard ).WriteUChar( bIsUsed );
     for (sal_uInt16 i = 0; i < 4; i++)
     {
         NumFor[i].Save(rStream);
@@ -1982,7 +1982,7 @@ void SvNumberformat::Save( SvStream& rStream, ImpSvNumMultipleWriteHeader& rHdr
     rStream.WriteUInt16( nNewStandardDefined );
     // As of SV_NUMBERFORMATTER_VERSION_NEW_CURR
     rStream.WriteUInt16( nNewCurrencyVersionId );
-    rStream.WriteUChar( sal_Bool(bNewCurrency) );
+    rStream.WriteUChar( bNewCurrency );
     if ( bNewCurrency )
     {
         for ( sal_uInt16 j=0; j<4; j++ )
@@ -1995,7 +1995,7 @@ void SvNumberformat::Save( SvStream& rStream, ImpSvNumMultipleWriteHeader& rHdr
     if ( bStandard != bOldStandard )
     {
         rStream.WriteUInt16( nNewStandardFlagVersionId );
-        rStream.WriteUChar( (sal_Bool)bStandard );
+        rStream.WriteUChar( bStandard );
     }
 
     rHdr.EndEntry();
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index 0e0cb3c3f1b8..f6fa804110b6 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -81,7 +81,7 @@ static OUString createIndex( vector< OUString > lines )
 static vector< OUString > getInfoFromInd( OUString aInd )
 {
     vector< OUString > aResult;
-    sal_Bool aStart = sal_True;
+    bool aStart = true;
 
     OString line = OUStringToOString( aInd, RTL_TEXTENCODING_ASCII_US );
     const sal_Char* pLine = line.getStr();
@@ -91,7 +91,7 @@ static vector< OUString > getInfoFromInd( OUString aInd )
         if( !aStart )
             pLine += 2;
         else
-            aStart = sal_False;
+            aStart = false;
 
         while( *pLine && !( pLine[0] == '_' && pLine[1] == '_' ))
             if( *pLine != '_' )
@@ -130,16 +130,16 @@ static vector< OUString > getInfoFromInd( OUString aInd )
 }
 
 
-static sal_Bool shorterUrl( OUString& aURL )
+static bool shorterUrl( OUString& aURL )
 {
     sal_Int32 aInd = aURL.lastIndexOf( '/' );
     if( aInd > 0 && aURL.indexOf( "://" ) != aInd-2 )
     {
         aURL = aURL.copy( 0, aInd );
-        return sal_True;
+        return true;
     }
 
-    return sal_False;
+    return false;
 }
 
 
@@ -320,7 +320,7 @@ void StorageItem::setEncodedMP( const OUString& aEncoded, bool bAcceptEmpty )
     sendNames[0] = "HasMaster";
     sendNames[1] = "Master";
 
-    sal_Bool bHasMaster = ( !aEncoded.isEmpty() || bAcceptEmpty );
+    bool bHasMaster = ( !aEncoded.isEmpty() || bAcceptEmpty );
     sendVals[0] <<= bHasMaster;
     sendVals[1] <<= aEncoded;
 
@@ -851,21 +851,21 @@ OUString PasswordContainer::GetMasterPassword( const Reference< XInteractionHand
     if( m_aMasterPasswd.isEmpty() && aHandler.is() )
     {
         OUString aEncodedMP;
-        sal_Bool bAskAgain = sal_False;
-        sal_Bool bDefaultPassword = sal_False;
+        bool bAskAgain = false;
+        bool bDefaultPassword = false;
 
         if( !m_pStorageFile->getEncodedMP( aEncodedMP ) )
             aRMode = PasswordRequestMode_PASSWORD_CREATE;
         else if ( aEncodedMP.isEmpty() )
         {
             m_aMasterPasswd = GetDefaultMasterPassword();
-            bDefaultPassword = sal_True;
+            bDefaultPassword = true;
         }
 
         if ( !bDefaultPassword )
         {
             do {
-                bAskAgain = sal_False;
+                bAskAgain = false;
 
                 OUString aPass = RequestPasswordFromUser( aRMode, aHandler );
                 if ( !aPass.isEmpty() )
@@ -882,7 +882,7 @@ OUString PasswordContainer::GetMasterPassword( const Reference< XInteractionHand
                         vector< OUString > aRM( DecodePasswords( aEncodedMP, aPass ) );
                         if( aRM.empty() || !aPass.equals( aRM[0] ) )
                         {
-                            bAskAgain = sal_True;
+                            bAskAgain = true;
                             aRMode = PasswordRequestMode_PASSWORD_REENTER;
                         }
                         else
@@ -1057,7 +1057,7 @@ Sequence< UrlRecord > SAL_CALL PasswordContainer::getAllPersistent( const Refere
 sal_Bool SAL_CALL PasswordContainer::authorizateWithMasterPassword( const uno::Reference< task::XInteractionHandler >& xHandler )
     throw (uno::RuntimeException)
 {
-    sal_Bool bResult = sal_False;
+    bool bResult = false;
     OUString aEncodedMP;
     uno::Reference< task::XInteractionHandler > xTmpHandler = xHandler;
     ::osl::MutexGuard aGuard( mMutex );
@@ -1069,7 +1069,7 @@ sal_Bool SAL_CALL PasswordContainer::authorizateWithMasterPassword( const uno::R
         {
             // this is a default master password
             // no UI is necessary
-            bResult = sal_True;
+            bResult = true;
         }
         else
         {
@@ -1111,7 +1111,7 @@ sal_Bool SAL_CALL PasswordContainer::authorizateWithMasterPassword( const uno::R
 sal_Bool SAL_CALL PasswordContainer::changeMasterPassword( const uno::Reference< task::XInteractionHandler >& xHandler )
     throw (uno::RuntimeException)
 {
-    sal_Bool bResult = sal_False;
+    bool bResult = false;
     uno::Reference< task::XInteractionHandler > xTmpHandler = xHandler;
     ::osl::MutexGuard aGuard( mMutex );
 
@@ -1124,7 +1124,7 @@ sal_Bool SAL_CALL PasswordContainer::changeMasterPassword( const uno::Reference<
             xTmpHandler.set( InteractionHandler::createWithParent(xContext, 0), uno::UNO_QUERY_THROW );
         }
 
-        sal_Bool bCanChangePassword = sal_True;
+        bool bCanChangePassword = true;
         // if there is already a stored master password it should be entered by the user before the change happen
         OUString aEncodedMP;
         if( !m_aMasterPasswd.isEmpty() || m_pStorageFile->getEncodedMP( aEncodedMP ) )
@@ -1157,7 +1157,7 @@ sal_Bool SAL_CALL PasswordContainer::changeMasterPassword( const uno::Reference<
                                        aPersistent[nURLInd].UserList[nNameInd].Passwords,
                                        uno::Reference< task::XInteractionHandler >() );
 
-                bResult = sal_True;
+                bResult = true;
             }
         }
     }
@@ -1223,7 +1223,7 @@ void SAL_CALL PasswordContainer::removeMasterPassword()
 ::sal_Bool SAL_CALL PasswordContainer::useDefaultMasterPassword( const uno::Reference< task::XInteractionHandler >& xHandler )
     throw ( uno::RuntimeException )
 {
-    sal_Bool bResult = sal_False;
+    bool bResult = false;
     uno::Reference< task::XInteractionHandler > xTmpHandler = xHandler;
     ::osl::MutexGuard aGuard( mMutex );
 
@@ -1236,7 +1236,7 @@ void SAL_CALL PasswordContainer::removeMasterPassword()
             xTmpHandler.set( InteractionHandler::createWithParent(xContext, 0), uno::UNO_QUERY_THROW );
         }
 
-        sal_Bool bCanChangePassword = sal_True;
+        bool bCanChangePassword = true;
         // if there is already a stored nondefault master password it should be entered by the user before the change happen
         OUString aEncodedMP;
         if( m_pStorageFile->getEncodedMP( aEncodedMP ) && !aEncodedMP.isEmpty() )
@@ -1266,7 +1266,7 @@ void SAL_CALL PasswordContainer::removeMasterPassword()
                                        aPersistent[nURLInd].UserList[nNameInd].Passwords,
                                        uno::Reference< task::XInteractionHandler >() );
 
-                bResult = sal_True;
+                bResult = true;
             }
         }
     }