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

2 files changed, 15 insertions, 15 deletions

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;