svx: sal_Bool->bool

and optimise some methods in bmpmask.hxx - they were unconditionally
returning true, so convert them to void return type.

Change-Id: If8b092a857ab80ead93112b0d627e41d5ccb3cf9

16 files changed, 83 insertions, 87 deletions

diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx
index 980a5a2a1324..2d7ef9da7ce1 100644
--- a/include/svx/EnhancedCustomShape2d.hxx
+++ b/include/svx/EnhancedCustomShape2d.hxx
@@ -89,7 +89,7 @@ class EnhancedCustomShape2d : public SfxItemSet
         double                      fXRatio;
         double                      fYRatio;
 
-        sal_Bool                    bOOXMLShape;
+        bool                        bOOXMLShape;
 
         sal_Int32                   nXRef;
         sal_Int32                   nYRef;
@@ -100,7 +100,7 @@ class EnhancedCustomShape2d : public SfxItemSet
 
         */
         struct EquationResult {
-            sal_Bool bReady;
+            bool bReady;
             double fValue;
         };
         com::sun::star::uno::Sequence< OUString >                                                  seqEquations;
@@ -115,13 +115,13 @@ class EnhancedCustomShape2d : public SfxItemSet
         com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValues >                          seqHandles;
         com::sun::star::uno::Sequence< com::sun::star::awt::Size >                                      seqSubViewSize;
 
-        sal_Bool                    bTextFlow       : 1;
-        sal_Bool                    bFilled         : 1;
-        sal_Bool                    bStroked        : 1;
+        bool                    bTextFlow       : 1;
+        bool                    bFilled         : 1;
+        bool                    bStroked        : 1;
 
-        sal_Bool                    bFlipH;
-        sal_Bool                    bFlipV;
-        sal_Int32                   nRotateAngle;
+        bool                    bFlipH;
+        bool                    bFlipV;
+        sal_Int32               nRotateAngle;
 
         bool                    SetAdjustValueAsDouble( const double& rValue, const sal_Int32 nIndex );
         sal_Int32                   GetLuminanceChange( sal_uInt32 nIndex ) const;
@@ -134,9 +134,9 @@ class EnhancedCustomShape2d : public SfxItemSet
                                                     const bool bScale = true, const bool bReplaceGeoSize = false ) const;
 
         void                        CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegmentInd, std::vector< SdrPathObj* >& rObjectList,
-                                                   sal_Bool bLineGeometryNeededOnly, sal_Bool bSortFilledObjectsToBack,
+                                                   bool bLineGeometryNeededOnly, bool bSortFilledObjectsToBack,
                                                    sal_Int32 nIndex );
-        SdrObject*                  CreatePathObj( sal_Bool bLineGeometryNeededOnly );
+        SdrObject*                  CreatePathObj( bool bLineGeometryNeededOnly );
         const sal_Int32*            ApplyShapeAttributes( const SdrCustomShapeGeometryItem& rItem );
 
         void                        SetPathSize( sal_Int32 nIndex = 0 );
@@ -147,9 +147,9 @@ class EnhancedCustomShape2d : public SfxItemSet
         {
             sal_uInt32  nFlags;
 
-            sal_Bool    bMirroredX;
-            sal_Bool    bMirroredY;
-            sal_Bool    bSwitched;
+            bool        bMirroredX;
+            bool        bMirroredY;
+            bool        bSwitched;
 
             com::sun::star::drawing::EnhancedCustomShapeParameterPair   aPosition;
             com::sun::star::drawing::EnhancedCustomShapeParameterPair   aPolar;
@@ -166,21 +166,21 @@ class EnhancedCustomShape2d : public SfxItemSet
             com::sun::star::drawing::EnhancedCustomShapeParameter       aYRangeMinimum;
             com::sun::star::drawing::EnhancedCustomShapeParameter       aYRangeMaximum;
 
-            Handle() : bMirroredX ( sal_False ), bMirroredY ( sal_False ), bSwitched( sal_False ),
+            Handle() : bMirroredX ( false ), bMirroredY ( false ), bSwitched( false ),
                 nRefX( -1 ), nRefY( -1 ), nRefAngle( -1 ), nRefR( -1 ) {};
         };
 
