sfx2: sal_Bool->bool

Change-Id: Ifd9bc57fd0c6d32796013cb9fca9c935a2f71e54

20 files changed, 159 insertions, 158 deletions

diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx
index ad04fde0b664..67e04d36083e 100644
--- a/include/sfx2/fcontnr.hxx
+++ b/include/sfx2/fcontnr.hxx
@@ -93,11 +93,11 @@ public:
     const SfxFilter*    GetFilter4Extension( const OUString& rExt, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
     const SfxFilter*    GetFilter4FilterName( const OUString& rName, SfxFilterFlags nMust = 0, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
 
-    SAL_DLLPRIVATE static void ReadFilters_Impl( sal_Bool bUpdate=sal_False );
+    SAL_DLLPRIVATE static void ReadFilters_Impl( bool bUpdate=false );
     SAL_DLLPRIVATE static void ReadSingleFilter_Impl( const OUString& rName,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xTypeCFG,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG,
-                            sal_Bool bUpdate );
+                            bool bUpdate );
     SAL_DLLPRIVATE static const SfxFilter* GetDefaultFilter_Impl( const OUString& );
 };
 
@@ -112,13 +112,13 @@ public:
                         SfxFilterMatcher();
                         ~SfxFilterMatcher();
 
-    SAL_DLLPRIVATE static sal_Bool IsFilterInstalled_Impl( const SfxFilter* pFilter );
+    SAL_DLLPRIVATE static bool IsFilterInstalled_Impl( const SfxFilter* pFilter );
     DECL_DLLPRIVATE_STATIC_LINK( SfxFilterMatcher, MaybeFileHdl_Impl, OUString* );
 
     sal_uInt32               GuessFilterIgnoringContent( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
     sal_uInt32               GuessFilter( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
-    sal_uInt32               GuessFilterControlDefaultUI( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED, sal_Bool bDefUI = sal_True ) const;
-    sal_uInt32               DetectFilter( SfxMedium& rMedium, const SfxFilter **, sal_Bool bPlugIn, sal_Bool bAPI = sal_False ) const;
+    sal_uInt32               GuessFilterControlDefaultUI( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED, bool bDefUI = true ) const;
+    sal_uInt32               DetectFilter( SfxMedium& rMedium, const SfxFilter **, bool bPlugIn, bool bAPI = false ) const;
 
     const SfxFilter*    GetFilter4Mime( const OUString& rMime, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED) const;
     const SfxFilter*    GetFilter4ClipBoardId( sal_uInt32 nId, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index a68a791fc664..000f502a664a 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -135,7 +135,7 @@ public:
     void                    StartExecuteModal( const Link& rEndDialogHdl );
     inline ErrCode          GetError() const { return m_nError; }
     sal_Int16               GetDialogType() const;
-    sal_Bool                IsPasswordEnabled() const;
+    bool                    IsPasswordEnabled() const;
     OUString                  GetRealFilter() const;
 
     void                    SetTitle( const OUString&  rNewTitle );
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index d44e11482e60..7678e0bfdceb 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -110,7 +110,7 @@ private:
     Window*             pWindow;
 
 protected:
-    sal_Bool            Close();
+    bool                Close();
     virtual             ~SfxFrame();
 
     SAL_DLLPRIVATE void RemoveChildFrame_Impl( SfxFrame* );
@@ -128,14 +128,14 @@ public:
 
     SvCompatWeakHdl*    GetHdl();
     Window&             GetWindow() const;
-    void                CancelTransfers( sal_Bool bCancelLoadEnv = sal_True );
-    sal_Bool            DoClose();
+    void                CancelTransfers( bool bCancelLoadEnv = true );
+    bool                DoClose();
     sal_uInt16          GetChildFrameCount() const;
     SfxFrame*           GetChildFrame( sal_uInt16 nPos ) const;
     SfxFrame*           GetParentFrame() const
                         { return pParentFrame; }
 
-    void                SetPresentationMode( sal_Bool bSet );
+    void                SetPresentationMode( bool bSet );
     SystemWindow*       GetSystemWindow() const;
 
     static SfxFrame*    GetFirst();
@@ -147,14 +147,14 @@ public:
     SfxObjectShell*     GetCurrentDocument() const;
     SfxViewFrame*       GetCurrentViewFrame() const;
     SfxFrame&           GetTopFrame() const;
-    sal_Bool            IsParent( SfxFrame* ) const;
+    bool                IsParent( SfxFrame* ) const;
 
     sal_uInt32          GetFrameType() const;
     void                GetTargetList( TargetList& ) const;
     SAL_DLLPRIVATE SfxFrame* GetContainingDocFrame_Impl( SfxFrame* pSelf );
     void                UpdateDescriptor( SfxObjectShell *pDoc );
     void                Resize();
-    sal_Bool            HasComponent() const;
+    bool                HasComponent() const;
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >
                             GetComponent() const;
     void                ReleaseComponent();
@@ -165,30 +165,30 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >
                             GetController() const;
 
-    sal_Bool            IsInPlace() const;
+    bool                IsInPlace() const;
 
-    SAL_DLLPRIVATE sal_Bool DoClose_Impl();
+    SAL_DLLPRIVATE bool DoClose_Impl();
     SAL_DLLPRIVATE void SetFrameInterface_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-    SAL_DLLPRIVATE void ReleasingComponent_Impl( sal_Bool bSet );
+    SAL_DLLPRIVATE void ReleasingComponent_Impl( bool bSet );
     SAL_DLLPRIVATE void GetViewData_Impl();
     SAL_DLLPRIVATE void SetFrameType_Impl( sal_uInt32 );
-    SAL_DLLPRIVATE bool PrepareClose_Impl( sal_Bool bUI );
-    SAL_DLLPRIVATE sal_Bool DocIsModified_Impl();
+    SAL_DLLPRIVATE bool PrepareClose_Impl( bool bUI );
+    SAL_DLLPRIVATE bool DocIsModified_Impl();
     SAL_DLLPRIVATE void SetCurrentViewFrame_Impl( SfxViewFrame* );
-    SAL_DLLPRIVATE sal_Bool IsClosing_Impl() const;
+    SAL_DLLPRIVATE bool IsClosing_Impl() const;
     SAL_DLLPRIVATE void SetIsClosing_Impl();
 
     // Methods for accessing the current set
     SAL_DLLPRIVATE SfxFrameDescriptor* GetDescriptor() const;
 
-    SAL_DLLPRIVATE void Lock_Impl( sal_Bool bLock );
+    SAL_DLLPRIVATE void Lock_Impl( bool bLock );
     SAL_DLLPRIVATE SfxDispatcher* GetDispatcher_Impl() const;
-    SAL_DLLPRIVATE sal_Bool IsAutoLoadLocked_Impl() const;
+    SAL_DLLPRIVATE bool IsAutoLoadLocked_Impl() const;
 
     SAL_DLLPRIVATE static void InsertTopFrame_Impl( SfxFrame* pFrame );
     SAL_DLLPRIVATE static void RemoveTopFrame_Impl( SfxFrame* pFrame );
-    SAL_DLLPRIVATE void SetOwnsBindings_Impl( sal_Bool bSet );
-    SAL_DLLPRIVATE sal_Bool OwnsBindings_Impl() const;
+    SAL_DLLPRIVATE void SetOwnsBindings_Impl( bool bSet );
+    SAL_DLLPRIVATE bool OwnsBindings_Impl() const;
     SAL_DLLPRIVATE void InvalidateUnoControllers_Impl();
     SAL_DLLPRIVATE void RegisterUnoController_Impl( SfxUnoControllerItem* );
     SAL_DLLPRIVATE void ReleaseUnoController_Impl( SfxUnoControllerItem* );
@@ -197,12 +197,12 @@ public:
     SAL_DLLPRIVATE Rectangle GetTopOuterRectPixel_Impl() const;
     SAL_DLLPRIVATE void CreateWorkWindow_Impl();
     SAL_DLLPRIVATE void GrabFocusOnComponent_Impl();
-    SAL_DLLPRIVATE void SetInPlace_Impl( sal_Bool );
+    SAL_DLLPRIVATE void SetInPlace_Impl( bool );
 
     SAL_DLLPRIVATE void PrepareForDoc_Impl( SfxObjectShell& i_rDoc );
-    SAL_DLLPRIVATE void LockResize_Impl( sal_Bool bLock );
-    SAL_DLLPRIVATE void SetMenuBarOn_Impl( sal_Bool bOn );
-    SAL_DLLPRIVATE sal_Bool IsMenuBarOn_Impl() const;
+    SAL_DLLPRIVATE void LockResize_Impl( bool bLock );
+    SAL_DLLPRIVATE void SetMenuBarOn_Impl( bool bOn );
+    SAL_DLLPRIVATE bool IsMenuBarOn_Impl() const;
     SAL_DLLPRIVATE SystemWindow* GetTopWindow_Impl() const;
     SAL_DLLPRIVATE bool IsMarkedHidden_Impl() const;
 private:
@@ -214,12 +214,12 @@ SV_DECL_COMPAT_WEAK( SfxFrame )
 class SfxFrameIterator
 {
     const SfxFrame*         pFrame;
-    sal_Bool                bRecursive;
+    bool                    bRecursive;
 
     SfxFrame*               NextSibling_Impl( SfxFrame& rPrev );
 
 public:
-                            SfxFrameIterator( const SfxFrame& rFrame, sal_Bool bRecursive=sal_True );
+                            SfxFrameIterator( const SfxFrame& rFrame, bool bRecursive=true );
     SfxFrame*               FirstFrame();
     SfxFrame*               NextFrame( SfxFrame& rPrev );
 };
@@ -246,7 +246,7 @@ public:
     virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
     virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    sal_Bool                FrameKilled() const { return &wFrame != pFrame; }
+    bool                    FrameKilled() const { return &wFrame != pFrame; }
 
     SfxFrame*               GetFrame() const
                             { return wFrame; }
diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx
index ebc40e4cb432..ffa57edcf7ef 100644
--- a/include/sfx2/frmdescr.hxx
+++ b/include/sfx2/frmdescr.hxx
@@ -75,12 +75,12 @@ class SFX2_DLLPUBLIC SfxFrameDescriptor
     long                    nWidth;
     ScrollingMode           eScroll;
     SizeSelector            eSizeSelector;
-    sal_uInt16                  nHasBorder;
-    sal_uInt16                  nItemId;
-    sal_Bool                    bResizeHorizontal;
-    sal_Bool                    bResizeVertical;
-    sal_Bool                    bHasUI;
-    sal_Bool                    bReadOnly;
+    sal_uInt16              nHasBorder;
+    sal_uInt16              nItemId;
+    bool                    bResizeHorizontal;
+    bool                    bResizeVertical;
+    bool                    bHasUI;
+    bool                    bReadOnly;
     SfxFrameDescriptor_Impl* pImp;
 
 public:
@@ -96,10 +96,10 @@ public:
                             { return aActualURL; }
     void                    SetActualURL( const INetURLObject& rURL );
     void                    SetActualURL( const OUString& rURL );
-    void                    SetReadOnly( sal_Bool bSet ) { bReadOnly = bSet;}
-    sal_Bool                    IsReadOnly(  ) const { return bReadOnly;}
-    void                    SetEditable( sal_Bool bSet );
-    sal_Bool                    IsEditable() const;
+    void                    SetReadOnly( bool bSet ) { bReadOnly = bSet;}
+    bool                    IsReadOnly(  ) const { return bReadOnly;}
+    void                    SetEditable( bool bSet );
+    bool                    IsEditable() const;
 
                             // Size
     void                    SetWidth( long n )
@@ -114,9 +114,9 @@ public:
                             { return nWidth; }
     SizeSelector            GetSizeSelector() const
                             { return eSizeSelector; }
-    sal_Bool                    IsResizable() const
+    bool                    IsResizable() const
                             { return bResizeHorizontal && bResizeVertical; }
-    void                    SetResizable( sal_Bool bRes )
+    void                    SetResizable( bool bRes )
                             { bResizeHorizontal = bResizeVertical = bRes; }
 
                             // FrameName
@@ -137,25 +137,25 @@ public:
 
                             // FrameBorder
     void                    SetWallpaper( const Wallpaper& rWallpaper );
-    sal_Bool                    HasFrameBorder() const;
+    bool                    HasFrameBorder() const;
 
-    sal_Bool                    IsFrameBorderOn() const
+    bool                    IsFrameBorderOn() const
                             { return ( nHasBorder & BORDER_YES ) != 0; }
 
-    void                    SetFrameBorder( sal_Bool bBorder )
+    void                    SetFrameBorder( bool bBorder )
                             {
                                 nHasBorder = bBorder ?
                                             BORDER_YES | BORDER_SET :
                                             BORDER_NO | BORDER_SET;
                             }
-    sal_Bool                    IsFrameBorderSet() const
+    bool                    IsFrameBorderSet() const
                             { return (nHasBorder & BORDER_SET) != 0; }
     void                    ResetBorder()
                             { nHasBorder = 0; }
 
-    sal_Bool                    HasUI() const
+    bool                    HasUI() const
                             { return bHasUI; }
-    void                    SetHasUI( sal_Bool bOn )
+    void                    SetHasUI( bool bOn )
                             { bHasUI = bOn; }
 
                             // Attribute for Splitwindow
@@ -165,7 +165,7 @@ public:
                             { nItemId = nId; }
 
                             // Copy for example for Views
-    SfxFrameDescriptor*     Clone( sal_Bool bWithIds = sal_True ) const;
+    SfxFrameDescriptor*     Clone( bool bWithIds = true ) const;
 };
 
 // No block to implement a =operator
@@ -182,13 +182,13 @@ struct SfxFrameProperties
     ScrollingMode                       eScroll;
     SizeSelector                        eSizeSelector;
     SizeSelector                        eSetSizeSelector;
-    sal_Bool                                bHasBorder;
-    sal_Bool                                bBorderSet;
-    sal_Bool                                bResizable;
-    sal_Bool                                bSetResizable;
-    sal_Bool                                bIsRootSet;
-    sal_Bool                                bIsInColSet;
-    sal_Bool                                bHasBorderInherited;
+    bool                                bHasBorder;
+    bool                                bBorderSet;
+    bool                                bResizable;
+    bool                                bSetResizable;
+    bool                                bIsRootSet;
+    bool                                bIsInColSet;
+    bool                                bHasBorderInherited;
     SfxFrameDescriptor*                 pFrame;
 
 private:
@@ -204,13 +204,13 @@ public:
                                               eScroll( ScrollingAuto ),
                                               eSizeSelector( SIZE_REL ),
                                               eSetSizeSelector( SIZE_REL ),
-                                              bHasBorder( sal_True ),
-                                              bBorderSet( sal_True ),
-                                              bResizable( sal_True ),
-                                              bSetResizable( sal_True ),
-                                              bIsRootSet( sal_False ),
-                                              bIsInColSet( sal_False ),
-                                              bHasBorderInherited( sal_True ),
+                                              bHasBorder( true ),
+                                              bBorderSet( true ),
+                                              bResizable( true ),
+                                              bSetResizable( true ),
+                                              bIsRootSet( false ),
+                                              bIsInColSet( false ),
+                                              bHasBorderInherited( true ),
                                               pFrame( 0 ) {}
 
                                         ~SfxFrameProperties() { delete pFrame; }
diff --git a/include/sfx2/frmhtml.hxx b/include/sfx2/frmhtml.hxx
index 2210871572bd..a501d84ace83 100644
--- a/include/sfx2/frmhtml.hxx
+++ b/include/sfx2/frmhtml.hxx
@@ -32,7 +32,7 @@ class SfxMedium;
 class SFX2_DLLPUBLIC SfxFrameHTMLParser : public SfxHTMLParser
 {
 protected:
-   SfxFrameHTMLParser( SvStream& rStream, sal_Bool bIsNewDoc=sal_True, SfxMedium *pMediumPtr=0 ):
+   SfxFrameHTMLParser( SvStream& rStream, bool bIsNewDoc=true, SfxMedium *pMediumPtr=0 ):
    SfxHTMLParser( rStream, bIsNewDoc, pMediumPtr ) {};
 
 public:
diff --git a/include/sfx2/frmhtmlw.hxx b/include/sfx2/frmhtmlw.hxx
index 2f7479f46f1a..c6527bdf8ffd 100644
--- a/include/sfx2/frmhtmlw.hxx
+++ b/include/sfx2/frmhtmlw.hxx
@@ -43,12 +43,12 @@ class SFX2_DLLPUBLIC SfxFrameHTMLWriter
 {
     SAL_DLLPRIVATE static void OutMeta( SvStream& rStrm,
                                 const sal_Char *pIndent, const OUString& rName,
-                                const OUString& rContent, sal_Bool bHTTPEquiv,
+                                const OUString& rContent, bool bHTTPEquiv,
                                 rtl_TextEncoding eDestEnc,
                                 OUString *pNonConvertableChars = 0 );
     SAL_DLLPRIVATE inline static void OutMeta( SvStream& rStrm,
                                 const sal_Char *pIndent, const sal_Char *pName,
-                                const OUString& rContent, sal_Bool bHTTPEquiv,
+                                const OUString& rContent, bool bHTTPEquiv,
                                 rtl_TextEncoding eDestEnc,
                                 OUString *pNonConvertableChars = 0 );
 
@@ -68,7 +68,7 @@ public:
 
 inline void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
                             const sal_Char *pIndent, const sal_Char *pName,
-                            const OUString& rContent, sal_Bool bHTTPEquiv,
+                            const OUString& rContent, bool bHTTPEquiv,
                             rtl_TextEncoding eDestEnc,
                             OUString *pNonConvertableChars )
 {
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index f59b9b90f740..892fbadddf38 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -1263,7 +1263,7 @@ void SlideShow::StartFullscreenPresentation( )
         // new view shell--a prerequisite to process slot calls and initialize
         // its panes--a GrabFocus() has to be called later on.
         SfxFrame* pNewFrame = SfxFrame::Create( *mpDoc->GetDocSh(), *pWorkWindow, PRESENTATION_FACTORY_ID, true );
-        pNewFrame->SetPresentationMode(sal_True);
+        pNewFrame->SetPresentationMode(true);
 
         mpFullScreenViewShellBase = static_cast<ViewShellBase*>(pNewFrame->GetCurrentViewFrame()->GetViewShell());
         if(mpFullScreenViewShellBase != NULL)
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 5e1093699441..f86c1da62e18 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -410,12 +410,12 @@ sal_uInt32  SfxFilterMatcher::GuessFilterIgnoringContent(
 
 sal_uInt32  SfxFilterMatcher::GuessFilter( SfxMedium& rMedium, const SfxFilter**ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont ) const
 {
-    return GuessFilterControlDefaultUI( rMedium, ppFilter, nMust, nDont, sal_True );
+    return GuessFilterControlDefaultUI( rMedium, ppFilter, nMust, nDont, true );
 }
 
 
 
-sal_uInt32  SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, const SfxFilter** ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont, sal_Bool /*bDefUI*/ ) const
+sal_uInt32  SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, const SfxFilter** ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont, bool /*bDefUI*/ ) const
 {
     const SfxFilter* pOldFilter = *ppFilter;
 
@@ -509,7 +509,7 @@ sal_uInt32  SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c
 }
 
 
-sal_Bool SfxFilterMatcher::IsFilterInstalled_Impl( const SfxFilter* pFilter )
+bool SfxFilterMatcher::IsFilterInstalled_Impl( const SfxFilter* pFilter )
 {
     if ( pFilter->GetFilterFlags() & SFX_FILTER_MUSTINSTALL )
     {
@@ -535,14 +535,14 @@ sal_Bool SfxFilterMatcher::IsFilterInstalled_Impl( const SfxFilter* pFilter )
         OUString aText( SfxResId(STR_FILTER_CONSULT_SERVICE).toString() );
         aText = aText.replaceFirst( "$(FILTER)", pFilter->GetUIName() );
         InfoBox ( NULL, aText ).Execute();
-        return sal_False;
+        return false;
     }
     else
-        return sal_True;
+        return true;
 }
 
 
-sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter**ppFilter, sal_Bool /*bPlugIn*/, sal_Bool bAPI ) const
+sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter**ppFilter, bool /*bPlugIn*/, bool bAPI ) const
 /*  [Description]
 
     Here the Filter selection box is pulled up. Otherwise GuessFilter
@@ -825,7 +825,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4FilterName( const OUString& rName,
                 }
             }
 
-            SfxFilterContainer::ReadSingleFilter_Impl( rName, xTypeCFG, xFilterCFG, sal_False );
+            SfxFilterContainer::ReadSingleFilter_Impl( rName, xTypeCFG, xFilterCFG, false );
         }
     }
 
@@ -931,7 +931,7 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
     const OUString& rName,
     const uno::Reference< container::XNameAccess >& xTypeCFG,
     const uno::Reference< container::XNameAccess >& xFilterCFG,
-    sal_Bool bUpdate
+    bool bUpdate
     )
 {
     OUString sFilterName( rName );
@@ -1124,7 +1124,7 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
     }
 }
 
-void SfxFilterContainer::ReadFilters_Impl( sal_Bool bUpdate )
+void SfxFilterContainer::ReadFilters_Impl( bool bUpdate )
 {
     SAL_INFO( "sfx.bastyp", "SfxFilterContainer::ReadFilters" );
     if ( !pFilterArr )
@@ -1157,7 +1157,7 @@ void SfxFilterContainer::ReadFilters_Impl( sal_Bool bUpdate )
                 // and change it back for all valid filters afterwards.
                 if( !rList.empty() )
                 {
-                    bUpdate = sal_True;
+                    bUpdate = true;
                     SfxFilter* pFilter;
                     for ( size_t i = 0, n = rList.size(); i < n; ++i )
                     {
diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx
index 5792dba34857..9afef3b390fd 100644
--- a/sfx2/source/bastyp/fltlst.cxx
+++ b/sfx2/source/bastyp/fltlst.cxx
@@ -108,7 +108,7 @@ void SAL_CALL SfxFilterListener::refreshed( const lang::EventObject& aSource ) t
         (xContainer==m_xFilterCache)
       )
     {
-        SfxFilterContainer::ReadFilters_Impl( sal_True );
+        SfxFilterContainer::ReadFilters_Impl( true );
     }
 }
 
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index ecdc5ee5a63b..f9541d4006f5 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -109,7 +109,7 @@ void SfxFrameHTMLParser::ParseFrameOptions(
             break;
         }
         case HTML_O_NORESIZE:
-            pFrame->SetResizable( sal_False );
+            pFrame->SetResizable( false );
             break;
         default:
             if (aOption.GetTokenString().equalsIgnoreAsciiCase(HTML_O_READONLY))
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index a0d20f8d1f7c..df6971203043 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -57,8 +57,9 @@ static sal_Char const sHTML_MIME_text_html[] =  "text/html; charset=";
 void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
                                   const sal_Char *pIndent,
                                   const OUString& rName,
-                                  const OUString& rContent, sal_Bool bHTTPEquiv,
-                                     rtl_TextEncoding eDestEnc,
+                                  const OUString& rContent,
+                                  bool bHTTPEquiv,
+                                  rtl_TextEncoding eDestEnc,
                                   OUString *pNonConvertableChars  )
 {
     rStrm.WriteCharPtr( SAL_NEWLINE_STRING );
@@ -91,7 +92,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
     {
         OUString aContentType(sHTML_MIME_text_html);
         aContentType += OUString(pCharSet, strlen(pCharSet), RTL_TEXTENCODING_UTF8);
-        OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_content_type, aContentType, sal_True,
+        OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_content_type, aContentType, true,
                  eDestEnc, pNonConvertableChars );
     }
 
@@ -132,7 +133,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
     OUString os( "$_OS" );
     ::rtl::Bootstrap::expandMacros(os);
     sGenerator = sGenerator.replaceFirst( "%1", os );
-    OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_generator, sGenerator, sal_False, eDestEnc, pNonConvertableChars );
+    OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_generator, sGenerator, false, eDestEnc, pNonConvertableChars );
 
     if( i_xDocProps.is() )
     {
@@ -151,14 +152,14 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
                               rBaseURL, rReloadURL);
             }
 
-            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_refresh, sContent, sal_True,
+            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_refresh, sContent, true,
                      eDestEnc, pNonConvertableChars );
         }
 
         // Author
         const OUString& rAuthor = i_xDocProps->getAuthor();
         if( !rAuthor.isEmpty() )
-            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_author, rAuthor, sal_False,
+            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_author, rAuthor, false,
                      eDestEnc, pNonConvertableChars );
 
         // created
@@ -168,13 +169,13 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
         OUString sOut = OUString::number(aD.GetDate());
         sOut += ";";
         sOut += OUString::number(aT.GetTime());
-        OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_created, sOut, sal_False,
+        OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_created, sOut, false,
                  eDestEnc, pNonConvertableChars );
 
         // changedby
         const OUString& rChangedBy = i_xDocProps->getModifiedBy();
         if( !rChangedBy.isEmpty() )
-            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changedby, rChangedBy, sal_False,
+            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changedby, rChangedBy, false,
                      eDestEnc, pNonConvertableChars );
 
         // changed
@@ -184,26 +185,26 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
         sOut = OUString::number(aD2.GetDate());
         sOut += ";";
         sOut += OUString::number(aT2.GetTime());
-        OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changed, sOut, sal_False,
+        OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changed, sOut, false,
                  eDestEnc, pNonConvertableChars );
 
         // Subject
         const OUString& rTheme = i_xDocProps->getSubject();
         if( !rTheme.isEmpty() )
-            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_classification, rTheme, sal_False,
+            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_classification, rTheme, false,
                      eDestEnc, pNonConvertableChars );
 
         // Description
         const OUString& rComment = i_xDocProps->getDescription();
         if( !rComment.isEmpty() )
-            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_description, rComment, sal_False,
+            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_description, rComment, false,
                      eDestEnc, pNonConvertableChars);
 
         // Keywords
         OUString Keywords = ::comphelper::string::convertCommaSeparated(
             i_xDocProps->getKeywords());
         if( !Keywords.isEmpty() )
-            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_keywords, Keywords, sal_False,
+            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_keywords, Keywords, false,
                      eDestEnc, pNonConvertableChars);
 
         uno::Reference < script::XTypeConverter > xConverter( script::Converter::create(
@@ -226,7 +227,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
                 OUString str;
                 aStr >>= str;
                 OUString valstr(comphelper::string::stripEnd(str, ' '));
-                OutMeta( rStrm, pIndent, name, valstr, sal_False,
+                OutMeta( rStrm, pIndent, name, valstr, false,
                          eDestEnc, pNonConvertableChars );
             }
             catch (const uno::Exception&)
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index b2d9989f8b48..79df9c844e9a 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -2390,9 +2390,9 @@ short FileDialogHelper::GetDialogType() const
     return mpImp ? mpImp->m_nDialogType : 0;
 }
 
-sal_Bool FileDialogHelper::IsPasswordEnabled() const
+bool FileDialogHelper::IsPasswordEnabled() const
 {
-    return mpImp ? mpImp->isPasswordEnabled() : sal_False;
+    return mpImp && mpImp->isPasswordEnabled();
 }
 
 OUString FileDialogHelper::GetRealFilter() const
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index 6c57bd3882f0..260fb429589c 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -98,7 +98,7 @@ SfxMedium* DocumentInserter::CreateMedium()
             pMatcher = new SfxFilterMatcher();
 
         const SfxFilter* pFilter = NULL;
-        sal_uInt32 nError = pMatcher->DetectFilter( *pMedium, &pFilter, sal_False );
+        sal_uInt32 nError = pMatcher->DetectFilter( *pMedium, &pFilter, false );
         if ( nError == ERRCODE_NONE && pFilter )
             pMedium->SetFilter( pFilter );
         else
@@ -128,7 +128,7 @@ SfxMediumList* DocumentInserter::CreateMediumList()
 
             SfxFilterMatcher aMatcher( m_sDocFactory );
             const SfxFilter* pFilter = NULL;
-            sal_uInt32 nError = aMatcher.DetectFilter( *pMedium, &pFilter, sal_False );
+            sal_uInt32 nError = aMatcher.DetectFilter( *pMedium, &pFilter, false );
             if ( nError == ERRCODE_NONE && pFilter )
                 pMedium->SetFilter( pFilter );
             else
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index 2d1440d81a99..8f97af425d00 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -32,9 +32,9 @@ struct SfxFrameDescriptor_Impl
 {
     Wallpaper*  pWallpaper;
     SfxItemSet* pArgs;
-    sal_Bool        bEditable;
+    bool        bEditable;
 
-    SfxFrameDescriptor_Impl() : pWallpaper( NULL ), pArgs( NULL ), bEditable( sal_True ) {}
+    SfxFrameDescriptor_Impl() : pWallpaper( NULL ), pArgs( NULL ), bEditable( true ) {}
     ~SfxFrameDescriptor_Impl()
     {
         delete pWallpaper;
@@ -49,10 +49,10 @@ SfxFrameDescriptor::SfxFrameDescriptor() :
     eSizeSelector( SIZE_ABS ),
     nHasBorder( BORDER_YES ),
     nItemId( 0 ),
-    bResizeHorizontal( sal_True ),
-    bResizeVertical( sal_True ),
-    bHasUI( sal_True ),
-    bReadOnly( sal_False )
+    bResizeHorizontal( true ),
+    bResizeVertical( true ),
+    bHasUI( true ),
+    bReadOnly( false )
 {
 
     pImp = new SfxFrameDescriptor_Impl;
@@ -88,17 +88,17 @@ void SfxFrameDescriptor::SetActualURL( const INetURLObject& rURL )
     SetActualURL(rURL.GetMainURL( INetURLObject::DECODE_TO_IURI ));
 }
 
-void SfxFrameDescriptor::SetEditable( sal_Bool bSet )
+void SfxFrameDescriptor::SetEditable( bool bSet )
 {
     pImp->bEditable = bSet;
 }
 
-sal_Bool SfxFrameDescriptor::IsEditable() const
+bool SfxFrameDescriptor::IsEditable() const
 {
     return pImp->bEditable;
 }
 
-SfxFrameDescriptor* SfxFrameDescriptor::Clone( sal_Bool bWithIds ) const
+SfxFrameDescriptor* SfxFrameDescriptor::Clone( bool bWithIds ) const
 {
     SfxFrameDescriptor *pFrame = new SfxFrameDescriptor;
 
@@ -132,7 +132,7 @@ SfxFrameDescriptor* SfxFrameDescriptor::Clone( sal_Bool bWithIds ) const
     return pFrame;
 }
 
-sal_Bool SfxFrameDescriptor::HasFrameBorder() const
+bool SfxFrameDescriptor::HasFrameBorder() const
 {
     return (nHasBorder & BORDER_YES) != 0;
 }
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index dd8da00f4e4d..ac4e6c239fd3 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -4315,7 +4315,7 @@ Reference< frame::XController2 > SAL_CALL SfxBaseModel::createViewController(
     // some initial view settings, coming from our most recent attachResource call
     ::comphelper::NamedValueCollection aDocumentLoadArgs( getArgs() );
     if ( aDocumentLoadArgs.getOrDefault( "ViewOnly", false ) )
-        pViewFrame->GetFrame().SetMenuBarOn_Impl( sal_False );
+        pViewFrame->GetFrame().SetMenuBarOn_Impl( false );
 
     const sal_Int16 nPluginMode = aDocumentLoadArgs.getOrDefault( "PluginMode", sal_Int16( 0 ) );
     if ( nPluginMode == 1 )
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index dc794e56f258..1fd37a7e69bd 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -121,17 +121,17 @@ SfxFrame::~SfxFrame()
     delete pImp;
 }
 
-sal_Bool SfxFrame::DoClose()
+bool SfxFrame::DoClose()
 {
     // Actually, one more PrepareClose is still needed!
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if ( !pImp->bClosing )
     {
         pImp->bClosing = sal_True;
         CancelTransfers();
 
         // now close frame; it will be deleted if this call is successful, so don't use any members after that!
-        bRet = sal_True;
+        bRet = true;
         try
         {
             Reference< XCloseable > xCloseable  ( pImp->xFrame, UNO_QUERY );
@@ -149,7 +149,7 @@ sal_Bool SfxFrame::DoClose()
         catch( ::com::sun::star::util::CloseVetoException& )
         {
             pImp->bClosing = sal_False;
-            bRet = sal_False;
+            bRet = false;
         }
         catch( ::com::sun::star::lang::DisposedException& )
         {
@@ -159,9 +159,9 @@ sal_Bool SfxFrame::DoClose()
     return bRet;
 }
 
-sal_Bool SfxFrame::DoClose_Impl()
+bool SfxFrame::DoClose_Impl()
 {
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     SfxBindings* pBindings = NULL;
     if ( pImp->pCurrentViewFrame )
         pBindings = &pImp->pCurrentViewFrame->GetBindings();
@@ -181,18 +181,18 @@ sal_Bool SfxFrame::DoClose_Impl()
     return bRet;
 }
 
-sal_Bool SfxFrame::DocIsModified_Impl()
+bool SfxFrame::DocIsModified_Impl()
 {
     if ( pImp->pCurrentViewFrame && pImp->pCurrentViewFrame->GetObjectShell() &&
             pImp->pCurrentViewFrame->GetObjectShell()->IsModified() )
-        return sal_True;
+        return true;
     for( sal_uInt16 nPos = GetChildFrameCount(); nPos--; )
         if( (*pChildArr)[ nPos ]->DocIsModified_Impl() )
-            return sal_True;
-    return sal_False;
+            return true;
+    return false;
 }
 
-bool SfxFrame::PrepareClose_Impl( sal_Bool bUI )
+bool SfxFrame::PrepareClose_Impl( bool bUI )
 {
     bool nRet = true;
 
@@ -269,7 +269,7 @@ SfxFrame& SfxFrame::GetTopFrame() const
     return *const_cast< SfxFrame* >( pParent );
 }
 
-sal_Bool SfxFrame::IsClosing_Impl() const
+bool SfxFrame::IsClosing_Impl() const
 {
     return pImp->bClosing;
 }
@@ -284,7 +284,7 @@ sal_uInt16 SfxFrame::GetChildFrameCount() const
     return pChildArr ? pChildArr->size() : 0;
 }
 
-void SfxFrame::CancelTransfers( sal_Bool /*bCancelLoadEnv*/ )
+void SfxFrame::CancelTransfers( bool /*bCancelLoadEnv*/ )
 {
     if( !pImp->bInCancelTransfers )
     {
@@ -328,20 +328,20 @@ SfxDispatcher* SfxFrame::GetDispatcher_Impl() const
     return GetParentFrame()->GetDispatcher_Impl();
 }
 
-sal_Bool SfxFrame::IsAutoLoadLocked_Impl() const
+bool SfxFrame::IsAutoLoadLocked_Impl() const
 {
     // Its own Docucument is locked?
     const SfxObjectShell* pObjSh = GetCurrentDocument();
     if ( !pObjSh || !pObjSh->IsAutoLoadLocked() )
-        return sal_False;
+        return false;
 
     // Its children are locked?
     for ( sal_uInt16 n = GetChildFrameCount(); n--; )
         if ( !GetChildFrame(n)->IsAutoLoadLocked_Impl() )
-            return sal_False;
+            return false;
 
     // otherwise allow AutoLoad
-    return sal_True;
+    return true;
 }
 
 SfxObjectShell* SfxFrame::GetCurrentDocument() const
@@ -376,16 +376,16 @@ void SfxFrame::GetViewData_Impl()
     if( pViewFrame && pViewFrame->GetViewShell() )
     {
         const SfxMedium *pMed = GetCurrentDocument()->GetMedium();
-        sal_Bool bReadOnly = pMed->GetOpenMode() == SFX_STREAM_READONLY;
+        bool bReadOnly = pMed->GetOpenMode() == SFX_STREAM_READONLY;
         GetDescriptor()->SetReadOnly( bReadOnly );
 
         SfxItemSet *pSet = GetDescriptor()->GetArgs();
-        sal_Bool bGetViewData = sal_False;
+        bool bGetViewData = false;
         if ( GetController().is() && pSet->GetItemState( SID_VIEW_DATA ) != SFX_ITEM_SET )
         {
             ::com::sun::star::uno::Any aData = GetController()->getViewData();
             pSet->Put( SfxUsrAnyItem( SID_VIEW_DATA, aData ) );
-            bGetViewData = sal_True;
+            bGetViewData = true;
         }
 
         if ( pViewFrame->GetCurViewId() )
@@ -423,7 +423,7 @@ void SfxFrame::UpdateDescriptor( SfxObjectShell *pDoc )
     GetDescriptor()->SetActualURL( pMed->GetOrigURL() );
 
     SFX_ITEMSET_ARG( pMed->GetItemSet(), pItem, SfxBoolItem, SID_EDITDOC, false );
-    sal_Bool bEditable = ( !pItem || pItem->GetValue() );
+    bool bEditable = ( !pItem || pItem->GetValue() );
 
     GetDescriptor()->SetEditable( bEditable );
 
@@ -503,17 +503,17 @@ void SfxFrame::GetTargetList( TargetList& rList ) const
 
 
 
-sal_Bool SfxFrame::IsParent( SfxFrame *pFrame ) const
+bool SfxFrame::IsParent( SfxFrame *pFrame ) const
 {
     SfxFrame *pParent = pParentFrame;
     while ( pParent )
     {
         if ( pParent == pFrame )
-            return sal_True;
+            return true;
         pParent = pParent->pParentFrame;
     }
 
-    return sal_False;
+    return false;
 }
 
 void SfxFrame::InsertTopFrame_Impl( SfxFrame* pFrame )
@@ -663,7 +663,7 @@ bool SfxUnoFrameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8
     return ( rVal >>= m_xFrame );
 }
 
-SfxFrameIterator::SfxFrameIterator( const SfxFrame& rFrame, sal_Bool bRecur )
+SfxFrameIterator::SfxFrameIterator( const SfxFrame& rFrame, bool bRecur )
     : pFrame( &rFrame )
     , bRecursive( bRecur )
 {}
@@ -707,9 +707,9 @@ SfxFrame* SfxFrameIterator::NextSibling_Impl( SfxFrame& rPrev )
     return pRet;
 }
 
