sfx2: sal_Bool->bool

Change-Id: Ief810c49b821e2e60ee2c8b14187dd8d7d81c461

15 files changed, 107 insertions, 110 deletions

diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index dee735feb778..011e8e032ed9 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -417,7 +417,7 @@ void _SvxMacroTabPage::SetReadOnly( sal_Bool bSet )
     mpImpl->bReadOnly = bSet;
 }
 
-sal_Bool _SvxMacroTabPage::IsReadOnly() const
+bool _SvxMacroTabPage::IsReadOnly() const
 {
     return mpImpl->bReadOnly;
 }
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index abe82544e02d..c495db6099a3 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -73,7 +73,7 @@ public:
     virtual sal_Bool                FillItemSet( SfxItemSet& rSet );
     virtual void                Reset( const SfxItemSet& rSet );
 
-    sal_Bool                        IsReadOnly() const;
+    bool                        IsReadOnly() const;
 };
 
 inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTbl() const
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index e5ab8cd86652..00e20dbee8b3 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -90,7 +90,7 @@ public:
 
     void                        DisplayAppEvents( bool appEvents);
     void                        SetReadOnly( sal_Bool bSet );
-    sal_Bool                        IsReadOnly() const;
+    bool                        IsReadOnly() const;
 };
 
 class SvxMacroTabPage : public _SvxMacroTabPage
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 8466aa635067..10c3c42571d3 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -214,7 +214,7 @@ SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const SfxItemSet& rCoreAttrs
 
     SetFieldUnit(*m_pEdShadowSize, eFUnit);
 
-    sal_uInt16 nWhich = GetWhich( SID_ATTR_BORDER_INNER, sal_False );
+    sal_uInt16 nWhich = GetWhich( SID_ATTR_BORDER_INNER, false );
     sal_Bool bIsDontCare = sal_True;
 
     if ( rCoreAttrs.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE )
@@ -390,7 +390,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
 
     pBoxItem  = (const SvxBoxItem*)GetItem( rSet, SID_ATTR_BORDER_OUTER );
 
-    pBoxInfoItem = (const SvxBoxInfoItem*)GetItem( rSet, SID_ATTR_BORDER_INNER, sal_False );
+    pBoxInfoItem = (const SvxBoxInfoItem*)GetItem( rSet, SID_ATTR_BORDER_INNER, false );
 
     eCoreUnit = rSet.GetPool()->GetMetric( nWhichBox );
 
@@ -727,7 +727,7 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
             rCoreAttrs.Put( aBoxItem );
             bAttrsChanged |= true;
         }
-        const SfxPoolItem* pOld = GetOldItem( rCoreAttrs, SID_ATTR_BORDER_INNER, sal_False );
+        const SfxPoolItem* pOld = GetOldItem( rCoreAttrs, SID_ATTR_BORDER_INNER, false );
 
         if ( !pOld || !( *(const SvxBoxInfoItem*)pOld == aBoxInfoItem ) )
         {
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index c2755669e835..63bc895156ab 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -250,7 +250,7 @@ void _SfxMacroTabPage::Reset( const SfxItemSet& rSet )
         rListBox.SetCurEntry( pE );
 }
 
-sal_Bool _SfxMacroTabPage::IsReadOnly() const
+bool _SfxMacroTabPage::IsReadOnly() const
 {
     return mpImpl->bReadOnly;
 }
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 36b4b659b23f..57e817419fa0 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -66,7 +66,7 @@ namespace dbaui
         ,m_pFT_HeaderText(NULL)
     {
 
-        SetExchangeSupport(sal_True);
+        SetExchangeSupport(true);
     }
 
     OGenericAdministrationPage::OGenericAdministrationPage(Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet)
