From 8ee4af289f079c1314cdc4f3c370f04f4275f902 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 1 Apr 2014 13:41:19 +0200
Subject: oox: sal_Bool->bool

Change-Id: If611cf344d82640b284c159e2e6394074b30e2db
---
 oox/source/drawingml/clrscheme.cxx             |  8 ++++----
 oox/source/drawingml/customshapegeometry.cxx   |  4 ++--
 oox/source/drawingml/customshapeproperties.cxx |  6 +++---
 oox/source/drawingml/shape.cxx                 | 10 +++++-----
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'oox')

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 ) );
-- 
cgit