-        sal_Bool                    IsFlipVert() { return bFlipV; };
-        sal_Bool                    IsFlipHorz() { return bFlipH; };
+        bool                        IsFlipVert() { return bFlipV; };
+        bool                        IsFlipHorz() { return bFlipH; };
         sal_Int32                   GetRotateAngle() { return nRotateAngle; };
         SVX_DLLPUBLIC bool          IsPostRotate() const;
 
-        SVX_DLLPUBLIC SdrObject*                    CreateLineGeometry();
-        SVX_DLLPUBLIC SdrObject*                    CreateObject( sal_Bool bLineGeometryNeededOnly );
+        SVX_DLLPUBLIC SdrObject*                CreateLineGeometry();
+        SVX_DLLPUBLIC SdrObject*                CreateObject( bool bLineGeometryNeededOnly );
         SVX_DLLPUBLIC void                      ApplyGluePoints( SdrObject* pObj );
         SVX_DLLPUBLIC Rectangle                 GetTextRect() const;
 
-        SVX_DLLPUBLIC sal_uInt32                    GetHdlCount() const;
+        SVX_DLLPUBLIC sal_uInt32                GetHdlCount() const;
         SVX_DLLPUBLIC bool                  GetHandlePosition( const sal_uInt32 nIndex, Point& rReturnPosition ) const;
         SVX_DLLPUBLIC bool                  SetHandleControllerPosition( const sal_uInt32 nIndex, const com::sun::star::awt::Point& rPosition );
 
@@ -214,7 +214,7 @@ class EnhancedCustomShape2d : public SfxItemSet
         static void                 AppendEnhancedCustomShapeEquationParameter( OUString& rParameter, const sal_Int32 nPara, const bool bIsSpecialValue );
 
         static void                 SetEnhancedCustomShapeEquationParameter( com::sun::star::drawing::EnhancedCustomShapeParameter&
-                                        rParameter, const sal_Int16 nPara, const sal_Bool bIsSpecialValue );
+                                        rParameter, const sal_Int16 nPara, const bool bIsSpecialValue );
         SVX_DLLPUBLIC static void                   SetEnhancedCustomShapeParameter( com::sun::star::drawing::EnhancedCustomShapeParameter&
                                         rParameter, const sal_Int32 nValue );
         SVX_DLLPUBLIC static void                   SetEnhancedCustomShapeHandleParameter( com::sun::star::drawing::EnhancedCustomShapeParameter&
diff --git a/include/svx/EnhancedCustomShapeGeometry.hxx b/include/svx/EnhancedCustomShapeGeometry.hxx
index 85df1d496ecd..ca8e2b7cfb44 100644
--- a/include/svx/EnhancedCustomShapeGeometry.hxx
+++ b/include/svx/EnhancedCustomShapeGeometry.hxx
@@ -81,12 +81,12 @@ struct mso_CustomShape
 
 #define MSO_I | (sal_Int32)0x80000000
 
-sal_Bool            SortFilledObjectsToBackByDefault( MSO_SPT eSpType );
-SVX_DLLPUBLIC sal_Bool          IsCustomShapeFilledByDefault( MSO_SPT eSpType );
-SVX_DLLPUBLIC sal_Int16         GetCustomShapeConnectionTypeDefault( MSO_SPT eSpType );
+bool                        SortFilledObjectsToBackByDefault( MSO_SPT eSpType );
+SVX_DLLPUBLIC bool          IsCustomShapeFilledByDefault( MSO_SPT eSpType );
+SVX_DLLPUBLIC sal_Int16     GetCustomShapeConnectionTypeDefault( MSO_SPT eSpType );
 
 // #i28269#
-SVX_DLLPUBLIC sal_Bool          IsCustomShapeStrokedByDefault( MSO_SPT eSpType );
+SVX_DLLPUBLIC bool          IsCustomShapeStrokedByDefault( MSO_SPT eSpType );
 
 SVX_DLLPUBLIC const mso_CustomShape*    GetCustomShapeContent( MSO_SPT eSpType );
 
diff --git a/include/svx/IAccessibleParent.hxx b/include/svx/IAccessibleParent.hxx
index 23e2aa582445..28d4a244f92e 100644
--- a/include/svx/IAccessibleParent.hxx
+++ b/include/svx/IAccessibleParent.hxx
@@ -74,7 +74,7 @@ public:
         @raises RuntimeException
            in case something went heavily wrong
     */
-    virtual sal_Bool ReplaceChild (
+    virtual bool ReplaceChild (
         AccessibleShape* pCurrentChild,
         const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape,
         const long _nIndex,
@@ -89,7 +89,7 @@ public:
         GetAccessibleCaption (const ::com::sun::star::uno::Reference<
             ::com::sun::star::drawing::XShape>&)
             throw (::com::sun::star::uno::RuntimeException){return NULL;};
-    virtual sal_Bool IsDocumentSelAll(){ return sal_False; }
+    virtual bool IsDocumentSelAll(){ return false; }
 };
 
 } // end of namespace accessibility
diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx
index b7edcd5f70ab..67daf974b475 100644
--- a/include/svx/algitem.hxx
+++ b/include/svx/algitem.hxx
@@ -39,7 +39,7 @@ public:
         const sal_uInt16 nId );
 
     SvxOrientationItem(
-        sal_Int32 nRotation, sal_Bool bStacked,
+        sal_Int32 nRotation, bool bStacked,
         const sal_uInt16 nId );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -62,11 +62,11 @@ public:
             }
 
     /** Returns sal_True, if the item represents STACKED state. */