@@ -77,7 +77,7 @@ namespace dbaui
         ,m_pFT_HeaderText(NULL)
     {
 
-        SetExchangeSupport(sal_True);
+        SetExchangeSupport(true);
     }
 
     OGenericAdministrationPage::~OGenericAdministrationPage()
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index cd42dca4aa2f..bfd15f183b28 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -155,7 +155,7 @@ void ODbAdminDialog::impl_selectDataSource(const ::com::sun::star::uno::Any& _aD
         case  ::dbaccess::DST_USERDEFINE10:
             {
                 OUString aTitle(ModuleRes(STR_PAGETITLE_ADVANCED));
-                AddTabPage(PAGE_USERDRIVER, aTitle, ODriversSettings::CreateUser, 0, sal_False, 1);
+                AddTabPage(PAGE_USERDRIVER, aTitle, ODriversSettings::CreateUser, 0, false, 1);
                 m_aCurrentDetailPages.push(PAGE_USERDRIVER);
             }
             break;
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 24653e279933..15853c9573e2 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -90,11 +90,11 @@ friend class SfxTabDialogController;
     const SfxItemSet*   pSet;
     SfxItemSet*         pOutSet;
     TabDlg_Impl*        pImpl;
-    sal_uInt16*             pRanges;
+    sal_uInt16*         pRanges;
     sal_uInt32          nResId;
-    sal_uInt16              nAppPageId;
-    sal_Bool                bItemsReset;
-    sal_Bool                bFmt;
+    sal_uInt16          nAppPageId;
+    bool                bItemsReset;
+    sal_Bool            bFmt;
 
     DECL_DLLPRIVATE_LINK( ActivatePageHdl, TabControl * );
     DECL_DLLPRIVATE_LINK( DeactivatePageHdl, TabControl * );
@@ -140,7 +140,7 @@ public:
     sal_uInt16          AddTabPage( const OString& rName,           // Name of the label for the page in the notebook .ui
                                     CreateTabPage pCreateFunc,      // != 0
                                     GetTabPageRanges pRangesFunc,   // can be 0
-                                    sal_Bool bItemsOnDemand = sal_False);
+                                    bool bItemsOnDemand = false);
 
     sal_uInt16          AddTabPage ( const OString &rName,          // Name of the label for the page in the notebook .ui
                                      sal_uInt16 nPageCreateId );    // Identifier of the Factory Method to create the page
@@ -149,22 +149,22 @@ public:
                                     const OUString &rRiderText,
                                     CreateTabPage pCreateFunc,      // != 0
                                     GetTabPageRanges pRangesFunc,   // can be 0
-                                    sal_Bool bItemsOnDemand = sal_False,
+                                    bool bItemsOnDemand = false,
                                     sal_uInt16 nPos = TAB_APPEND);
     void                AddTabPage( sal_uInt16 nId,
                                     const Bitmap &rRiderBitmap,
                                     CreateTabPage pCreateFunc,      // != 0
                                     GetTabPageRanges pRangesFunc,   // can be 0
-                                    sal_Bool bItemsOnDemand = sal_False,
+                                    bool bItemsOnDemand = false,
                                     sal_uInt16 nPos = TAB_APPEND);
 
     void                AddTabPage( sal_uInt16 nId,
                                     const OUString &rRiderText,
-                                    sal_Bool bItemsOnDemand = sal_False,
+                                    bool bItemsOnDemand = false,
                                     sal_uInt16 nPos = TAB_APPEND);
     void                AddTabPage( sal_uInt16 nId,
                                     const Bitmap &rRiderBitmap,
-                                    sal_Bool bItemsOnDemand = sal_False,
+                                    bool bItemsOnDemand = false,
                                     sal_uInt16 nPos = TAB_APPEND);
 
     void                RemoveTabPage( const OString& rName ); // Name of the label for the page in the notebook .ui
@@ -199,7 +199,7 @@ public:
     const sal_uInt16*       GetInputRanges( const SfxItemPool& );
     void                SetInputSet( const SfxItemSet* pInSet );
     const SfxItemSet*   GetOutputItemSet() const { return pOutSet; }
-    sal_Bool IsFormat() const { return bFmt; }
+    bool                IsFormat() const { return bFmt; }
 
     const PushButton&   GetOKButton() const { return *m_pOKBtn; }
     PushButton&         GetOKButton() { return *m_pOKBtn; }
@@ -214,7 +214,7 @@ public:
 
     short               Execute();
     void                StartExecuteModal( const Link& rEndDialogHdl );
-    void                Start( sal_Bool bShow = sal_True );
+    void                Start( bool bShow = true );
 
     const SfxItemSet*   GetExampleSet() const { return pExampleSet; }
     SfxViewFrame*       GetViewFrame() const { return pFrame; }
@@ -236,7 +236,7 @@ friend class SfxTabDialog;
 private:
     const SfxItemSet*   pSet;
     OUString            aUserString;
