oox: sal_Bool->bool

Change-Id: If611cf344d82640b284c159e2e6394074b30e2db

7 files changed, 42 insertions, 42 deletions

diff --git a/include/oox/drawingml/clrscheme.hxx b/include/oox/drawingml/clrscheme.hxx
index 2ebddb4d5f51..352f5682ebac 100644
--- a/include/oox/drawingml/clrscheme.hxx
+++ b/include/oox/drawingml/clrscheme.hxx
@@ -34,7 +34,7 @@ class ClrMap
 
 public:
 
-    sal_Bool getColorMap( sal_Int32& nClrToken );
+    bool     getColorMap( sal_Int32& nClrToken );
     void     setColorMap( sal_Int32 nClrToken, sal_Int32 nMappedClrToken );
 };
 
@@ -49,7 +49,7 @@ public:
     ClrScheme();
     ~ClrScheme();
 
-    sal_Bool getColor( sal_Int32 nSchemeClrToken, sal_Int32& rColor ) const;
+    bool     getColor( sal_Int32 nSchemeClrToken, sal_Int32& rColor ) const;
     void     setColor( sal_Int32 nSchemeClrToken, sal_Int32 nColor );
 };
 
diff --git a/include/oox/drawingml/customshapeproperties.hxx b/include/oox/drawingml/customshapeproperties.hxx
index fdf8d49196eb..8e237b26956a 100644
--- a/include/oox/drawingml/customshapeproperties.hxx
+++ b/include/oox/drawingml/customshapeproperties.hxx
@@ -56,7 +56,7 @@ struct CustomShapeGuide
 
 struct AdjustHandle
 {
-    sal_Bool                                polar;
+    bool                                    polar;
     com::sun::star::drawing::EnhancedCustomShapeParameterPair
                                             pos;
 
@@ -72,7 +72,7 @@ struct AdjustHandle
     OptValue< com::sun::star::drawing::EnhancedCustomShapeParameter >
                                             max2;   // maxY     or maxAng
 
-    AdjustHandle( sal_Bool bPolar ) : polar( bPolar ) {};
+    AdjustHandle( bool bPolar ) : polar( bPolar ) {};
 };
 
 struct ConnectionSite
@@ -96,11 +96,11 @@ struct Path2D
     sal_Int64   w;
     sal_Int64   h;
     sal_Int32   fill;
-    sal_Bool    stroke;
-    sal_Bool    extrusionOk;
+    bool        stroke;
+    bool        extrusionOk;
     std::vector< com::sun::star::drawing::EnhancedCustomShapeParameterPair > parameter;
 
-    Path2D() : w( 0 ), h( 0 ), fill( XML_norm ), stroke( sal_True ), extrusionOk( sal_True ) {};
+    Path2D() : w( 0 ), h( 0 ), fill( XML_norm ), stroke( true ), extrusionOk( true ) {};
 };
 
 
@@ -135,8 +135,8 @@ public:
     sal_Int32 getShapePresetType() const { return mnShapePresetType; }
     OUString getShapePresetTypeName() const;
     void setShapePresetType( sal_Int32 nShapePresetType ){ mnShapePresetType = nShapePresetType; };
-    sal_Bool                            getShapeTypeOverride(){ return mbShapeTypeOverride; };
-    void                                setShapeTypeOverride( sal_Bool bShapeTypeOverride ) { mbShapeTypeOverride = bShapeTypeOverride; };
+    bool                                getShapeTypeOverride(){ return mbShapeTypeOverride; };
+    void                                setShapeTypeOverride( bool bShapeTypeOverride ) { mbShapeTypeOverride = bShapeTypeOverride; };
 
     std::vector< CustomShapeGuide >&    getAdjustmentGuideList(){ return maAdjustmentGuideList; };
     std::vector< CustomShapeGuide >&    getGuideList(){ return maGuideList; };
@@ -145,8 +145,8 @@ public:
     OptValue< GeomRect >&               getTextRect(){ return maTextRect; };
     std::vector< Path2D >&              getPath2DList(){ return maPath2DList; };
     std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment >& getSegments(){ return maSegments; };
-    void                                setMirroredX( sal_Bool bMirroredX ) { mbMirroredX = bMirroredX; };
-    void                                setMirroredY( sal_Bool bMirroredY ) { mbMirroredY = bMirroredY; };
+    void                                setMirroredX( bool bMirroredX ) { mbMirroredX = bMirroredX; };
+    void                                setMirroredY( bool bMirroredY ) { mbMirroredY = bMirroredY; };
     void                                setTextRotateAngle( sal_Int32 nAngle ) { mnTextRotateAngle = nAngle; };
 
     static sal_Int32 SetCustomShapeGuideValue( std::vector< CustomShapeGuide >& rGuideList, const CustomShapeGuide& rGuide );
@@ -157,7 +157,7 @@ public:
 private:
 
     sal_Int32                       mnShapePresetType;