-    sal_Bool                    IsStacked() const;
+    bool                    IsStacked() const;
     /** Returns the rotation this item represents (returns nStdAngle for STANDARD and STACKED state). */
-    sal_Int32                   GetRotation( sal_Int32 nStdAngle = 0 ) const;
+    sal_Int32               GetRotation( sal_Int32 nStdAngle = 0 ) const;
     /** Fills this item according to passed item values. */
-    void                    SetFromRotation( sal_Int32 nRotation, sal_Bool bStacked );
+    void                    SetFromRotation( sal_Int32 nRotation, bool bStacked );
 };
 
 
@@ -98,14 +98,14 @@ 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_Int16           GetLeftMargin() const {return nLeftMargin; }
-            sal_Bool            SetLeftMargin(sal_Int16 nLeft);
-            sal_Int16           GetTopMargin() const {return nTopMargin; }
-            sal_Bool            SetTopMargin(sal_Int16 nTop);
-            sal_Int16           GetRightMargin() const {return nRightMargin; }
-            sal_Bool            SetRightMargin(sal_Int16 nRight);
-            sal_Int16           GetBottomMargin() const {return nBottomMargin; }
-            sal_Bool            SetBottomMargin(sal_Int16 nBottom);
+            sal_Int16       GetLeftMargin() const {return nLeftMargin; }
+            void            SetLeftMargin(sal_Int16 nLeft);
+            sal_Int16       GetTopMargin() const {return nTopMargin; }
+            void            SetTopMargin(sal_Int16 nTop);
+            sal_Int16       GetRightMargin() const {return nRightMargin; }
+            void            SetRightMargin(sal_Int16 nRight);
+            sal_Int16       GetBottomMargin() const {return nBottomMargin; }
+            void            SetBottomMargin(sal_Int16 nBottom);
 
     inline  SvxMarginItem& operator=(const SvxMarginItem& rMargin)
             {
diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx
index 9e7bad264ec2..4e6c4163bcba 100644
--- a/include/svx/bmpmask.hxx
+++ b/include/svx/bmpmask.hxx
@@ -153,14 +153,14 @@ public:
     void                SetColor( const Color& rColor );
     void                PipetteClicked();
 
-    sal_Bool            NeedsColorList() const;
+    bool                NeedsColorList() const;
     void                SetColorList( const XColorListRef &pColorList );
 
-    void                SetExecState( sal_Bool bEnable );
+    void                SetExecState( bool bEnable );
 
     Graphic             Mask( const Graphic& rGraphic );
 
-    sal_Bool                IsEyedropping() const;
+    bool                IsEyedropping() const;
 
     void                onSelect( MaskSet* pSet );
 
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 00f7d5679809..40b0f77a7285 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -262,7 +262,7 @@ public:
 
     ///=====  IAccessibleParent  ===============================================
 
-    virtual sal_Bool ReplaceChild (
+    virtual bool ReplaceChild (
         ::accessibility::AccessibleShape* pCurrentChild,
         const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape,
         const long _nIndex,
@@ -450,7 +450,7 @@ void ScChildrenShapes::Notify(SfxBroadcaster&, const SfxHint& rHint)
     }
 }
 
-sal_Bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurrentChild,
+bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurrentChild,
         const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape,
         const long _nIndex, const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo)
     throw (uno::RuntimeException)