-    sal_Bool            bHasExchangeSupport;
+    bool                bHasExchangeSupport;
     TabPageImpl*        pImpl;
 
     SAL_DLLPRIVATE void SetInputSet( const SfxItemSet* pNew ) { pSet = pNew; }
@@ -247,9 +247,9 @@ protected:
 
     sal_uInt16              GetSlot( sal_uInt16 nWhich ) const
                             { return pSet->GetPool()->GetSlotId( nWhich ); }
-    sal_uInt16              GetWhich( sal_uInt16 nSlot, sal_Bool bDeep = sal_True ) const
+    sal_uInt16              GetWhich( sal_uInt16 nSlot, bool bDeep = true ) const
                             { return pSet->GetPool()->GetWhich( nSlot, bDeep ); }
-    const SfxPoolItem*  GetOldItem( const SfxItemSet& rSet, sal_uInt16 nSlot, sal_Bool bDeep = sal_True );
+    const SfxPoolItem*  GetOldItem( const SfxItemSet& rSet, sal_uInt16 nSlot, bool bDeep = true );
     SfxTabDialog*       GetTabDialog() const;
 
     void                AddItemConnection( sfx::ItemConnectionBase* pConnection );
@@ -262,9 +262,9 @@ public:
     virtual sal_Bool        FillItemSet( SfxItemSet& );
     virtual void        Reset( const SfxItemSet& );
 
-    sal_Bool                HasExchangeSupport() const
+    bool                HasExchangeSupport() const
                             { return bHasExchangeSupport; }
-    void                SetExchangeSupport( sal_Bool bNew = sal_True )
+    void                SetExchangeSupport( bool bNew = true )
                             { bHasExchangeSupport = bNew; }
 
     enum sfxpg {
@@ -284,9 +284,9 @@ public:
                               { aUserString = rString; }
     OUString                GetUserData() { return aUserString; }
     virtual void            FillUserData();
-    virtual sal_Bool        IsReadOnly() const;
+    virtual bool            IsReadOnly() const;
     virtual void PageCreated (SfxAllItemSet aSet);
-    static const SfxPoolItem* GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot, sal_Bool bDeep = sal_True );
+    static const SfxPoolItem* GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot, bool bDeep = true );
 
     void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetFrame();
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index a98f43cb3347..49e5ca3ec9cc 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -102,10 +102,10 @@ class SfxFrameStatusListener : public svt::FrameStatusListener
 
 class SFX2_DLLPUBLIC SfxPopupWindow: public FloatingWindow, public SfxStatusListenerInterface
 {
-    sal_Bool                                                                             m_bFloating;
-    sal_Bool                                                                             m_bCascading;
+    bool                                                                             m_bFloating;
+    bool                                                                             m_bCascading;
     Link                                                                             m_aDeleteLink;
-    sal_uInt16                                                                           m_nId;
+    sal_uInt16                                                                       m_nId;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >              m_xFrame;
     SfxFrameStatusListener*                                                          m_pStatusListener;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >           m_xStatusListener;
@@ -195,7 +195,7 @@ protected:
 
     // old SfxToolBoxControl methods
     virtual void               StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
-    virtual void               Select( sal_Bool bMod1 = sal_False );
+    virtual void               Select( bool bMod1 = false );
     virtual void               Select( sal_uInt16 nModifier );
 
     virtual void               DoubleClick();
@@ -260,7 +260,7 @@ protected:
 public:
                                SFX_DECL_TOOLBOX_CONTROL();
 
-                               SfxToolBoxControl( sal_uInt16 nSlotID, sal_uInt16 nId, ToolBox& rBox, sal_Bool bShowStrings = sal_False );
+                               SfxToolBoxControl( sal_uInt16 nSlotID, sal_uInt16 nId, ToolBox& rBox, bool bShowStrings = false );
     virtual                    ~SfxToolBoxControl();
 
     ToolBox&                   GetToolBox() const;
@@ -312,7 +312,7 @@ public:
                             SfxDragToolBoxControl_Impl( sal_uInt16 nId, ToolBox& rBox );
     virtual Window*         CreateItemWindow( Window *pParent );
     using SfxToolBoxControl::Select;
-    virtual void            Select( sal_Bool bMod1 = sal_False );
+    virtual void            Select( bool bMod1 = false );
 };
 
 