-    sal_Bool                        mbShapeTypeOverride;
+    bool                            mbShapeTypeOverride;
     std::vector< CustomShapeGuide > maAdjustmentGuideList;
     std::vector< CustomShapeGuide > maGuideList;
     std::vector< AdjustHandle >     maAdjustHandleList;
@@ -167,8 +167,8 @@ private:
 
     std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment >
                                     maSegments;
-    sal_Bool                        mbMirroredX;
-    sal_Bool                        mbMirroredY;
+    bool                            mbMirroredX;
+    bool                            mbMirroredY;
     sal_Int32                       mnTextRotateAngle;
 
     typedef boost::unordered_map< sal_Int32, CustomShapeProvider * > PresetsMap;
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 2d0cb4560a3e..5b5966bd67a9 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -97,7 +97,7 @@ public:
 
     table::TablePropertiesPtr       getTableProperties();
 
-    EffectProperties&        getEffectProperties() { return *mpEffectPropertiesPtr; }
+    EffectProperties&               getEffectProperties() { return *mpEffectPropertiesPtr; }
 
     void                              setChildPosition( com::sun::star::awt::Point nPosition ){ maChPosition = nPosition; }
     void                              setChildSize( com::sun::star::awt::Size aSize ){ maChSize = aSize; }
@@ -109,17 +109,17 @@ public:
     const com::sun::star::awt::Size&  getSize() const { return maSize; }
 
     void                            setRotation( sal_Int32 nRotation ) { mnRotation = nRotation; }
-    void                            setFlip( sal_Bool bFlipH, sal_Bool bFlipV ) { mbFlipH = bFlipH; mbFlipV = bFlipV; }
+    void                            setFlip( bool bFlipH, bool bFlipV ) { mbFlipH = bFlipH; mbFlipV = bFlipV; }
     void                            addChild( const ShapePtr pChildPtr ) { maChildren.push_back( pChildPtr ); }
     std::vector< ShapePtr >&        getChildren() { return maChildren; }
 
     void                            setName( const OUString& rName ) { msName = rName; }
-    OUString                 getName( ) { return msName; }
+    OUString                       getName( ) { return msName; }
     void                            setId( const OUString& rId ) { msId = rId; }
-    OUString                 getId() { return msId; }
-    void                            setHidden( sal_Bool bHidden ) { mbHidden = bHidden; }
-    sal_Bool                        getHidden() const { return mbHidden; };
-    void                            setHiddenMasterShape( sal_Bool bHiddenMasterShape ) { mbHiddenMasterShape = bHiddenMasterShape; }
+    OUString                        getId() { return msId; }
+    void                            setHidden( bool bHidden ) { mbHidden = bHidden; }
+    bool                            getHidden() const { return mbHidden; };
+    void                            setHiddenMasterShape( bool bHiddenMasterShape ) { mbHiddenMasterShape = bHiddenMasterShape; }
     void                            setSubType( sal_Int32 nSubType ) { mnSubType = nSubType; }
     sal_Int32                       getSubType() const { return mnSubType; }
     void                            setSubTypeIndex( sal_Int32 nSubTypeIndex ) { moSubTypeIndex = nSubTypeIndex; }
@@ -189,8 +189,8 @@ protected:
                             const Theme* pTheme,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
                             const ::com::sun::star::awt::Rectangle* pShapeRect,
-                            sal_Bool bClearText,
-                            sal_Bool bDoNotInsertEmptyTextBody,
+                            bool bClearText,
+                            bool bDoNotInsertEmptyTextBody,
                             basegfx::B2DHomMatrix& aTransformation,
                             FillProperties& rShapeOrParentShapeFillProps
                              );
@@ -230,7 +230,7 @@ protected:
     com::sun::star::awt::Point  maChPosition;             // only used for group shapes
     com::sun::star::awt::Size   maAbsoluteSize;           // only used for group shapes
     com::sun::star::awt::Point  maAbsolutePosition;       // only used for group shapes
-    sal_Bool                    mbIsChild;
+    bool                        mbIsChild;
 
     TextBodyPtr                 mpTextBody;
     LinePropertiesPtr           mpLinePropertiesPtr;
@@ -275,10 +275,10 @@ private:
     ChartShapeInfoRef   mxChartShapeInfo;   ///< Additional data for chart shapes.
 
     sal_Int32                       mnRotation;
-    sal_Bool                        mbFlipH;
-    sal_Bool                        mbFlipV;
-    sal_Bool                        mbHidden;
-    sal_Bool                        mbHiddenMasterShape; // master shapes can be hidden in layout slides
+    bool                            mbFlipH;
+    bool                            mbFlipV;
+    bool                            mbHidden;
+    bool                            mbHiddenMasterShape; // master shapes can be hidden in layout slides
                                                          // we need separate flag because we don't want
                                                          // to propagate it when applying reference shape
     bool mbLockedCanvas; ///< Is this shape part of a locked canvas?
