sal_Bool to bool

Change-Id: I74d02b86664263519b4758511d885e35a8c9a78d

4 files changed, 19 insertions, 19 deletions

diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index c43d9d44c0e2..f1dc1d1d68ce 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -246,7 +246,7 @@ Point EnhancedCustomShape3d::Transformation2D::Transform2D( const basegfx::B3DPo
     return aPoint2D;
 }
 
-sal_Bool EnhancedCustomShape3d::Transformation2D::IsParallel() const
+bool EnhancedCustomShape3d::Transformation2D::IsParallel() const
 {
     return eProjectionMode == com::sun::star::drawing::ProjectionMode_PARALLEL;
 }
@@ -328,8 +328,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
 
         E3dScene* pScene = new E3dPolyScene( a3DDefaultAttr );
 
-        sal_Bool bSceneHasObjects ( sal_False );
-        sal_Bool bUseTwoFillStyles( sal_False );
+        bool bSceneHasObjects ( false );
+        bool bUseTwoFillStyles( false );
 
         drawing::ShadeMode eShadeMode( GetShadeMode( rGeometryItem, drawing::ShadeMode_FLAT ) );
         const rtl::OUString aExtrusionColor( "Color" );
@@ -353,7 +353,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
             if ( eFillStyle == XFILL_NONE )
                 aSet.Put( XFillStyleItem( XFILL_SOLID ) );
             else if ( ( eFillStyle == XFILL_BITMAP ) || ( eFillStyle == XFILL_GRADIENT ) || bUseExtrusionColor )
-                bUseTwoFillStyles = sal_True;
+                bUseTwoFillStyles = true;
 
             // #116336#
             // If shapes are mirrored once (mirroring two times correct geometry again)
@@ -370,7 +370,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
         while( aIter.IsMore() )
         {
             const SdrObject* pNext = aIter.Next();
-            sal_Bool bIsPlaceholderObject = (((XFillStyleItem&)pNext->GetMergedItem( XATTR_FILLSTYLE )).GetValue() == XFILL_NONE )
+            bool bIsPlaceholderObject = (((XFillStyleItem&)pNext->GetMergedItem( XATTR_FILLSTYLE )).GetValue() == XFILL_NONE )
                                         && (((XLineStyleItem&)pNext->GetMergedItem( XATTR_LINESTYLE )).GetValue() == XLINE_NONE );
             basegfx::B2DPolyPolygon aPolyPoly;
 
@@ -473,7 +473,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
                     p3DObj->SetMergedItem( Svx3DCloseBackItem( sal_False ) );
                 }
                 pScene->Insert3DObj( p3DObj );
-                bSceneHasObjects = sal_True;
+                bSceneHasObjects = true;
             }
         }
 
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.hxx b/svx/source/customshapes/EnhancedCustomShape3d.hxx
index 72cf8933c8f0..e629b0e12cd0 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.hxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.hxx
@@ -54,7 +54,7 @@ class EnhancedCustomShape3d
 
             basegfx::B3DPolygon ApplySkewSettings( const basegfx::B3DPolygon& rPolygon3D ) const;
             Point       Transform2D( const basegfx::B3DPoint& rPoint ) const;
-            sal_Bool    IsParallel() const;
+            bool    IsParallel() const;
     };
 
     friend class Transformation2D;
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index d6a829eea6bb..7c26fe15726b 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -80,17 +80,17 @@ struct FWData                           // representing the whole text
     double                              fHorizontalTextScaling;
     sal_uInt32                          nMaxParagraphsPerTextArea;
     sal_Int32                           nSingleLineHeight;
-    sal_Bool                            bSingleLineMode;
+    bool                            bSingleLineMode;
 };
 
 
-static sal_Bool InitializeFontWorkData( const SdrObject* pCustomShape, const sal_uInt16 nOutlinesCount2d, FWData& rFWData )
+static bool InitializeFontWorkData( const SdrObject* pCustomShape, const sal_uInt16 nOutlinesCount2d, FWData& rFWData )
 {
-    sal_Bool bNoErr = sal_False;
-    sal_Bool bSingleLineMode = sal_False;
+    bool bNoErr = false;
+    bool bSingleLineMode = false;
     sal_uInt16 nTextAreaCount = nOutlinesCount2d;
     if ( nOutlinesCount2d & 1 )
-        bSingleLineMode = sal_True;
+        bSingleLineMode = true;
     else
         nTextAreaCount >>= 1;
 
@@ -124,7 +124,7 @@ static sal_Bool InitializeFontWorkData( const SdrObject* pCustomShape, const sal
                 nParagraphsLeft -= nParagraphs;
                 nTextAreaCount--;
             }
-            bNoErr = sal_True;
+            bNoErr = true;
         }
     }
     return bNoErr;
@@ -149,10 +149,10 @@ void CalculateHorizontalScalingFactor( const SdrObject* pCustomShape,
                                         FWData& rFWData, const PolyPolygon& rOutline2d )
 {
     double fScalingFactor = 1.0;
-    sal_Bool bScalingFactorDefined = sal_False;
+    bool bScalingFactorDefined = false;
 
     sal_uInt16 i = 0;
-    sal_Bool bSingleLineMode = sal_False;
+    bool bSingleLineMode = false;
     sal_uInt16 nOutlinesCount2d = rOutline2d.Count();
 
     Font aFont;
@@ -170,7 +170,7 @@ void CalculateHorizontalScalingFactor( const SdrObject* pCustomShape,
     aVirDev.SetFont( aFont );
 
     if ( nOutlinesCount2d & 1 )
-        bSingleLineMode = sal_True;
+        bSingleLineMode = true;
 
     std::vector< FWTextArea >::iterator aTextAreaIter = rFWData.vTextAreas.begin();
     std::vector< FWTextArea >::iterator aTextAreaIEnd = rFWData.vTextAreas.end();
@@ -194,7 +194,7 @@ void CalculateHorizontalScalingFactor( const SdrObject* pCustomShape,
                 if ( !bScalingFactorDefined )
                 {
                     fScalingFactor = fScale;
-                    bScalingFactorDefined = sal_True;
+                    bScalingFactorDefined = true;
                 }
                 else
                 {
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index a44ab765761c..cc8038e89385 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -583,8 +583,8 @@ public:
                 }
                 else
                 {
-                    sal_Bool bFirstIsEmpty = mpFirstArg->isConstant() && ( (*mpFirstArg)() == 0 );
-                    sal_Bool bSecondIsEmpty = mpSecondArg->isConstant() && ( (*mpSecondArg)() == 0 );
+                    bool bFirstIsEmpty = mpFirstArg->isConstant() && ( (*mpFirstArg)() == 0 );
+                    bool bSecondIsEmpty = mpSecondArg->isConstant() && ( (*mpSecondArg)() == 0 );
 
                     if ( bFirstIsEmpty )
                         aRet = mpSecondArg->fillNode( rEquations, NULL, nFlags );