-sal_Bool SfxFrame::HasComponent() const
+bool SfxFrame::HasComponent() const
 {
-    return sal_False;
+    return false;
 }
 
 ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > SfxFrame::GetController() const
@@ -755,12 +755,12 @@ void SfxFrame::AppearWithUpdate()
         GetCurrentViewFrame()->GetDispatcher()->Update_Impl( true );
 }
 
-void SfxFrame::SetOwnsBindings_Impl( sal_Bool bSet )
+void SfxFrame::SetOwnsBindings_Impl( bool bSet )
 {
     pImp->bOwnsBindings = bSet;
 }
 
-sal_Bool SfxFrame::OwnsBindings_Impl() const
+bool SfxFrame::OwnsBindings_Impl() const
 {
     return pImp->bOwnsBindings;
 }
@@ -787,7 +787,7 @@ void SfxFrame::SetToolSpaceBorderPixel_Impl( const SvBorder& rBorder )
 
         if ( GetParentFrame() )
         {
-            sal_Bool bHasTools = rBorder.Left() != rBorder.Right() || rBorder.Top() != rBorder.Bottom();
+            bool bHasTools = rBorder.Left() != rBorder.Right() || rBorder.Top() != rBorder.Bottom();
             pF->GetWindow().SetBorderStyle( bHasTools ? WINDOW_BORDER_NORMAL : WINDOW_BORDER_NOBORDER );
         }
 