@@ -359,14 +359,14 @@ class SfxAddonsToolBoxControl_Impl : public SfxToolBoxControl
 */
 
 {
-    sal_Bool        bBigImages;
+    bool        bBigImages;
     PopupMenu*  pMenu;
-    sal_Bool        m_bShowMenuImages;
+    bool        m_bShowMenuImages;
 
 protected:
     virtual void            Click();
     using SfxToolBoxControl::Select;
-    virtual void            Select( sal_Bool );
+    virtual void            Select( bool );
     virtual void            StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
                             DECL_LINK( Activate, Menu * );
 public:
diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx
index 855f40860d93..001a54460b5f 100644
--- a/include/sfx2/unoctitm.hxx
+++ b/include/sfx2/unoctitm.hxx
@@ -132,12 +132,12 @@ public:
     virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) ;
     static const ::com::sun::star::uno::Sequence< sal_Int8 >& impl_getStaticIdentifier();
 
-    static sal_Bool         IsMasterUnoCommand( const ::com::sun::star::util::URL& aURL );
+    static bool        IsMasterUnoCommand( const ::com::sun::star::util::URL& aURL );
     static OUString    GetMasterUnoCommand( const ::com::sun::star::util::URL& aURL );
 
     void                    SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
 
-    void                    SetMasterUnoCommand( sal_Bool bSet );
+    void                    SetMasterUnoCommand( bool bSet );
 
     SfxDispatcher*          GetDispatcher_Impl();
 };
@@ -150,8 +150,8 @@ class SfxDispatchController_Impl : public SfxControllerItem
     const SfxPoolItem*          pLastState;
     sal_uInt16                  nSlot;
     SfxOfficeDispatch*          pDispatch;
-    sal_Bool                    bMasterSlave;
-    sal_Bool                    bVisible;
+    bool                        bMasterSlave;
+    bool                        bVisible;
     const char*                 pUnoName;
     ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > xFrame;
 
@@ -171,7 +171,7 @@ public:
 
     void                StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, SfxSlotServer* pServ );
     virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
-    void                setMasterSlaveCommand( sal_Bool bSet );
+    void                setMasterSlaveCommand( bool bSet );
     void SAL_CALL       dispatch( const ::com::sun::star::util::URL& aURL,
                                   const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs,
                                   const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener ) throw( ::com::sun::star::uno::RuntimeException );
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 5961757dcde9..15f09b423bc7 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -398,19 +398,16 @@ void SfxOfficeDispatch::SetFrame(const ::com::sun::star::uno::Reference< ::com::
         pControllerItem->SetFrame( xFrame );
 }
 
-void SfxOfficeDispatch::SetMasterUnoCommand( sal_Bool bSet )
+void SfxOfficeDispatch::SetMasterUnoCommand( bool bSet )
 {
     if ( pControllerItem )
         pControllerItem->setMasterSlaveCommand( bSet );
 }
 
 // Determine if URL contains a master/slave command which must be handled a little bit different
-sal_Bool SfxOfficeDispatch::IsMasterUnoCommand( const ::com::sun::star::util::URL& aURL )
+bool SfxOfficeDispatch::IsMasterUnoCommand( const ::com::sun::star::util::URL& aURL )
 {
-    if ( aURL.Protocol == ".uno:" && ( aURL.Path.indexOf( '.' ) > 0 ))
-        return sal_True;
-
-    return sal_False;
+    return aURL.Protocol == ".uno:" && ( aURL.Path.indexOf( '.' ) > 0 );
 }
 
 OUString SfxOfficeDispatch::GetMasterUnoCommand( const ::com::sun::star::util::URL& aURL )
