svtools: sal_Bool->bool

Change-Id: I35c9c1514c67860e61b6e2457ab4548d04a4d159

5 files changed, 109 insertions, 109 deletions

diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index 7284b524b9e6..ea0168bd5646 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -48,9 +48,9 @@ static sal_Int32           nRefCount = 0;
 
 class SvtHelpOptions_Impl : public utl::ConfigItem
 {
-    sal_Bool        bExtendedHelp;
-    sal_Bool        bHelpTips;
-    sal_Bool        bWelcomeScreen;
+    bool            bExtendedHelp;
+    bool            bHelpTips;
+    bool            bWelcomeScreen;
     OUString        aLocale;
     OUString        aSystem;
     OUString        sHelpStyleSheet;
@@ -68,13 +68,13 @@ public:
     void            Load( const ::com::sun::star::uno::Sequence< OUString>& aPropertyNames);
     virtual void    Commit();
 
-    void            SetExtendedHelp( sal_Bool b )           { bExtendedHelp= b; SetModified(); }
-    bool        IsExtendedHelp() const                  { return bExtendedHelp; }
-    void            SetHelpTips( sal_Bool b )               { bHelpTips = b; SetModified(); }
-    bool        IsHelpTips() const                      { return bHelpTips; }
+    void            SetExtendedHelp( bool b )           { bExtendedHelp= b; SetModified(); }
+    bool            IsExtendedHelp() const                  { return bExtendedHelp; }
+    void            SetHelpTips( bool b )               { bHelpTips = b; SetModified(); }
+    bool            IsHelpTips() const                      { return bHelpTips; }
 
-    void            SetWelcomeScreen( sal_Bool b )          { bWelcomeScreen = b; SetModified(); }
-    sal_Bool        IsWelcomeScreen() const                 { return bWelcomeScreen; }
+    void            SetWelcomeScreen( bool b )          { bWelcomeScreen = b; SetModified(); }
+    bool            IsWelcomeScreen() const                 { return bWelcomeScreen; }
     OUString        GetLocale() const                       { return aLocale; }
     OUString        GetSystem() const                       { return aSystem; }
 
@@ -125,9 +125,9 @@ Sequence< OUString > SvtHelpOptions_Impl::GetPropertyNames()
 
 SvtHelpOptions_Impl::SvtHelpOptions_Impl()
     : ConfigItem( OUString( "Office.Common/Help" ) )
-    , bExtendedHelp( sal_False )
-    , bHelpTips( sal_True )
-    , bWelcomeScreen( sal_False )
+    , bExtendedHelp( false )
+    , bHelpTips( true )
+    , bWelcomeScreen( false )
 {
     Sequence< OUString > aNames = GetPropertyNames();
     Load( aNames );
@@ -286,7 +286,7 @@ SvtHelpOptions::~SvtHelpOptions()
     }
 }
 
-void SvtHelpOptions::SetExtendedHelp( sal_Bool b )
+void SvtHelpOptions::SetExtendedHelp( bool b )
 {
     pImp->SetExtendedHelp( b );
 }
@@ -296,7 +296,7 @@ bool SvtHelpOptions::IsExtendedHelp() const
     return pImp->IsExtendedHelp();
 }
 
-void SvtHelpOptions::SetHelpTips( sal_Bool b )
+void SvtHelpOptions::SetHelpTips( bool b )
 {
     pImp->SetHelpTips( b );
 }
@@ -308,12 +308,12 @@ bool SvtHelpOptions::IsHelpTips() const
 
 
 
-void SvtHelpOptions::SetWelcomeScreen( sal_Bool b )
+void SvtHelpOptions::SetWelcomeScreen( bool b )
 {
     pImp->SetWelcomeScreen( b );
 }
 
-sal_Bool SvtHelpOptions::IsWelcomeScreen() const
+bool SvtHelpOptions::IsWelcomeScreen() const
 {
     return pImp->IsWelcomeScreen();
 }
diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx
index caef175e6d6f..b42eeaa6e982 100644
--- a/svtools/source/config/htmlcfg.cxx
+++ b/svtools/source/config/htmlcfg.cxx
@@ -50,13 +50,13 @@ struct HtmlOptions_Impl
     sal_Int32   nExportMode;
     sal_Int32   aFontSizeArr[HTML_FONT_COUNT];
     sal_Int32   eEncoding;
-    sal_Bool    bIsEncodingDefault;
+    bool        bIsEncodingDefault;
 
     HtmlOptions_Impl() :
         nFlags(HTMLCFG_LOCAL_GRF|HTMLCFG_IS_BASIC_WARNING),
         nExportMode(HTML_CFG_NS40),
         eEncoding( osl_getThreadTextEncoding() ),
-        bIsEncodingDefault(sal_True)
+        bIsEncodingDefault(true)
     {
         aFontSizeArr[0] = HTMLFONTSZ1_DFLT;
         aFontSizeArr[1] = HTMLFONTSZ2_DFLT;
@@ -176,7 +176,7 @@ void SvxHtmlOptions::Load( const Sequence< OUString >& aNames )
                     break;//"Export/Warning"
 
                     case 14: pValues[nProp] >>= pImp->eEncoding;
-                             pImp->bIsEncodingDefault = sal_False;
+                             pImp->bIsEncodingDefault = false;
                     break;//"Export/Encoding"
 
                     case 15:
@@ -199,7 +199,7 @@ void    SvxHtmlOptions::Commit()
 
     for(int nProp = 0; nProp < aNames.getLength(); nProp++)
     {
-        sal_Bool bSet = sal_False;
+        bool bSet = false;
         switch(nProp)
         {
             case  0: bSet = 0 != (pImp->nFlags & HTMLCFG_UNKNOWN_TAGS);break;//"Import/UnknownTag",
@@ -277,7 +277,7 @@ void SvxHtmlOptions::SetFontSize(sal_uInt16 nPos, sal_uInt16 nSize)
 
 
 
-sal_Bool SvxHtmlOptions::IsImportUnknown() const
+bool SvxHtmlOptions::IsImportUnknown() const
 {
     return 0 != (pImp->nFlags & HTMLCFG_UNKNOWN_TAGS) ;
 }
@@ -285,7 +285,7 @@ sal_Bool SvxHtmlOptions::IsImportUnknown() const
 
 
 
-void SvxHtmlOptions::SetImportUnknown(sal_Bool bSet)
+void SvxHtmlOptions::SetImportUnknown(bool bSet)
 {
     if(bSet)
         pImp->nFlags |= HTMLCFG_UNKNOWN_TAGS;
@@ -318,7 +318,7 @@ void SvxHtmlOptions::SetExportMode(sal_uInt16 nSet)
 
 
 
-sal_Bool SvxHtmlOptions::IsStarBasic() const
+bool SvxHtmlOptions::IsStarBasic() const
 {
     return 0 != (pImp->nFlags & HTMLCFG_STAR_BASIC) ;
 }
@@ -326,7 +326,7 @@ sal_Bool SvxHtmlOptions::IsStarBasic() const
 
 
 
-void SvxHtmlOptions::SetStarBasic(sal_Bool bSet)
+void SvxHtmlOptions::SetStarBasic(bool bSet)
 {
     if(bSet)
         pImp->nFlags |=  HTMLCFG_STAR_BASIC;
@@ -335,12 +335,12 @@ void SvxHtmlOptions::SetStarBasic(sal_Bool bSet)
     SetModified();
 }
 
-sal_Bool SvxHtmlOptions::IsSaveGraphicsLocal() const
+bool SvxHtmlOptions::IsSaveGraphicsLocal() const
 {
     return 0 != (pImp->nFlags & HTMLCFG_LOCAL_GRF) ;
 }
 
-void SvxHtmlOptions::SetSaveGraphicsLocal(sal_Bool bSet)
+void SvxHtmlOptions::SetSaveGraphicsLocal(bool bSet)
 {
     if(bSet)
         pImp->nFlags |=  HTMLCFG_LOCAL_GRF;
@@ -349,9 +349,9 @@ void SvxHtmlOptions::SetSaveGraphicsLocal(sal_Bool bSet)
     SetModified();
 }
 
-sal_Bool    SvxHtmlOptions::IsPrintLayoutExtension() const
+bool SvxHtmlOptions::IsPrintLayoutExtension() const
 {
-    sal_Bool bRet = 0 != (pImp->nFlags & HTMLCFG_PRINT_LAYOUT_EXTENSION);
+    bool bRet = 0 != (pImp->nFlags & HTMLCFG_PRINT_LAYOUT_EXTENSION);
     switch( pImp->nExportMode )
     {
         case HTML_CFG_MSIE:
@@ -359,12 +359,12 @@ sal_Bool    SvxHtmlOptions::IsPrintLayoutExtension() const
         case HTML_CFG_WRITER :
         break;
         default:
-            bRet = sal_False;
+            bRet = false;
     }
     return bRet;
 }
 
-void    SvxHtmlOptions::SetPrintLayoutExtension(sal_Bool bSet)
+void    SvxHtmlOptions::SetPrintLayoutExtension(bool bSet)
 {
     if(bSet)
         pImp->nFlags |=  HTMLCFG_PRINT_LAYOUT_EXTENSION;
@@ -373,12 +373,12 @@ void    SvxHtmlOptions::SetPrintLayoutExtension(sal_Bool bSet)
     SetModified();
 }
 
-sal_Bool SvxHtmlOptions::IsIgnoreFontFamily() const
+bool SvxHtmlOptions::IsIgnoreFontFamily() const
 {
     return 0 != (pImp->nFlags & HTMLCFG_IGNORE_FONT_FAMILY) ;
 }
 
-void SvxHtmlOptions::SetIgnoreFontFamily(sal_Bool bSet)
+void SvxHtmlOptions::SetIgnoreFontFamily(bool bSet)
 {
     if(bSet)
         pImp->nFlags |=  HTMLCFG_IGNORE_FONT_FAMILY;
@@ -387,12 +387,12 @@ void SvxHtmlOptions::SetIgnoreFontFamily(sal_Bool bSet)
     SetModified();
 }
 
-sal_Bool SvxHtmlOptions::IsStarBasicWarning() const
+bool SvxHtmlOptions::IsStarBasicWarning() const
 {
     return 0 != (pImp->nFlags & HTMLCFG_IS_BASIC_WARNING) ;
 }
 
-void SvxHtmlOptions::SetStarBasicWarning(sal_Bool bSet)
+void SvxHtmlOptions::SetStarBasicWarning(bool bSet)
 {
     if(bSet)
         pImp->nFlags |=  HTMLCFG_IS_BASIC_WARNING;
@@ -414,11 +414,11 @@ rtl_TextEncoding SvxHtmlOptions::GetTextEncoding() const
 void SvxHtmlOptions::SetTextEncoding( rtl_TextEncoding eEnc )
 {
     pImp->eEncoding = eEnc;
-    pImp->bIsEncodingDefault = sal_False;
+    pImp->bIsEncodingDefault = false;
     SetModified();
 }
 
-sal_Bool SvxHtmlOptions::IsDefaultTextEncoding() const
+bool SvxHtmlOptions::IsDefaultTextEncoding() const
 {
     return pImp->bIsEncodingDefault;
 }
@@ -433,12 +433,12 @@ SvxHtmlOptions& SvxHtmlOptions::Get()
     return theSvxHtmlOptions::get();
 }
 
-sal_Bool SvxHtmlOptions::IsNumbersEnglishUS() const
+bool SvxHtmlOptions::IsNumbersEnglishUS() const
 {
     return 0 != (pImp->nFlags & HTMLCFG_NUMBERS_ENGLISH_US) ;
 }
 
-void SvxHtmlOptions::SetNumbersEnglishUS(sal_Bool bSet)
+void SvxHtmlOptions::SetNumbersEnglishUS(bool bSet)
 {
     if(bSet)
         pImp->nFlags |=  HTMLCFG_NUMBERS_ENGLISH_US;
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx
index b317ed496ed1..c569a16b8813 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -72,21 +72,21 @@ void HeaderBar::ImplInit( WinBits nWinStyle )
     mnMouseOff      = 0;
     mnCurItemId     = 0;
     mnItemDragPos   = HEADERBAR_ITEM_NOTFOUND;
-    mbDrag          = sal_False;
-    mbItemDrag      = sal_False;
-    mbOutDrag       = sal_False;
-    mbItemMode      = sal_False;
+    mbDrag          = false;
+    mbItemDrag      = false;
+    mbOutDrag       = false;
+    mbItemMode      = false;
 
     m_pVCLXHeaderBar = NULL;
     // StyleBits auswerten
     if ( nWinStyle & WB_DRAG )
-        mbDragable = sal_True;
+        mbDragable = true;
     else
-        mbDragable = sal_False;
+        mbDragable = false;
     if ( nWinStyle & WB_BUTTONSTYLE )
-        mbButtonStyle = sal_True;
+        mbButtonStyle = true;
     else
-        mbButtonStyle = sal_False;
+        mbButtonStyle = false;
     if ( nWinStyle & WB_BORDER )
     {
         mnBorderOff1 = 1;
@@ -98,7 +98,7 @@ void HeaderBar::ImplInit( WinBits nWinStyle )
             mnBorderOff2 = 1;
     }
 
-    ImplInitSettings( sal_True, sal_True, sal_True );
+    ImplInitSettings( true, true, true );
 }
 
 
@@ -124,8 +124,8 @@ HeaderBar::~HeaderBar()
 
 
 
-void HeaderBar::ImplInitSettings( sal_Bool bFont,
-                                  sal_Bool bForeground, sal_Bool bBackground )
+void HeaderBar::ImplInitSettings( bool bFont,
+                                  bool bForeground, bool bBackground )
 {
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
 
@@ -189,7 +189,7 @@ sal_uInt16 HeaderBar::ImplHitTest( const Point& rPos,
 {
     ImplHeadItem*   pItem;
     size_t          nCount = (sal_uInt16)mpItemList->size();
-    sal_Bool            bLastFixed = sal_True;
+    bool            bLastFixed = true;
     long            nX = -mnOffset;
 
     for ( size_t i = 0; i < nCount; i++ )
@@ -226,9 +226,9 @@ sal_uInt16 HeaderBar::ImplHitTest( const Point& rPos,
         }
 
         if ( pItem->mnBits & HIB_FIXED )
-            bLastFixed = sal_True;
+            bLastFixed = true;
         else
-            bLastFixed = sal_False;
+            bLastFixed = false;
 
         nX += pItem->mnSize;
     }
@@ -298,7 +298,7 @@ void HeaderBar::ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos )
 
 
 void HeaderBar::ImplDrawItem( OutputDevice* pDev,
-                              sal_uInt16 nPos, sal_Bool bHigh, sal_Bool bDrag,
+                              sal_uInt16 nPos, bool bHigh, bool bDrag,
                               const Rectangle& rItemRect,
                               const Rectangle* pRect,
                               sal_uLong )
@@ -415,14 +415,14 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev,
     }
 
     // cut text to correct length
-    sal_Bool bLeftText = sal_False;
+    bool bLeftText = false;
     long nMaxTxtWidth = aRect.GetWidth()-(HEADERBAR_TEXTOFF*2)-nArrowWidth;
     if ( nBits & (HIB_LEFTIMAGE | HIB_RIGHTIMAGE) )
         nMaxTxtWidth -= aImageSize.Width();
     long nTxtWidth = aTxtSize.Width();
     if ( nTxtWidth > nMaxTxtWidth )
     {
-        bLeftText = sal_True;
+        bLeftText = true;
         OUStringBuffer aBuf(pItem->maOutText);
         aBuf.append("...");
         do
@@ -580,11 +580,11 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev,
         }
 
         // is there enough space to draw the item?
-        sal_Bool bDraw = sal_True;
+        bool bDraw = true;
         if ( nArrowX < aRect.Left()+HEADERBAR_TEXTOFF )
-            bDraw = sal_False;
+            bDraw = false;
         else if ( nArrowX+HEAD_ARROWSIZE2 > aRect.Right() )
-            bDraw = sal_False;
+            bDraw = false;
 
         if ( bDraw )
         {
@@ -658,7 +658,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev,
 
 
 
-void HeaderBar::ImplDrawItem( sal_uInt16 nPos, sal_Bool bHigh, sal_Bool bDrag,
+void HeaderBar::ImplDrawItem( sal_uInt16 nPos, bool bHigh, bool bDrag,
                               const Rectangle* pRect )
 {
     Rectangle aRect = ImplGetItemRect( nPos );
@@ -667,7 +667,7 @@ void HeaderBar::ImplDrawItem( sal_uInt16 nPos, sal_Bool bHigh, sal_Bool bDrag,
 
 
 
-void HeaderBar::ImplUpdate( sal_uInt16 nPos, sal_Bool bEnd, sal_Bool bDirect )
+void HeaderBar::ImplUpdate( sal_uInt16 nPos, bool bEnd, bool bDirect )
 {
     if ( IsVisible() && IsUpdateMode() )
     {
@@ -711,31 +711,31 @@ void HeaderBar::ImplUpdate( sal_uInt16 nPos, sal_Bool bEnd, sal_Bool bDirect )
 
 
 
-void HeaderBar::ImplStartDrag( const Point& rMousePos, sal_Bool bCommand )
+void HeaderBar::ImplStartDrag( const Point& rMousePos, bool bCommand )
 {
     sal_uInt16  nPos;
     sal_uInt16  nHitTest = ImplHitTest( rMousePos, mnMouseOff, nPos );
     if ( nHitTest )
     {
-        mbDrag = sal_False;
+        mbDrag = false;
         ImplHeadItem* pItem = (*mpItemList)[ nPos ];
         if ( nHitTest & HEAD_HITTEST_DIVIDER )
-            mbDrag = sal_True;
+            mbDrag = true;
         else
         {
             if ( ((pItem->mnBits & HIB_CLICKABLE) && !(pItem->mnBits & HIB_FLAT)) ||
                  (mbDragable && !(pItem->mnBits & HIB_FIXEDPOS)) )
             {
-                mbItemMode = sal_True;
-                mbDrag = sal_True;
+                mbItemMode = true;
+                mbDrag = true;
                 if ( bCommand )
                 {
                     if ( mbDragable )
-                        mbItemDrag = sal_True;
+                        mbItemDrag = true;
                     else
                     {
-                        mbItemMode = sal_False;
-                        mbDrag = sal_False;
+                        mbItemMode = false;
+                        mbDrag = false;
                     }
                 }
             }
@@ -752,7 +752,7 @@ void HeaderBar::ImplStartDrag( const Point& rMousePos, sal_Bool bCommand )
 
         if ( mbDrag )
         {
-            mbOutDrag = sal_False;
+            mbOutDrag = false;
             mnCurItemId = pItem->mnId;
             mnItemDragPos = nPos;
             StartTracking();
@@ -760,7 +760,7 @@ void HeaderBar::ImplStartDrag( const Point& rMousePos, sal_Bool bCommand )
             mnDragPos = mnStartPos;
             StartDrag();
             if ( mbItemMode )
-                ImplDrawItem( nPos, sal_True, mbItemDrag );
+                ImplDrawItem( nPos, true, mbItemDrag );
             else
             {
                 Rectangle aSizeRect( mnDragPos, 0, mnDragPos, mnDragSize+mnDY );
@@ -776,7 +776,7 @@ void HeaderBar::ImplStartDrag( const Point& rMousePos, sal_Bool bCommand )
 
 void HeaderBar::ImplDrag( const Point& rMousePos )
 {
-    sal_Bool    bNewOutDrag;
+    bool        bNewOutDrag;
     sal_uInt16  nPos = GetItemPos( mnCurItemId );
 
     mnDragPos = rMousePos.X()-mnMouseOff;
@@ -784,9 +784,9 @@ void HeaderBar::ImplDrag( const Point& rMousePos )
     {
         Rectangle aItemRect = ImplGetItemRect( nPos );
         if ( aItemRect.IsInside( rMousePos ) )
-            bNewOutDrag = sal_False;
+            bNewOutDrag = false;
         else
-            bNewOutDrag = sal_True;
+            bNewOutDrag = true;
 
         //  if needed switch on ItemDrag
         if ( bNewOutDrag && mbDragable && !mbItemDrag &&
@@ -794,8 +794,8 @@ void HeaderBar::ImplDrag( const Point& rMousePos )
         {
             if ( (rMousePos.Y() >= aItemRect.Top()) && (rMousePos.Y() <= aItemRect.Bottom()) )
             {
-                mbItemDrag = sal_True;
-                ImplDrawItem( nPos, sal_True, mbItemDrag );
+                mbItemDrag = true;
+                ImplDrawItem( nPos, true, mbItemDrag );
             }
         }
 
@@ -803,9 +803,9 @@ void HeaderBar::ImplDrag( const Point& rMousePos )
         if ( mbItemDrag )
         {
             if ( (rMousePos.Y() < -HEADERBAR_DRAGOUTOFF) || (rMousePos.Y() > mnDY+HEADERBAR_DRAGOUTOFF) )
-                bNewOutDrag = sal_True;
+                bNewOutDrag = true;
             else
-                bNewOutDrag = sal_False;
+                bNewOutDrag = false;
 
             if ( bNewOutDrag )
                 mnItemDragPos = HEADERBAR_ITEM_NOTFOUND;
@@ -855,7 +855,7 @@ void HeaderBar::ImplDrag( const Point& rMousePos )
                  (mnItemDragPos != nPos) &&
                  (mnItemDragPos != HEADERBAR_ITEM_NOTFOUND) )
             {
-                ImplDrawItem( mnItemDragPos, sal_False, sal_True );
+                ImplDrawItem( mnItemDragPos, false, true );
                 ImplInvertDrag( nPos, mnItemDragPos );
             }
         }
@@ -881,7 +881,7 @@ void HeaderBar::ImplDrag( const Point& rMousePos )
 
 
 
-void HeaderBar::ImplEndDrag( sal_Bool bCancel )
+void HeaderBar::ImplEndDrag( bool bCancel )
 {
     HideTracking();
 
@@ -926,18 +926,18 @@ void HeaderBar::ImplEndDrag( sal_Bool bCancel )
             {
                 ImplHeadItem* pItem = (*mpItemList)[ nPos ];
                 pItem->mnSize += nDelta;
-                ImplUpdate( nPos, sal_True );
+                ImplUpdate( nPos, true );
             }
         }
     }
 
-    mbDrag          = sal_False;
+    mbDrag          = false;
     EndDrag();
     mnCurItemId     = 0;
     mnItemDragPos   = HEADERBAR_ITEM_NOTFOUND;
-    mbOutDrag       = sal_False;
-    mbItemMode      = sal_False;
-    mbItemDrag      = sal_False;
+    mbOutDrag       = false;
+    mbItemMode      = false;
+    mbItemDrag      = false;
 }
 
 
@@ -955,17 +955,17 @@ void HeaderBar::MouseButtonDown( const MouseEvent& rMEvt )
             {
                 ImplHeadItem* pItem = (*mpItemList)[ nPos ];
                 if ( nHitTest & HEAD_HITTEST_DIVIDER )
-                    mbItemMode = sal_False;
+                    mbItemMode = false;
                 else
-                    mbItemMode = sal_True;
+                    mbItemMode = true;
                 mnCurItemId = pItem->mnId;
                 DoubleClick();
-                mbItemMode = sal_False;
+                mbItemMode = false;
                 mnCurItemId = 0;
             }
         }
         else
-            ImplStartDrag( rMEvt.GetPosPixel(), sal_False );
+            ImplStartDrag( rMEvt.GetPosPixel(), false );
     }
 }
 
@@ -1022,7 +1022,7 @@ void HeaderBar::Paint( const Rectangle& rRect )
         nCurItemPos = HEADERBAR_ITEM_NOTFOUND;
     sal_uInt16 nItemCount = (sal_uInt16)mpItemList->size();
     for ( sal_uInt16 i = 0; i < nItemCount; i++ )
-        ImplDrawItem( i, (i == nCurItemPos) ? sal_True : sal_False, sal_False, &rRect );
+        ImplDrawItem( i, (i == nCurItemPos), false, &rRect );
 }
 
 
@@ -1074,7 +1074,7 @@ void HeaderBar::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
             aItemRect.Right() = 16000;
         Region aRegion( aRect );
         pDev->SetClipRegion( aRegion );
-        ImplDrawItem( pDev, i, sal_False, sal_False, aItemRect, &aRect, nFlags );
+        ImplDrawItem( pDev, i, false, false, aItemRect, &aRect, nFlags );
         pDev->SetClipRegion();
     }
 
@@ -1098,7 +1098,7 @@ void HeaderBar::Command( const CommandEvent& rCEvt )
 {
     if ( rCEvt.IsMouseEvent() && (rCEvt.GetCommand() == COMMAND_STARTDRAG) && !mbDrag )
     {
-        ImplStartDrag( rCEvt.GetMousePosPixel(), sal_True );
+        ImplStartDrag( rCEvt.GetMousePosPixel(), true );
         return;
     }
 
@@ -1171,17 +1171,17 @@ void HeaderBar::StateChanged( StateChangedType nType )
     else if ( (nType == STATE_CHANGE_ZOOM) ||
               (nType == STATE_CHANGE_CONTROLFONT) )
     {
-        ImplInitSettings( sal_True, sal_False, sal_False );
+        ImplInitSettings( true, false, false );
         Invalidate();
     }
     else if ( nType == STATE_CHANGE_CONTROLFOREGROUND )
     {
-        ImplInitSettings( sal_False, sal_True, sal_False );
+        ImplInitSettings( false, true, false );
         Invalidate();
     }
     else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
     {
-        ImplInitSettings( sal_False, sal_False, sal_True );
+        ImplInitSettings( false, false, true );
         Invalidate();
     }
 }
@@ -1197,7 +1197,7 @@ void HeaderBar::DataChanged( const DataChangedEvent& rDCEvt )
          ((rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
           (rDCEvt.GetFlags() & SETTINGS_STYLE)) )
     {
-        ImplInitSettings( sal_True, sal_True, sal_True );
+        ImplInitSettings( true, true, true );
         Invalidate();
     }
 }
@@ -1267,7 +1267,7 @@ void HeaderBar::InsertItem( sal_uInt16 nItemId, const OUString& rText,
     }
 
     // update display
-    ImplUpdate( nPos, sal_True );
+    ImplUpdate( nPos, true );
 }
 
 
@@ -1318,7 +1318,7 @@ void HeaderBar::Clear()
     }
     mpItemList->clear();
 
-    ImplUpdate( 0, sal_True );
+    ImplUpdate( 0, true );
 }
 
 
@@ -1396,7 +1396,7 @@ void HeaderBar::SetItemSize( sal_uInt16 nItemId, long nNewSize )
         if ( pItem->mnSize != nNewSize )
         {
             pItem->mnSize = nNewSize;
-            ImplUpdate( nPos, sal_True );
+            ImplUpdate( nPos, true );
         }
     }
 }
diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx
index 8230c53e4ae1..6a8abff90512 100644
--- a/svtools/source/control/hyperlabel.cxx
+++ b/svtools/source/control/hyperlabel.cxx
@@ -56,9 +56,9 @@ namespace svt
     public:
         sal_Int16           ID;
         sal_Int32           Index;
-        sal_Bool            bInteractive;
+        bool                bInteractive;
         Size                m_aMinSize;
-        sal_Bool            m_bHyperMode;
+        bool                m_bHyperMode;
 
         HyperLabelImpl();
     };
@@ -138,7 +138,7 @@ namespace svt
     void HyperLabel::ActivateHyperMode(Font aFont, const Color aColor)
     {
         aFont.SetUnderline(UNDERLINE_SINGLE);
-        m_pImpl->m_bHyperMode = sal_True;
+        m_pImpl->m_bHyperMode = true;
         SetPointer( POINTER_REFHAND );
         SetControlFont( aFont);
         SetTextColor( aColor);
@@ -147,7 +147,7 @@ namespace svt
 
     void HyperLabel::DeactivateHyperMode(Font aFont, const Color aColor)
     {
-        m_pImpl->m_bHyperMode = sal_False;
+        m_pImpl->m_bHyperMode = false;
         aFont.SetUnderline(UNDERLINE_NONE);
         SetPointer( POINTER_ARROW );
         SetControlFont( aFont);
@@ -182,7 +182,7 @@ namespace svt
         delete m_pImpl;
     }
 
-    void HyperLabel::SetInteractive( sal_Bool _bInteractive )
+    void HyperLabel::SetInteractive( bool _bInteractive )
     {
         m_pImpl->bInteractive = ( _bInteractive && IsEnabled() );
     }
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index 4abe983ec3cc..c5e2a508b4e1 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -510,7 +510,7 @@ OString HTMLOutFuncs::ConvertStringToHTML( const OUString& rSrc,
 }
 
 SvStream& HTMLOutFuncs::Out_AsciiTag( SvStream& rStream, const sal_Char *pStr,
-                                      sal_Bool bOn, rtl_TextEncoding )
+                                      bool bOn, rtl_TextEncoding )
 {
     sal_Char sStt[3] = "</";
     if( bOn )
@@ -597,7 +597,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
                                       const ImageMap& rIMap,
                                       const OUString& rName,
                                       const HTMLOutEvent *pEventTable,
-                                      sal_Bool bOutStarBasic,
+                                      bool bOutStarBasic,
                                       const sal_Char *pDelim,
                                       const sal_Char *pIndentArea,
                                       const sal_Char *pIndentMap,
@@ -770,7 +770,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
         rStream.WriteCharPtr( pDelim );
     if( pIndentMap )
         rStream.WriteCharPtr( pIndentMap );
-    Out_AsciiTag( rStream, OOO_STRING_SVTOOLS_HTML_map, sal_False );
+    Out_AsciiTag( rStream, OOO_STRING_SVTOOLS_HTML_map, false );
 
     return rStream;
 }
@@ -883,7 +883,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
         }
     }
 
-    HTMLOutFuncs::Out_AsciiTag( rStrm, OOO_STRING_SVTOOLS_HTML_script, sal_False );
+    HTMLOutFuncs::Out_AsciiTag( rStrm, OOO_STRING_SVTOOLS_HTML_script, false );
 
     return rStrm;
 }
@@ -892,7 +892,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
 SvStream& HTMLOutFuncs::Out_Events( SvStream& rStrm,
                                     const SvxMacroTableDtor& rMacroTable,
                                     const HTMLOutEvent *pEventTable,
-                                    sal_Bool bOutStarBasic,
+                                    bool bOutStarBasic,
                                     rtl_TextEncoding eDestEnc,
                                     OUString *pNonConvertableChars )
 {
@@ -925,7 +925,7 @@ SvStream& HTMLOutFuncs::Out_Events( SvStream& rStrm,
 }
 
 OString HTMLOutFuncs::CreateTableDataOptionsValNum(
-            sal_Bool bValue,
+            bool bValue,
             double fVal, sal_uLong nFormat, SvNumberFormatter& rFormatter,
             rtl_TextEncoding eDestEnc, OUString* pNonConvertableChars)
 {