@@ -871,17 +871,17 @@ void SfxFrame::GrabFocusOnComponent_Impl()
         pFocusWindow->GrabFocus();
 }
 
-void SfxFrame::ReleasingComponent_Impl( sal_Bool bSet )
+void SfxFrame::ReleasingComponent_Impl( bool bSet )
 {
     pImp->bReleasingComponent = bSet;
 }
 
-sal_Bool SfxFrame::IsInPlace() const
+bool SfxFrame::IsInPlace() const
 {
     return pImp->bInPlace;
 }
 
-void SfxFrame::SetInPlace_Impl( sal_Bool bSet )
+void SfxFrame::SetInPlace_Impl( bool bSet )
 {
     pImp->bInPlace = bSet;
 }
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index 8f3e89c43f42..880b81ac2c3f 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -316,7 +316,7 @@ SfxFrame::SfxFrame( Window& i_rContainerWindow, bool i_bHidden )
     pWindow->Show();
 }
 
-void SfxFrame::SetPresentationMode( sal_Bool bSet )
+void SfxFrame::SetPresentationMode( bool bSet )
 {
     if ( GetCurrentViewFrame() )
         GetCurrentViewFrame()->GetWindow().SetBorderStyle( bSet ? WINDOW_BORDER_NOBORDER : WINDOW_BORDER_NORMAL );
@@ -358,18 +358,18 @@ Window& SfxFrame::GetWindow() const
     return *pWindow;
 }
 