@@ -438,8 +435,8 @@ SfxDispatchController_Impl::SfxDispatchController_Impl(
     , pLastState( 0 )
     , nSlot( pSlot->GetSlotId() )
     , pDispatch( pDisp )
-    , bMasterSlave( sal_False )
-    , bVisible( sal_True )
+    , bMasterSlave( false )
+    , bVisible( true )
     , pUnoName( pSlot->pUnoName )
 {
     if ( aDispatchURL.Protocol == "slot:" && pUnoName )
@@ -484,7 +481,7 @@ void SfxDispatchController_Impl::SetFrame(const ::com::sun::star::uno::Reference
     xFrame = _xFrame;
 }
 
-void SfxDispatchController_Impl::setMasterSlaveCommand( sal_Bool bSet )
+void SfxDispatchController_Impl::setMasterSlaveCommand( bool bSet )
 {
     bMasterSlave = bSet;
 }
@@ -862,7 +859,7 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
             if ( pLastState && !IsInvalidItem( pLastState ) )
                 delete pLastState;
             pLastState = !IsInvalidItem(pState) ? pState->Clone() : pState;
-            bVisible = sal_True;
+            bVisible = true;
         }
         else
             bVisible = ((SfxVisibilityItem *)pState)->GetValue();
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 65a146743555..b06a65b5fec7 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -49,11 +49,11 @@ TYPEINIT1(SfxTabDialogItem,SfxSetItem);
 
 struct TabPageImpl
 {
-    sal_Bool                        mbStandard;
+    bool                        mbStandard;
     sfx::ItemConnectionArray    maItemConn;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
 
-    TabPageImpl() : mbStandard( sal_False ) {}
+    TabPageImpl() : mbStandard( false ) {}
 };
 
 struct Data_Impl
@@ -62,19 +62,19 @@ struct Data_Impl
     CreateTabPage fnCreatePage;   // Pointer to Factory
     GetTabPageRanges fnGetRanges; // Pointer to Ranges-Function
     SfxTabPage* pTabPage;         // The TabPage itself
-    sal_Bool bOnDemand;              // Flag: ItemSet onDemand
-    sal_Bool bRefresh;                // Flag: Page must be re-initialized
+    bool bOnDemand;              // Flag: ItemSet onDemand
+    bool bRefresh;                // Flag: Page must be re-initialized
 
     // Constructor
     Data_Impl( sal_uInt16 Id, CreateTabPage fnPage,
-               GetTabPageRanges fnRanges, sal_Bool bDemand ) :
+               GetTabPageRanges fnRanges, bool bDemand ) :
 
         nId         ( Id ),
         fnCreatePage( fnPage ),
         fnGetRanges ( fnRanges ),
         pTabPage    ( 0 ),
         bOnDemand   ( bDemand ),
