svx: sal_Bool->bool

Change-Id: I464eba5fd5521c31868c6fc8a2137f17428d421e

4 files changed, 31 insertions, 31 deletions

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 299cc4c39433..26d4156d34c0 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -466,7 +466,7 @@ bool EnhancedCustomShape2d::ConvertSequenceToEnhancedCustomShape2dHandle(
             }
             else if ( rPropVal.Name == sMirroredX )
             {
-                sal_Bool bMirroredX = sal_Bool();
+                bool bMirroredX;
                 if ( rPropVal.Value >>= bMirroredX )
                 {
                     if ( bMirroredX )
@@ -475,7 +475,7 @@ bool EnhancedCustomShape2d::ConvertSequenceToEnhancedCustomShape2dHandle(
             }
             else if ( rPropVal.Name == sMirroredY )
             {
-                sal_Bool bMirroredY = sal_Bool();
+                bool bMirroredY;
                 if ( rPropVal.Value >>= bMirroredY )
                 {
                     if ( bMirroredY )
@@ -484,7 +484,7 @@ bool EnhancedCustomShape2d::ConvertSequenceToEnhancedCustomShape2dHandle(
             }
             else if ( rPropVal.Name == sSwitched )
             {
-                sal_Bool bSwitched = sal_Bool();
+                bool bSwitched;
                 if ( rPropVal.Value >>= bSwitched )
                 {
                     if ( bSwitched )
@@ -1411,7 +1411,7 @@ void EnhancedCustomShape2d::SwapStartAndEndArrow( SdrObject* pObj ) //#108274
     pObj->SetMergedItem( aLineEndCenter );
 }
 
-static basegfx::B2DPolygon CreateArc( const Rectangle& rRect, const Point& rStart, const Point& rEnd, const sal_Bool bClockwise, sal_Bool bFullCircle = sal_False )
+static basegfx::B2DPolygon CreateArc( const Rectangle& rRect, const Point& rStart, const Point& rEnd, const bool bClockwise, bool bFullCircle = false )
 {
     Rectangle aRect( rRect );
     Point aStart( rStart );
@@ -1683,7 +1683,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
                                 double fy1 = ( -sin( fStartAngle * F_PI180 ) * 65536.0 * fYScale ) + fCenterY;
                                 double fx2 = ( cos( fEndAngle * F_PI180 ) * 65536.0 * fXScale ) + fCenterX;
                                 double fy2 = ( -sin( fEndAngle * F_PI180 ) * 65536.0 * fYScale ) + fCenterY;
-                                aNewB2DPolygon.append(CreateArc( aRect, Point( (sal_Int32)fx1, (sal_Int32)fy1 ), Point( (sal_Int32)fx2, (sal_Int32)fy2 ), sal_False));
+                                aNewB2DPolygon.append(CreateArc( aRect, Point( (sal_Int32)fx1, (sal_Int32)fy1 ), Point( (sal_Int32)fx2, (sal_Int32)fy2 ), false));
                             }
                             else
                             {   /* SJ: TODO: this block should be replaced sometimes, because the current point
@@ -1784,7 +1784,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
                 case ARCTO :
                 case CLOCKWISEARCTO :
                 {
-                    sal_Bool bClockwise = ( nCommand == CLOCKWISEARC ) || ( nCommand == CLOCKWISEARCTO );
+                    bool bClockwise = ( nCommand == CLOCKWISEARC ) || ( nCommand == CLOCKWISEARCTO );
                     sal_uInt32 nXor = bClockwise ? 3 : 2;
                     for ( sal_uInt16 i = 0; ( i < nPntCount ) && ( ( rSrcPt + 3 ) < nCoordSize ); i++ )
                     {
@@ -1825,7 +1825,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
 
                         OSL_TRACE("ARCANGLETO scale: %f x %f angles: %f, %f", fWR, fHR, fStartAngle, fSwingAngle);
 
-                        sal_Bool bClockwise = fSwingAngle >= 0.0;
+                        bool bClockwise = fSwingAngle >= 0.0;
 
                         if (aNewB2DPolygon.count() > 0)
                         {
@@ -2219,7 +2219,7 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( bool bLineGeometryNeededOnly )
     sal_uInt16 nSegmentInd = 0;
 
     std::vector< SdrPathObj* > vObjectList;
-    sal_Bool bSortFilledObjectsToBack = SortFilledObjectsToBackByDefault( eSpType );
+    bool bSortFilledObjectsToBack = SortFilledObjectsToBackByDefault( eSpType );
 
     sal_Int32 nSubPathIndex = 0;
 
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 1e3622f6373a..9f4c4e7fdda3 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -149,9 +149,9 @@ drawing::ShadeMode GetShadeMode( SdrCustomShapeGeometryItem& rItem, const drawin
     return eRet;
 }
 
-sal_Bool GetBool( SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, const sal_Bool bDefault )
+bool GetBool( SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, const bool bDefault )
 {
-    sal_Bool bRetValue = bDefault;
+    bool bRetValue = bDefault;
     const Any* pAny = rItem.GetPropertyValueByName( OUString(aExtrusion), rPropertyName );
     if ( pAny )
         *pAny >>= bRetValue;
@@ -283,10 +283,10 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
             pMap = &fMap;
         }
     }
-    if ( GetBool( rGeometryItem, aExtrusion, sal_False ) )
+    if ( GetBool( rGeometryItem, aExtrusion, false ) )
     {
-        sal_Bool bIsMirroredX = ((SdrObjCustomShape*)pCustomShape)->IsMirroredX();
-        sal_Bool bIsMirroredY = ((SdrObjCustomShape*)pCustomShape)->IsMirroredY();
+        bool bIsMirroredX = ((SdrObjCustomShape*)pCustomShape)->IsMirroredX();
+        bool bIsMirroredY = ((SdrObjCustomShape*)pCustomShape)->IsMirroredY();
         Rectangle aSnapRect( pCustomShape->GetLogicRect() );
         long nObjectRotation = pCustomShape->GetRotateAngle();
         if ( nObjectRotation )
@@ -341,7 +341,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
 
         drawing::ShadeMode eShadeMode( GetShadeMode( rGeometryItem, drawing::ShadeMode_FLAT ) );
         const OUString aExtrusionColor( "Color" );
-        sal_Bool bUseExtrusionColor = GetBool( rGeometryItem, aExtrusionColor, sal_False );
+        bool bUseExtrusionColor = GetBool( rGeometryItem, aExtrusionColor, false );
 
         XFillStyle eFillStyle( ITEMVALUE( aSet, XATTR_FILLSTYLE, XFillStyleItem ) );
         pScene->GetProperties().SetObjectItem( Svx3DShadeModeItem( 0 ) );
@@ -499,7 +499,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
                 else if ( bUseTwoFillStyles )
                 {
                     BitmapEx aFillBmp;
-                    sal_Bool bFillBmpTile = ((XFillBmpTileItem&)p3DObj->GetMergedItem( XATTR_FILLBMP_TILE )).GetValue();
+                    bool bFillBmpTile = ((XFillBmpTileItem&)p3DObj->GetMergedItem( XATTR_FILLBMP_TILE )).GetValue();
                     if ( bFillBmpTile )
                     {
                         const XFillBitmapItem& rBmpItm = (XFillBitmapItem&)p3DObj->GetMergedItem(XATTR_FILLBITMAP);
@@ -679,7 +679,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
             double fLightIntensity = GetDouble( rGeometryItem, sFirstLightLevel, 43712.0 / 655.36, NULL ) / 100.0;
 
             const OUString sFirstLightHarsh( "FirstLightHarsh" );
-            /* sal_Bool bFirstLightHarsh = */ GetBool( rGeometryItem, sFirstLightHarsh, sal_False );
+            /* sal_Bool bFirstLightHarsh = */ GetBool( rGeometryItem, sFirstLightHarsh, false );
 
             const OUString sSecondLightDirection( "SecondLightDirection" );
             drawing::Direction3D aSecondLightDirectionDefault( -50000, 0, 10000 );
@@ -692,8 +692,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
 
             const OUString sSecondLightHarsh( "SecondLightHarsh" );
             const OUString sLightFace( "LightFace" );
-            /* sal_Bool bLight2Harsh = */ GetBool( rGeometryItem, sSecondLightHarsh, sal_False );
-            /* sal_Bool bLightFace = */ GetBool( rGeometryItem, sLightFace, sal_False );
+            /* sal_Bool bLight2Harsh = */ GetBool( rGeometryItem, sSecondLightHarsh, false );
+            /* sal_Bool bLightFace = */ GetBool( rGeometryItem, sLightFace, false );
 
             sal_uInt16 nAmbientColor = (sal_uInt16)( fAmbientIntensity * 255.0 );
             if ( nAmbientColor > 255 )
@@ -727,7 +727,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
             const OUString sSpecularity( "Specularity" );
             const OUString sMetal( "Metal" );
             double fSpecular = GetDouble( rGeometryItem, sSpecularity, 0, NULL ) / 100;
-            sal_Bool bMetal = GetBool( rGeometryItem, sMetal, sal_False );
+            bool bMetal = GetBool( rGeometryItem, sMetal, false );
 
             Color aSpecularCol( 225,225,225 );
             if ( bMetal )
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index da3c5df7e87e..4835d60e18ac 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -70,7 +70,7 @@ class EnhancedCustomShapeEngine : public cppu::WeakImplHelper3
 >
 {
     css::uno::Reference< css::drawing::XShape >      mxShape;
-    sal_Bool                                    mbForceGroupWithText;
+    bool                                    mbForceGroupWithText;
 
     SdrObject* ImplForceGroupWithText( const SdrObjCustomShape* pCustoObj, SdrObject* pRenderedShape );
 
@@ -106,7 +106,7 @@ public:
 };
 
 EnhancedCustomShapeEngine::EnhancedCustomShapeEngine() :
-    mbForceGroupWithText    ( sal_False )
+    mbForceGroupWithText    ( false )
 {
 }
 EnhancedCustomShapeEngine::~EnhancedCustomShapeEngine()
@@ -281,7 +281,7 @@ Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render()
         // retrieving the TextPath property to check if feature is enabled
         SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)
             pSdrObjCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
-        sal_Bool bTextPathOn = sal_False;
+        bool bTextPathOn = false;
         const OUString sTextPath( "TextPath" );
         uno::Any* pAny = rGeometryItem.GetPropertyValueByName( sTextPath, sTextPath );
         if ( pAny )
@@ -291,9 +291,9 @@ Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render()
         sal_Int32 nRotateAngle = aCustomShape2d.GetRotateAngle();
         bool bPostRotateAngle = aCustomShape2d.IsPostRotate();
 
-        sal_Bool bFlipV = aCustomShape2d.IsFlipVert();
-        sal_Bool bFlipH = aCustomShape2d.IsFlipHorz();
-        sal_Bool bLineGeometryNeededOnly = bTextPathOn;
+        bool bFlipV = aCustomShape2d.IsFlipVert();
+        bool bFlipH = aCustomShape2d.IsFlipHorz();
+        bool bLineGeometryNeededOnly = bTextPathOn;
 
         SdrObject* pRenderedShape = aCustomShape2d.CreateObject( bLineGeometryNeededOnly );
         if ( pRenderedShape )
@@ -310,7 +310,7 @@ Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render()
             SdrObject* pRenderedShape3d = EnhancedCustomShape3d::Create3DObject( pRenderedShape, pSdrObjCustomShape );
             if ( pRenderedShape3d )
             {
-                bFlipV = bFlipH = sal_False;
+                bFlipV = bFlipH = false;
                 nRotateAngle = 0;
                 SdrObject::Free( pRenderedShape );
                 pRenderedShape = pRenderedShape3d;
@@ -403,8 +403,8 @@ drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEngine::getLineGeom
         if ( pObj )
         {
             Rectangle aRect( pSdrObjCustomShape->GetSnapRect() );
-            sal_Bool bFlipV = aCustomShape2d.IsFlipVert();
-            sal_Bool bFlipH = aCustomShape2d.IsFlipHorz();
+            bool bFlipV = aCustomShape2d.IsFlipVert();
+            bool bFlipH = aCustomShape2d.IsFlipHorz();
 
             const GeoStat& rGeoStat = ((SdrObjCustomShape*)pSdrObjCustomShape)->GetGeoStat();
             if ( rGeoStat.nShearWink )
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index e5278e3997d8..1f5aa6a5bcd5 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -208,9 +208,9 @@ void CalculateHorizontalScalingFactor( const SdrObject* pCustomShape,
     rFWData.fHorizontalTextScaling = fScalingFactor;
 }
 
-void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, FWTextArea& rTextArea, sal_Bool bSameLetterHeights )
+void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, FWTextArea& rTextArea, bool bSameLetterHeights )
 {
-    sal_Bool bIsVertical = ((SdrObjCustomShape*)pCustomShape)->IsVerticalWriting();
+    bool bIsVertical = ((SdrObjCustomShape*)pCustomShape)->IsVerticalWriting();
     sal_Int32 nVerticalOffset = rFWData.nMaxParagraphsPerTextArea > rTextArea.vParagraphs.size()
                                     ? rFWData.nSingleLineHeight / 2 : 0;
 
@@ -423,7 +423,7 @@ void GetFontWorkOutline( FWData& rFWData, const SdrObject* pCustomShape )
     rFWData.nSingleLineHeight = (sal_Int32)( ( (double)pCustomShape->GetLogicRect().GetHeight()
                                                 / rFWData.nMaxParagraphsPerTextArea ) * rFWData.fHorizontalTextScaling );
 
-    sal_Bool bSameLetterHeights = sal_False;
+    bool bSameLetterHeights = false;
     SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
     const OUString sTextPath( "TextPath"  );
     const OUString sSameLetterHeights( "SameLetterHeights"  );