-sal_Bool SfxFrame::Close()
+bool SfxFrame::Close()
 {
     delete this;
-    return sal_True;
+    return true;
 }
 
-void SfxFrame::LockResize_Impl( sal_Bool bLock )
+void SfxFrame::LockResize_Impl( bool bLock )
 {
     pImp->bLockResize = bLock;
 }
 
-void SfxFrame::SetMenuBarOn_Impl( sal_Bool bOn )
+void SfxFrame::SetMenuBarOn_Impl( bool bOn )
 {
     pImp->bMenuBarOn = bOn;
 
@@ -393,7 +393,7 @@ void SfxFrame::SetMenuBarOn_Impl( sal_Bool bOn )
     }
 }
 
-sal_Bool SfxFrame::IsMenuBarOn_Impl() const
+bool SfxFrame::IsMenuBarOn_Impl() const
 {
     return pImp->bMenuBarOn;
 }
@@ -412,7 +412,7 @@ void SfxFrame::PrepareForDoc_Impl( SfxObjectShell& i_rDoc )
     // plugin mode
     sal_Int16 nPluginMode = aDocumentArgs.getOrDefault( "PluginMode", sal_Int16( 0 ) );
     if ( nPluginMode && ( nPluginMode != 2 ) )
-        SetInPlace_Impl( sal_True );
+        SetInPlace_Impl( true );
 }
 
 bool SfxFrame::IsMarkedHidden_Impl() const
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 2b5ec14759c1..7db5e129e8fe 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -930,7 +930,7 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb )
             {
 
                 if ( m_pViewSh )
-                    m_pViewSh->GetViewFrame()->GetTopFrame().LockResize_Impl(sal_True);
+                    m_pViewSh->GetViewFrame()->GetTopFrame().LockResize_Impl(true);
                 try
                 {
                     m_pImp->m_xObject->setClientSite( m_pImp->m_xClient );
@@ -985,7 +985,7 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb )
                 if ( m_pViewSh )
                 {
                     SfxViewFrame* pFrame = m_pViewSh->GetViewFrame();
-                    pFrame->GetTopFrame().LockResize_Impl(sal_False);
+                    pFrame->GetTopFrame().LockResize_Impl(false);
                     pFrame->GetTopFrame().Resize();
                 }
             }