diff --git a/oox/source/drawingml/clrscheme.cxx b/oox/source/drawingml/clrscheme.cxx
index 88ceccfb1269..d1018017ef4e 100644
--- a/oox/source/drawingml/clrscheme.cxx
+++ b/oox/source/drawingml/clrscheme.cxx
@@ -23,7 +23,7 @@
 
 namespace oox { namespace drawingml {
 
-sal_Bool ClrMap::getColorMap( sal_Int32& nClrToken )
+bool ClrMap::getColorMap( sal_Int32& nClrToken )
 {
     sal_Int32 nMapped = 0;
     std::map < sal_Int32, sal_Int32 >::const_iterator aIter( maClrMap.find( nClrToken ) );
@@ -32,10 +32,10 @@ sal_Bool ClrMap::getColorMap( sal_Int32& nClrToken )
     if ( nMapped )
     {
         nClrToken = nMapped;
-        return sal_True;
+        return true;
     }
     else
-        return sal_False;
+        return false;
 }
 
 void ClrMap::setColorMap( sal_Int32 nClrToken, sal_Int32 nMappedClrToken )
@@ -52,7 +52,7 @@ ClrScheme::~ClrScheme()
 {
 }
 
-sal_Bool ClrScheme::getColor( sal_Int32 nSchemeClrToken, sal_Int32& rColor ) const
+bool ClrScheme::getColor( sal_Int32 nSchemeClrToken, sal_Int32& rColor ) const
 {
     OSL_ASSERT((nSchemeClrToken & sal_Int32(0xFFFF0000))==0);
     switch( nSchemeClrToken )
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index dbbe6e7a129c..ce730d5468f9 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -785,13 +785,13 @@ ContextHandlerRef AdjustHandleListContext::onCreateContext( sal_Int32 aElementTo
 {
     if ( aElementToken == A_TOKEN( ahXY ) )         // CT_XYAdjustHandle
     {
-        AdjustHandle aAdjustHandle( sal_False );
+        AdjustHandle aAdjustHandle( false );
         mrAdjustHandleList.push_back( aAdjustHandle );
         return new XYAdjustHandleContext( *this, rAttribs, mrCustomShapeProperties, mrAdjustHandleList.back() );
     }
     else if ( aElementToken == A_TOKEN( ahPolar ) ) // CT_PolarAdjustHandle
     {
-        AdjustHandle aAdjustHandle( sal_True );
+        AdjustHandle aAdjustHandle( true );
         mrAdjustHandleList.push_back( aAdjustHandle );
         return new PolarAdjustHandleContext( *this, rAttribs, mrCustomShapeProperties, mrAdjustHandleList.back() );
     }
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index 52fa038c5fb2..ea02fefe701d 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -44,9 +44,9 @@ namespace oox { namespace drawingml {
 
 CustomShapeProperties::CustomShapeProperties()
 : mnShapePresetType ( -1 )
-, mbShapeTypeOverride(sal_False)
-, mbMirroredX   ( sal_False )
-, mbMirroredY   ( sal_False )
+, mbShapeTypeOverride(false)
+, mbMirroredX   ( false )
+, mbMirroredY   ( false )
 , mnTextRotateAngle ( 0 )
 , mnArcNum ( 0 )
 {
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index c6f14e95d1e9..2b9220a537c8 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -230,7 +230,7 @@ void Shape::addShape(
         if( !sServiceName.isEmpty() )
         {
             basegfx::B2DHomMatrix aMatrix( aTransformation );
-            Reference< XShape > xShape( createAndInsert( rFilterBase, sServiceName, pTheme, rxShapes, pShapeRect, sal_False, sal_False, aMatrix, rShapeOrParentShapeFillProps ) );
+            Reference< XShape > xShape( createAndInsert( rFilterBase, sServiceName, pTheme, rxShapes, pShapeRect, false, false, aMatrix, rShapeOrParentShapeFillProps ) );
 
             if( pShapeMap && !msId.isEmpty() )
             {
@@ -387,8 +387,8 @@ Reference< XShape > Shape::createAndInsert(
         const Theme* pTheme,
         const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
         const awt::Rectangle* /* pShapeRect */,
-        sal_Bool bClearText,
-        sal_Bool bDoNotInsertEmptyTextBody,
+        bool bClearText,
+        bool bDoNotInsertEmptyTextBody,
         basegfx::B2DHomMatrix& aParentTransformation,
         FillProperties& rShapeOrParentShapeFillProps )
 {
@@ -881,9 +881,9 @@ Reference< XShape > Shape::createAndInsert(
         if( bIsCustomShape )
         {
             if ( mbFlipH )
-                mpCustomShapePropertiesPtr->setMirroredX( sal_True );
+                mpCustomShapePropertiesPtr->setMirroredX( true );
             if ( mbFlipV )
-                mpCustomShapePropertiesPtr->setMirroredY( sal_True );
+                mpCustomShapePropertiesPtr->setMirroredY( true );
             if( getTextBody() )
             {
                 sal_Int32 nTextRotateAngle = static_cast< sal_Int32 >( getTextBody()->getTextProperties().moRotation.get( 0 ) );