@@ -464,7 +464,7 @@ sal_Bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurr
     if ( pReplacement )
         pReplacement->Init();
 
-    sal_Bool bResult(false);
+    bool bResult(false);
     if (pReplacement)
     {
         OSL_ENSURE(pCurrentChild->GetXShape().get() == pReplacement->GetXShape().get(), "XShape changes and should be inserted sorted");
@@ -491,7 +491,7 @@ sal_Bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurr
             aEvent.NewValue <<= uno::makeAny(uno::Reference<XAccessible>(pReplacement));
 
             mpAccessibleDocument->CommitChange(aEvent); // child is new - event
-            bResult = sal_True;
+            bResult = true;
         }
     }
     return bResult;
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 151c298a572c..80f458729e67 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -683,7 +683,7 @@ public:
 
     ///=====  IAccessibleParent  ==============================================
 
-    virtual sal_Bool ReplaceChild (
+    virtual bool ReplaceChild (
         ::accessibility::AccessibleShape* pCurrentChild,
         const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape,
         const long _nIndex,
@@ -889,7 +889,7 @@ void ScShapeChildren::VisAreaChanged() const
 
     ///=====  IAccessibleParent  ==============================================
 
-sal_Bool ScShapeChildren::ReplaceChild (::accessibility::AccessibleShape* /* pCurrentChild */,
+bool ScShapeChildren::ReplaceChild (::accessibility::AccessibleShape* /* pCurrentChild */,
     const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& /* _rxShape */,
         const long /* _nIndex */, const ::accessibility::AccessibleShapeTreeInfo& /* _rShapeTreeInfo */)
         throw (uno::RuntimeException)
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index b1642a08eb0d..048db6dcd78a 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -801,7 +801,7 @@ void ChildrenManagerImpl::ViewForwarderChanged (ChangeType aChangeType,
 
 //=====  IAccessibleParent  ===================================================
 
-sal_Bool ChildrenManagerImpl::ReplaceChild (
+bool ChildrenManagerImpl::ReplaceChild (
     AccessibleShape* pCurrentChild,
     const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape,
     const long _nIndex,
@@ -818,7 +818,7 @@ sal_Bool ChildrenManagerImpl::ReplaceChild (
     if ( pNewChild )
         pNewChild->Init();
 
-    sal_Bool bResult = sal_False;
+    bool bResult = false;
 
     // Iterate over the visible children.  If one of them has an already
     // created accessible object that matches pCurrentChild then replace
@@ -844,7 +844,7 @@ sal_Bool ChildrenManagerImpl::ReplaceChild (
                 AccessibleEventId::CHILD,
                 uno::makeAny (I->mxAccessibleShape),
                 uno::Any());
-            bResult = sal_True;
+            bResult = true;
             break;
         }
     }
diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx
index e3ed8d5ddc05..4ef53b974fbc 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
@@ -290,7 +290,7 @@ public:
             The returned value indicates whether the replacement has been
             finished successfully.
     */
-    virtual sal_Bool ReplaceChild (
+    virtual bool ReplaceChild (
         AccessibleShape* pCurrentChild,
         const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape,
         const long _nIndex,
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 3ed260501b66..6289eddbea26 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -727,16 +727,16 @@ EnhancedCustomShape2d::EnhancedCustomShape2d( SdrObject* pAObj ) :
     nCoordTop           ( 0 ),
     nCoordWidthG        ( 21600 ),
     nCoordHeightG       ( 21600 ),
-    bOOXMLShape         ( sal_False ),
+    bOOXMLShape         ( false ),
     nXRef               ( 0x80000000 ),
     nYRef               ( 0x80000000 ),
     nFlags              ( 0 ),
     nColorData          ( 0 ),
-    bTextFlow           ( sal_False ),
+    bTextFlow           ( false ),
     bFilled             ( ((const XFillStyleItem&)pAObj->GetMergedItem( XATTR_FILLSTYLE )).GetValue() != XFILL_NONE ),
     bStroked            ( ((const XLineStyleItem&)pAObj->GetMergedItem( XATTR_LINESTYLE )).GetValue() != XLINE_NONE ),
-    bFlipH              ( sal_False ),
-    bFlipV              ( sal_False )
+    bFlipH              ( false ),
+    bFlipV              ( false )
 {
     // bTextFlow needs to be set before clearing the TextDirection Item
 
@@ -841,7 +841,7 @@ EnhancedCustomShape2d::EnhancedCustomShape2d( SdrObject* pAObj ) :
         vEquationResults.resize( nLength );
         for ( i = 0; i < seqEquations.getLength(); i++ )
         {
-            vEquationResults[ i ].bReady = sal_False;
+            vEquationResults[ i ].bReady = false;
             try
             {
                 vNodesSharedPtr[ i ] = EnhancedCustomShape::FunctionParser::parseFunction( seqEquations[ i ], *this );
@@ -1456,8 +1456,8 @@ static basegfx::B2DPolygon CreateArc( const Rectangle& rRect, const Point& rStar
 }
 
 void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegmentInd, std::vector< SdrPathObj* >& rObjectList,
-                                           const sal_Bool bLineGeometryNeededOnly,
-                                           const sal_Bool bSortFilledObjectsToBack,
+                                           const bool bLineGeometryNeededOnly,
+                                           const bool bSortFilledObjectsToBack,
                                            sal_Int32 nIndex )
 {
     bool bNoFill = false;
@@ -2209,7 +2209,7 @@ void EnhancedCustomShape2d::AdaptObjColor(SdrPathObj& rObj, const SfxItemSet& rC
     }
 }
 
-SdrObject* EnhancedCustomShape2d::CreatePathObj( sal_Bool bLineGeometryNeededOnly )
+SdrObject* EnhancedCustomShape2d::CreatePathObj( bool bLineGeometryNeededOnly )
 {
     sal_Int32 nCoordSize = seqCoordinates.getLength();
     if ( !nCoordSize )
@@ -2351,7 +2351,7 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( sal_Bool bLineGeometryNeededOnl
     return pRet;
 }
 
-SdrObject* EnhancedCustomShape2d::CreateObject( sal_Bool bLineGeometryNeededOnly )
+SdrObject* EnhancedCustomShape2d::CreateObject( bool bLineGeometryNeededOnly )
 {
     SdrObject* pRet = NULL;
 
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index d090cfe089bf..8dd6a0482e34 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -6194,9 +6194,9 @@ static const sal_uInt16 mso_DefaultFillingTable[] =
 {
     0x0000, 0x0018, 0x01ff, 0x0000, 0x0c00, 0x01e0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0600, 0x0000, 0x0000, 0x0000, 0x0000
 };
-sal_Bool IsCustomShapeFilledByDefault( MSO_SPT eSpType )
+bool IsCustomShapeFilledByDefault( MSO_SPT eSpType )
 {
-    sal_Bool bIsFilledByDefault = sal_True;
+    bool bIsFilledByDefault = true;
     sal_uInt32 i = (sal_uInt32)eSpType;
     if ( i < 0x100 )
         bIsFilledByDefault = ( mso_DefaultFillingTable[ i >> 4 ] & ( 1 << ( i & 0xf ) ) ) == 0;
@@ -6239,9 +6239,9 @@ static const sal_uInt16 mso_DefaultStrokingTable[] =
     0x0000, 0x0000, 0x0000, 0x0000
 };
 // #i28269#
-sal_Bool IsCustomShapeStrokedByDefault( MSO_SPT eSpType )
+bool IsCustomShapeStrokedByDefault( MSO_SPT eSpType )
 {
-    sal_Bool bIsStrokedByDefault = sal_True;
+    bool bIsStrokedByDefault = true;
     sal_uInt32 i = (sal_uInt32)eSpType;
     if ( i < 0x100 )
         bIsStrokedByDefault = ( mso_DefaultStrokingTable[ i >> 4 ] & ( 1 << ( i & 0xf ) ) ) == 0;
@@ -6252,9 +6252,9 @@ static const sal_uInt16 msoSortFilledObjectsToBackTable[] =
 {
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0010, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
 };
-sal_Bool SortFilledObjectsToBackByDefault( MSO_SPT eSpType )
+bool SortFilledObjectsToBackByDefault( MSO_SPT eSpType )
 {
-    sal_Bool bSortFilledObjectsToBackByDefault = sal_True;
+    bool bSortFilledObjectsToBackByDefault = true;
     sal_uInt32 i = (sal_uInt32)eSpType;
     if ( i < 0x100 )
         bSortFilledObjectsToBackByDefault = ( msoSortFilledObjectsToBackTable[ i >> 4 ] & ( 1 << ( i & 0xf ) ) ) != 0;
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 5d4a38625143..a1f926a1a582 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -577,7 +577,7 @@ bool SvxBmpMask::Close()
 
 
 
-sal_Bool SvxBmpMask::NeedsColorList() const
+bool SvxBmpMask::NeedsColorList() const
 {
     return ( aLbColor1.GetEntryCount() == 0 );
 }
@@ -656,7 +656,7 @@ void SvxBmpMask::PipetteClicked()
 
 
 
-void SvxBmpMask::SetExecState( sal_Bool bEnable )
+void SvxBmpMask::SetExecState( bool bEnable )
 {
     pData->SetExecState( bEnable );
 
@@ -1199,7 +1199,7 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic )
 
 
 
-sal_Bool SvxBmpMask::IsEyedropping() const
+bool SvxBmpMask::IsEyedropping() const
 {
     return aTbxPipette.IsItemChecked( TBI_PIPETTE );
 }
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index 74d1a423ca66..8f9f5056d940 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -60,7 +60,7 @@ SvxOrientationItem::SvxOrientationItem( const SvxCellOrientation eOrientation,
 {
 }
 
-SvxOrientationItem::SvxOrientationItem( sal_Int32 nRotation, sal_Bool bStacked, const sal_uInt16 nId ) :
+SvxOrientationItem::SvxOrientationItem( sal_Int32 nRotation, bool bStacked, const sal_uInt16 nId ) :
     SfxEnumItem( nId )
 {
     SetFromRotation( nRotation, bStacked );
@@ -161,7 +161,7 @@ sal_uInt16 SvxOrientationItem::GetValueCount() const
 
 
 
-sal_Bool SvxOrientationItem::IsStacked() const
+bool SvxOrientationItem::IsStacked() const
 {
     return static_cast< SvxCellOrientation >( GetValue() ) == SVX_ORIENTATION_STACKED;
 }
@@ -178,7 +178,7 @@ sal_Int32 SvxOrientationItem::GetRotation( sal_Int32 nStdAngle ) const
     return nAngle;
 }
 
-void SvxOrientationItem::SetFromRotation( sal_Int32 nRotation, sal_Bool bStacked )
+void SvxOrientationItem::SetFromRotation( sal_Int32 nRotation, bool bStacked )
 {
     if( bStacked )
     {
@@ -393,34 +393,30 @@ bool SvxMarginItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 
 
 
-sal_Bool SvxMarginItem::SetLeftMargin( sal_Int16 nLeft )
+void SvxMarginItem::SetLeftMargin( sal_Int16 nLeft )
 {
     nLeftMargin = nLeft;
-    return sal_True;
 }
 
 
 
-sal_Bool SvxMarginItem::SetTopMargin( sal_Int16 nTop )
+void SvxMarginItem::SetTopMargin( sal_Int16 nTop )
 {
     nTopMargin = nTop;
-    return sal_True;
 }
 
 
 
-sal_Bool SvxMarginItem::SetRightMargin( sal_Int16 nRight )
+void SvxMarginItem::SetRightMargin( sal_Int16 nRight )
 {
     nRightMargin = nRight;
-    return sal_True;
 }
 
 
 
-sal_Bool SvxMarginItem::SetBottomMargin( sal_Int16 nBottom )
+void SvxMarginItem::SetBottomMargin( sal_Int16 nBottom )
 {
     nBottomMargin = nBottom;
-    return sal_True;
 }
 
 
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 0ae93339113d..2562697f6c42 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -492,7 +492,7 @@ sal_Bool SdrObjCustomShape::UseNoFillStyle() const
     Any* pAny = rGeometryItem.GetPropertyValueByName( sType );
     if ( pAny )
         *pAny >>= sShapeType;
-    bRet = IsCustomShapeFilledByDefault( EnhancedCustomShapeTypeNames::Get( sType ) ) == 0;
+    bRet = IsCustomShapeFilledByDefault( EnhancedCustomShapeTypeNames::Get( sType ) ) == false;
 
     return bRet;
 }
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 3a168227e6af..08e8a3756f7a 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -271,7 +271,7 @@ public:
     virtual Size PixelToLogic (const Size& rSize) const;
 
     // IAccessibleParent
-    virtual sal_Bool ReplaceChild (
+    virtual bool ReplaceChild (
         ::accessibility::AccessibleShape* pCurrentChild,
         const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape,
         const long _nIndex,
@@ -312,7 +312,7 @@ private:
     void GetMapMode( const Point& _rPoint,
                      MapMode&     _orMapMode ) const;
 public:
-    virtual sal_Bool IsDocumentSelAll();
+    virtual bool IsDocumentSelAll();
 
     ::com::sun::star::uno::WeakReference < ::com::sun::star::accessibility::XAccessible >
         GetCursorContext() const { return mxCursorContext; }
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 8717d7e3e1a6..423e9265ef7e 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -3217,7 +3217,7 @@ Size SwAccessibleMap::PixelToLogic( const Size& rSize ) const
     return aSize;
 }
 
-sal_Bool SwAccessibleMap::ReplaceChild (
+bool SwAccessibleMap::ReplaceChild (
         ::accessibility::AccessibleShape* pCurrentChild,
         const uno::Reference< drawing::XShape >& _rxShape,
         const long /*_nIndex*/,
@@ -3245,7 +3245,7 @@ sal_Bool SwAccessibleMap::ReplaceChild (
         }
     }
     if( !pObj )
-        return sal_False;
+        return false;
 
     uno::Reference < drawing::XShape > xShape( _rxShape );  // keep reference to shape, because
                                                             // we might be the only one that
@@ -3292,7 +3292,7 @@ sal_Bool SwAccessibleMap::ReplaceChild (
     SwRect aEmptyRect;
     InvalidatePosOrSize( 0, pObj, 0, aEmptyRect );
 
-    return sal_True;
+    return true;
 }
 
 //Get the accessible control shape from the model object, here model object is with XPropertySet type
@@ -3629,7 +3629,7 @@ const SwRect& SwAccessibleMap::GetVisArea() const
            : GetShell()->VisArea();
 }
 
-sal_Bool SwAccessibleMap::IsDocumentSelAll()
+bool SwAccessibleMap::IsDocumentSelAll()
 {
     return GetShell()->GetDoc()->IsPrepareSelAll();
 }