@@ -1051,7 +1051,7 @@ void SfxInPlaceClient::DeactivateObject()
             }
 
             if ( m_pViewSh )
-                m_pViewSh->GetViewFrame()->GetTopFrame().LockResize_Impl(sal_True);
+                m_pViewSh->GetViewFrame()->GetTopFrame().LockResize_Impl(true);
 
             if ( m_pImp->m_xObject->getStatus( m_pImp->m_nAspect ) & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE )
             {
@@ -1073,7 +1073,7 @@ void SfxInPlaceClient::DeactivateObject()
             {
                 SfxViewFrame* pFrame = m_pViewSh->GetViewFrame();
                 SfxViewFrame::SetViewFrame( pFrame );
-                pFrame->GetTopFrame().LockResize_Impl(sal_False);
+                pFrame->GetTopFrame().LockResize_Impl(false);
                 pFrame->GetTopFrame().Resize();
             }
         }
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 3aaddc823709..be41c0f6e100 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -306,7 +306,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
         if ( pParent == &rFrame && rFrame.GetChildFrameCount() )
         {
             sal_Bool bReloadAvailable = sal_False;
-            SfxFrameIterator aIter( rFrame, sal_False );
+            SfxFrameIterator aIter( rFrame, false );
             SfxFrame *pChild = aIter.FirstFrame();
             while ( pChild )
             {
@@ -905,7 +905,7 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet )
                     // If any ChildFrame is reloadable, the slot is enabled,
                     // so you can perfom CTRL-Reload
                     sal_Bool bReloadAvailable = sal_False;
-                    SfxFrameIterator aFrameIter( *pFrame, sal_True );
+                    SfxFrameIterator aFrameIter( *pFrame, true );
                     for( SfxFrame* pNextFrame = aFrameIter.FirstFrame();
                             pFrame;
                             pNextFrame = pNextFrame ?
@@ -1077,7 +1077,7 @@ void SfxViewFrame::ReleaseObjectShell_Impl()
 {
     DBG_ASSERT( xObjSh.Is(), "no SfxObjectShell to release!" );
 
-    GetFrame().ReleasingComponent_Impl( sal_True );
+    GetFrame().ReleasingComponent_Impl( true );
     if ( GetWindow().HasChildPathFocus( true ) )
     {
         DBG_ASSERT( !GetActiveChildFrame_Impl(), "Wrong active child frame!" );
@@ -1466,7 +1466,7 @@ SfxViewFrame::SfxViewFrame
 
     pImp->pWindow = new SfxFrameViewWindow_Impl( this, rFrame.GetWindow() );
     pImp->pWindow->SetSizePixel( rFrame.GetWindow().GetOutputSizePixel() );
-    rFrame.SetOwnsBindings_Impl( sal_True );
+    rFrame.SetOwnsBindings_Impl( true );
     rFrame.CreateWorkWindow_Impl();
 }
 
diff --git a/sw/source/core/uibase/app/docsh2.cxx b/sw/source/core/uibase/app/docsh2.cxx
index fb8d353c7d0c..58702264923b 100644
--- a/sw/source/core/uibase/app/docsh2.cxx
+++ b/sw/source/core/uibase/app/docsh2.cxx
@@ -1396,12 +1396,12 @@ sal_uLong SwDocShell::LoadStylesFromFile( const OUString& rURL,
     // search for filter in WebDocShell, too
     SfxMedium aMed( rURL, STREAM_STD_READ );
     const SfxFilter* pFlt = 0;
-    aMatcher.DetectFilter( aMed, &pFlt, sal_False, sal_False );
+    aMatcher.DetectFilter( aMed, &pFlt, false, false );
     if(!pFlt)
     {
         OUString sWebFactory(OUString::createFromAscii(SwWebDocShell::Factory().GetShortName()));
         SfxFilterMatcher aWebMatcher( sWebFactory );
-        aWebMatcher.DetectFilter( aMed, &pFlt, sal_False, sal_False );
+        aWebMatcher.DetectFilter( aMed, &pFlt, false, false );
     }
     // --> OD #i117339# - trigger import only for own formats
     bool bImport( false );
@@ -1562,7 +1562,7 @@ int SwFindDocShell( SfxObjectShellRef& xDocSh,
             pMed->GetItemSet()->Put( SfxStringItem( SID_PASSWORD, rPasswd ));
 
         if( !pSfxFlt )
-            aMatcher.DetectFilter( *pMed, &pSfxFlt, sal_False, sal_False );
+            aMatcher.DetectFilter( *pMed, &pSfxFlt, false, false );
 
         if( pSfxFlt )
         {