-        bRefresh    ( sal_False )
+        bRefresh    ( false )
     {
         if ( !fnCreatePage  )
         {
@@ -136,7 +136,7 @@ void SfxTabDialogController::StateChanged( sal_uInt16 /*nSID*/, SfxItemState /*e
     if ( pSetItem )
     {
         pSet = pDialog->pSet = pSetItem->GetItemSet().Clone();
-        sal_Bool bDialogStarted = sal_False;
+        bool bDialogStarted = false;
         for ( sal_uInt16 n=0; n<pDialog->m_pTabCtrl->GetPageCount(); n++ )
         {
             sal_uInt16 nPageId = pDialog->m_pTabCtrl->GetPageId( n );
@@ -144,7 +144,7 @@ void SfxTabDialogController::StateChanged( sal_uInt16 /*nSID*/, SfxItemState /*e
             if ( pTabPage )
             {
                 pTabPage->Reset( pSetItem->GetItemSet() );
-                bDialogStarted = sal_True;
+                bDialogStarted = true;
             }
         }
 
@@ -159,7 +159,7 @@ typedef std::vector<Data_Impl*> SfxTabDlgData_Impl;
 
 struct TabDlg_Impl
 {
-    sal_Bool            bModified       : 1,
+    bool                bModified       : 1,
                         bModal          : 1,
                         bHideResetBtn   : 1;
     SfxTabDlgData_Impl  aData;
@@ -168,9 +168,9 @@ struct TabDlg_Impl
 
     TabDlg_Impl( sal_uInt8 nCnt ) :
 
-        bModified       ( sal_False ),
-        bModal          ( sal_True ),
-        bHideResetBtn   ( sal_False ),
+        bModified       ( false ),
+        bModal          ( true ),
+        bHideResetBtn   ( false ),
         pController     ( NULL )
     {
         aData.reserve( nCnt );
@@ -224,7 +224,7 @@ SfxTabPage::SfxTabPage( Window *pParent,
     TabPage( pParent, rResId ),
 
     pSet                ( &rAttrSet ),
-    bHasExchangeSupport ( sal_False ),
+    bHasExchangeSupport ( false ),
     pImpl               ( new TabPageImpl )
 
 {
@@ -234,7 +234,7 @@ SfxTabPage::SfxTabPage( Window *pParent,
 SfxTabPage::SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet)
     : TabPage(pParent, rID, rUIXMLDescription)
     , pSet                ( &rAttrSet )
-    , bHasExchangeSupport ( sal_False )
+    , bHasExchangeSupport ( false )
     , pImpl               ( new TabPageImpl )
 {
 }
@@ -320,14 +320,14 @@ void SfxTabPage::FillUserData()
 
 
 
-sal_Bool SfxTabPage::IsReadOnly() const
+bool SfxTabPage::IsReadOnly() const
 {
-    return sal_False;
+    return false;
 }
 
 
 
-const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot, sal_Bool bDeep )
+const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot, bool bDeep )
 
 /*  [Description]
 
@@ -349,7 +349,7 @@ const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot
 
 
 const SfxPoolItem* SfxTabPage::GetOldItem( const SfxItemSet& rSet,
-                                           sal_uInt16 nSlot, sal_Bool bDeep )
+                                           sal_uInt16 nSlot, bool bDeep )
 
 /*  [Description]
 
@@ -407,7 +407,7 @@ SfxTabDialog::SfxTabDialog
     , pRanges(0)
     , nResId(0)
     , nAppPageId(USHRT_MAX)
-    , bItemsReset(sal_False)
+    , bItemsReset(false)
     , bFmt(bEditFmt)
     , pExampleSet(0)
 {
@@ -438,7 +438,7 @@ SfxTabDialog::SfxTabDialog
     , pRanges(0)
     , nResId(0)
     , nAppPageId(USHRT_MAX)
-    , bItemsReset(sal_False)
+    , bItemsReset(false)
     , bFmt(bEditFmt)
     , pExampleSet(0)
 {
@@ -631,7 +631,7 @@ void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const OUString* pUserButtonText
 void SfxTabDialog::RemoveResetButton()
 {
     m_pResetBtn->Hide();
-    pImpl->bHideResetBtn = sal_True;
+    pImpl->bHideResetBtn = true;
 }
 
 
@@ -656,9 +656,9 @@ void SfxTabDialog::StartExecuteModal( const Link& rEndDialogHdl )
 
 
 
-void SfxTabDialog::Start( sal_Bool bShow )
+void SfxTabDialog::Start( bool bShow )
 {
-    pImpl->bModal = sal_False;
+    pImpl->bModal = false;
     Start_Impl();
 
     if ( bShow )
@@ -712,7 +712,7 @@ void SfxTabDialog::Start_Impl()
     ActivatePageHdl( m_pTabCtrl );
 }
 
-void SfxTabDialog::AddTabPage( sal_uInt16 nId, const OUString &rRiderText, sal_Bool bItemsOnDemand, sal_uInt16 nPos )
+void SfxTabDialog::AddTabPage( sal_uInt16 nId, const OUString &rRiderText, bool bItemsOnDemand, sal_uInt16 nPos )
 {
     AddTabPage( nId, rRiderText, 0, 0, bItemsOnDemand, nPos );
 }
@@ -727,7 +727,7 @@ sal_uInt16 SfxTabDialog::AddTabPage
     CreateTabPage pCreateFunc,     // Pointer to the Factory Method
     GetTabPageRanges pRangesFunc,  // Pointer to the Method for quering
                                    // Ranges onDemand
-    sal_Bool bItemsOnDemand        // indicates whether the set of this page is
+    bool bItemsOnDemand            // indicates whether the set of this page is
                                    // requested when created
 )
 {
@@ -772,7 +772,7 @@ void SfxTabDialog::AddTabPage
     const OUString& rRiderText,
     CreateTabPage pCreateFunc,
     GetTabPageRanges pRangesFunc,
-    sal_Bool bItemsOnDemand,
+    bool bItemsOnDemand,
     sal_uInt16 nPos
 )
 {
@@ -1190,7 +1190,7 @@ IMPL_LINK_NOARG(SfxTabDialog, BaseFmtHdl)
         // Set all Items as new  -> the call the current Page Reset()
         DBG_ASSERT( pDataObject->pTabPage, "the Page is gone" );
         pDataObject->pTabPage->Reset( aTmpSet );
-        pDataObject->pTabPage->pImpl->mbStandard = sal_True;
+        pDataObject->pTabPage->pImpl->mbStandard = true;
     }
     return 1;
 }
@@ -1268,11 +1268,11 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
     }
     else if ( pDataObject->bRefresh )
         pTabPage->Reset( *pSet );
-    pDataObject->bRefresh = sal_False;
+    pDataObject->bRefresh = false;
 
     if ( pExampleSet )
         pTabPage->ActivatePage( *pExampleSet );
-    sal_Bool bReadOnly = pTabPage->IsReadOnly();
+    bool bReadOnly = pTabPage->IsReadOnly();
     ( bReadOnly || pImpl->bHideResetBtn ) ? m_pResetBtn->Hide() : m_pResetBtn->Show();
     return 0;
 }
@@ -1353,9 +1353,9 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl )
             Data_Impl* pObj = *it;
 
             if ( pObj->pTabPage != pPage ) // Do not refresh own Page anymore
-                pObj->bRefresh = sal_True;
+                pObj->bRefresh = true;
             else
-                pObj->bRefresh = sal_False;
+                pObj->bRefresh = false;
         }
     }
     if ( nRet & SfxTabPage::LEAVE_PAGE )
@@ -1395,9 +1395,9 @@ const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
 
     [Cross-reference]
 
-    <SfxTabDialog::AddTabPage(sal_uInt16, CreateTabPage, GetTabPageRanges, sal_Bool)>
-    <SfxTabDialog::AddTabPage(sal_uInt16, const String &, CreateTabPage, GetTabPageRanges, sal_Bool, sal_uInt16)>
-    <SfxTabDialog::AddTabPage(sal_uInt16, const Bitmap &, CreateTabPage, GetTabPageRanges, sal_Bool, sal_uInt16)>
+    <SfxTabDialog::AddTabPage(sal_uInt16, CreateTabPage, GetTabPageRanges, bool)>
+    <SfxTabDialog::AddTabPage(sal_uInt16, const String &, CreateTabPage, GetTabPageRanges, bool, sal_uInt16)>
+    <SfxTabDialog::AddTabPage(sal_uInt16, const Bitmap &, CreateTabPage, GetTabPageRanges, bool, sal_uInt16)>
 */
 
 {
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index ae65f986cadf..9e30206ee03f 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -105,7 +105,7 @@ using namespace ::com::sun::star::ui;
 
 
 
-SFX_IMPL_TOOLBOX_CONTROL_ARG(SfxToolBoxControl, SfxStringItem, sal_True);
+SFX_IMPL_TOOLBOX_CONTROL_ARG(SfxToolBoxControl, SfxStringItem, true);
 SFX_IMPL_TOOLBOX_CONTROL(SfxRecentFilesToolBoxControl, SfxStringItem);
 
 static Window* GetTopMostParentSystemWindow( Window* pWindow )
@@ -187,11 +187,11 @@ svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const Reference< X
 struct SfxToolBoxControl_Impl
 {
     ToolBox*                pBox;
-    sal_Bool                    bShowString;
-    sal_uInt16                  nSelectModifier;
+    bool                    bShowString;
+    sal_uInt16              nSelectModifier;
     SfxTbxCtrlFactory*      pFact;
-    sal_uInt16                  nTbxId;
-    sal_uInt16                  nSlotId;
+    sal_uInt16              nTbxId;
+    sal_uInt16              nSlotId;
     SfxPopupWindow*         mpFloatingWindow;
     SfxPopupWindow*         mpPopupWindow;
     Reference< XUIElement > mxUIElement;
@@ -221,10 +221,10 @@ IMPL_LINK( SfxToolBoxControl_Impl, WindowEventListener, VclSimpleEvent*, pEvent
 
 
 SfxToolBoxControl::SfxToolBoxControl(
-    sal_uInt16          nSlotID,
-    sal_uInt16          nID,
+    sal_uInt16      nSlotID,
+    sal_uInt16      nID,
     ToolBox&        rBox,
-    sal_Bool            bShowStringItems     )
+    bool            bShowStringItems     )
 :   svt::ToolboxController()
 {
     pImpl = new SfxToolBoxControl_Impl;
@@ -970,12 +970,12 @@ void SfxToolBoxControl::StateChanged
 void SfxToolBoxControl::Select( sal_uInt16 nModifier )
 {
     pImpl->nSelectModifier = nModifier;
-    Select( sal_Bool((nModifier & KEY_MOD1)!=0) );
+    Select( (nModifier & KEY_MOD1) != 0 );
 }
 
 
 
-void SfxToolBoxControl::Select( sal_Bool /*bMod1*/ )
+void SfxToolBoxControl::Select( bool /*bMod1*/ )
 {
     svt::ToolboxController::execute( pImpl->nSelectModifier );
 }
@@ -1159,8 +1159,8 @@ SfxPopupWindow::SfxPopupWindow(
     const Reference< XFrame >& rFrame,
     WinBits nBits ) :
     FloatingWindow( SFX_APP()->GetTopWindow(), nBits )
-    , m_bFloating(sal_False)
-    , m_bCascading( sal_False )
+    , m_bFloating( false )
+    , m_bCascading( false )
     , m_nId( nId )
     , m_xFrame( rFrame )
     , m_pStatusListener( 0 )
@@ -1177,8 +1177,8 @@ SfxPopupWindow::SfxPopupWindow(
     const Reference< XFrame >& rFrame,
     const ResId &rId ) :
     FloatingWindow( SFX_APP()->GetTopWindow(), rId )
-    , m_bFloating(sal_False)
-    , m_bCascading( sal_False )
+    , m_bFloating( false )
+    , m_bCascading( false )
     , m_nId( nId )
     , m_xFrame( rFrame )
     , m_pStatusListener( 0 )
@@ -1196,8 +1196,8 @@ SfxPopupWindow::SfxPopupWindow(
     Window* pParentWindow,
     WinBits nBits ) :
     FloatingWindow( pParentWindow, nBits )
-    , m_bFloating(sal_False)
-    , m_bCascading( sal_False )
+    , m_bFloating( false )
+    , m_bCascading( false )
     , m_nId( nId )
     , m_xFrame( rFrame )
     , m_pStatusListener( 0 )
@@ -1213,8 +1213,8 @@ SfxPopupWindow::SfxPopupWindow(
     Window* pParentWindow,
     const ResId &rId ) :
     FloatingWindow( pParentWindow, rId )
-    , m_bFloating(sal_False)
-    , m_bCascading( sal_False )
+    , m_bFloating( false )
+    , m_bCascading( false )
     , m_nId( nId )
     , m_xFrame( rFrame )
     , m_pStatusListener( 0 )
@@ -1287,7 +1287,7 @@ void SfxPopupWindow::AddStatusListener( const OUString& rCommandURL )
 
 bool SfxPopupWindow::Close()
 {
-    m_bFloating = sal_False;
+    m_bFloating = false;
     FloatingWindow::Close();
 
     Delete();
@@ -1305,7 +1305,7 @@ void SfxPopupWindow::PopupModeEnd()
     {
         // was teared-off
         DeleteFloatingWindow();
-        m_bFloating = sal_True;
+        m_bFloating = true;
     }
     else
         Close();
@@ -1326,7 +1326,7 @@ void SfxPopupWindow::DeleteFloatingWindow()
 
 void SfxPopupWindow::MouseMove( const ::MouseEvent& rMEvt )
 {
-    if ( m_bCascading == sal_False )
+    if ( !m_bCascading )
         FloatingWindow::MouseMove( rMEvt );
     else
     {
@@ -1352,7 +1352,7 @@ void SfxPopupWindow::MouseMove( const ::MouseEvent& rMEvt )
 
 void SfxPopupWindow::StartCascading()
 {
-    m_bCascading= sal_True;
+    m_bCascading = true;
 }
 
 
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 059dc8fefeab..14ed07edc49d 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -548,7 +548,7 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl)
         // Use only the necessary items for border and background
         sal_uInt16 nBrush = GetWhich( SID_ATTR_BRUSH );
         sal_uInt16 nOuter = GetWhich( SID_ATTR_BORDER_OUTER );
-        sal_uInt16 nInner = GetWhich( SID_ATTR_BORDER_INNER, sal_False );
+        sal_uInt16 nInner = GetWhich( SID_ATTR_BORDER_INNER, false );
         sal_uInt16 nShadow = GetWhich( SID_ATTR_BORDER_SHADOW );
 
         // Create an empty set
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index fe1410b8a478..54437b40b236 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3578,7 +3578,7 @@ SwTOXStylesTabPage::SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrS
     m_pLevelLB->set_height_request(nHeight);
     m_pParaLayLB->set_height_request(nHeight);
 
-    SetExchangeSupport( sal_True );
+    SetExchangeSupport( true );
 
     m_pEditStyleBT->SetClickHdl   (LINK(   this, SwTOXStylesTabPage, EditStyleHdl));
     m_pAssignBT->SetClickHdl      (LINK(   this, SwTOXStylesTabPage, AssignHdl));