oox: sal_Bool->bool

Change-Id: I50788585dbcc489325dc9536a8e4d974a710e30d

4 files changed, 67 insertions, 67 deletions

diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 54733eab4cf4..73ebb8e0eccf 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -248,7 +248,7 @@ Reference< chart2::data::XLabeledDataSequence >
     return aNoResult;
 }
 
-Reference< chart2::data::XDataSource > lcl_pressUsedDataIntoRectangularFormat( const Reference< chart2::XChartDocument >& xChartDoc, sal_Bool& rOutSourceHasCategoryLabels )
+Reference< chart2::data::XDataSource > lcl_pressUsedDataIntoRectangularFormat( const Reference< chart2::XChartDocument >& xChartDoc, bool& rOutSourceHasCategoryLabels )
 {
     ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aLabeledSeqVector;
 
@@ -257,7 +257,7 @@ Reference< chart2::data::XDataSource > lcl_pressUsedDataIntoRectangularFormat( c
     Reference< chart2::data::XLabeledDataSequence > xCategories( lcl_getCategories( xDiagram ) );
     if( xCategories.is() )
         aLabeledSeqVector.push_back( xCategories );
-    rOutSourceHasCategoryLabels = sal_Bool(xCategories.is());
+    rOutSourceHasCategoryLabels = xCategories.is();
 
     Sequence< Reference< chart2::data::XLabeledDataSequence > > aSeriesSeqVector(
             lcl_getAllSeriesSequences( xChartDoc ) );
@@ -441,9 +441,9 @@ ChartExport::ChartExport( sal_Int32 nXmlNamespace, FSHelperPtr pFS, Reference< f
     , mnSeriesCount(0)
     , maFraction( 1, 576 )
     , mxChartModel( xModel )
-    , mbHasCategoryLabels( sal_False )
-    , mbHasZAxis( sal_False )
-    , mbIs3DChart( sal_False )
+    , mbHasCategoryLabels( false )
+    , mbHasZAxis( false )
+    , mbIs3DChart( false )
 {
 }
 
@@ -673,7 +673,7 @@ void ChartExport::_ExportContent()
     if( xChartDoc.is())
     {
         // determine if data comes from the outside
-        sal_Bool bIncludeTable = sal_True;
+        bool bIncludeTable = true;
 
         Reference< chart2::XChartDocument > xNewDoc( xChartDoc, uno::UNO_QUERY );
         if( xNewDoc.is())
@@ -684,7 +684,7 @@ void ChartExport::_ExportContent()
             Reference< lang::XServiceInfo > xDPServiceInfo( xNewDoc->getDataProvider(), uno::UNO_QUERY );
             if( ! (xDPServiceInfo.is() && xDPServiceInfo->getImplementationName() == "com.sun.star.comp.chart.InternalDataProvider" ))
             {
-                bIncludeTable = sal_False;
+                bIncludeTable = false;
             }
         }
         else
@@ -729,7 +729,7 @@ void ChartExport::_ExportContent()
 }
 
 void ChartExport::exportChartSpace( Reference< ::com::sun::star::chart::XChartDocument > rChartDoc,
-                                      sal_Bool bIncludeTable )
+                                      bool bIncludeTable )
 {
     FSHelperPtr pFS = GetFS();
     pFS->startElement( FSNS( XML_c, XML_chartSpace ),
@@ -1007,7 +1007,7 @@ void ChartExport::exportTitle( Reference< XShape > xShape )
 
     pFS->startElement( FSNS( XML_a, XML_r ),
             FSEND );
-    WriteRunProperties( xPropSet, sal_False );
+    WriteRunProperties( xPropSet, false );
     pFS->startElement( FSNS( XML_a, XML_t ),
             FSEND );
     pFS->writeEscaped( sText );
@@ -1309,7 +1309,7 @@ void ChartExport::exportBarChart( Reference< chart2::XChartType > xChartType )
             XML_val, bardir,
             FSEND );
 
-    exportGrouping( sal_True );
+    exportGrouping( true );
     sal_Int32 nAttachedAxis = AXIS_PRIMARY_Y;
     exportSeries( xChartType, nAttachedAxis );
 
@@ -1835,7 +1835,7 @@ void ChartExport::exportSeries( Reference< chart2::XChartType > xChartType, sal_
 
 void ChartExport::exportCandleStickSeries(
     const Sequence< Reference< chart2::XDataSeries > > & aSeriesSeq,
-    sal_Bool /*bJapaneseCandleSticks*/,
+    bool /*bJapaneseCandleSticks*/,
     sal_Int32& nAttachedAxis )
 {
     for( sal_Int32 nSeriesIdx=0; nSeriesIdx<aSeriesSeq.getLength(); ++nSeriesIdx )
@@ -2766,7 +2766,7 @@ void ChartExport::exportAxesId( sal_Int32 nAttachedAxis )
     }
 }
 
-void ChartExport::exportGrouping( sal_Bool isBar )
+void ChartExport::exportGrouping( bool isBar )
 {
     FSHelperPtr pFS = GetFS();
     Reference< XPropertySet > xPropSet( mxDiagram , uno::UNO_QUERY);
@@ -3266,7 +3266,7 @@ void ChartExport::exportView3D()
     pFS->endElement( FSNS( XML_c, XML_view3D ) );
 }
 
-sal_Bool ChartExport::isDeep3dChart()
+bool ChartExport::isDeep3dChart()
 {
     sal_Bool isDeep = sal_False;
     if( mbIs3DChart )
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index ffadbe5b90dc..c41d0bda266e 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -453,7 +453,7 @@ void DrawingML::WriteGradientFill( awt::Gradient rGradient )
     }
 }
 
-void DrawingML::WriteLineArrow( Reference< XPropertySet > rXPropSet, sal_Bool bLineStart )
+void DrawingML::WriteLineArrow( Reference< XPropertySet > rXPropSet, bool bLineStart )
 {
     ESCHER_LineEnd eLineEnd;
     sal_Int32 nArrowLength;
@@ -528,10 +528,10 @@ void DrawingML::WriteOutline( Reference< XPropertySet > rXPropSet )
 
     sal_uInt32 nLineWidth = 0;
     sal_uInt32 nColor = 0;
-    sal_Bool bColorSet = sal_False;
+    bool bColorSet = false;
     const char* cap = NULL;
     drawing::LineDash aLineDash;
-    sal_Bool bDashSet = sal_False;
+    bool bDashSet = false;
     bool bNoFill = false;
 
     // get InteropGrabBag and search the relevant attributes
@@ -576,7 +576,7 @@ void DrawingML::WriteOutline( Reference< XPropertySet > rXPropSet )
         case drawing::LineStyle_DASH:
             if( GETA( LineDash ) ) {
                 aLineDash = *(drawing::LineDash*) mAny.getValue();
-                bDashSet = sal_True;
+                bDashSet = true;
                 if( aLineDash.Style == DashStyle_ROUND || aLineDash.Style == DashStyle_ROUNDRELATIVE )
                     cap = "rnd";
 
@@ -588,7 +588,7 @@ void DrawingML::WriteOutline( Reference< XPropertySet > rXPropSet )
         default:
             if ( GETA( LineColor ) ) {
                 nColor = *((sal_uInt32*) mAny.getValue()) & 0xffffff;
-                bColorSet = sal_True;
+                bColorSet = true;
             }
             break;
     }
@@ -661,8 +661,8 @@ void DrawingML::WriteOutline( Reference< XPropertySet > rXPropSet )
 
     if( !bNoFill )
     {
-        WriteLineArrow( rXPropSet, sal_True );
-        WriteLineArrow( rXPropSet, sal_False );
+        WriteLineArrow( rXPropSet, true );
+        WriteLineArrow( rXPropSet, false );
     }
     else
     {
@@ -987,7 +987,7 @@ void DrawingML::WriteStretch( ::com::sun::star::uno::Reference< ::com::sun::star
 }
 
 void DrawingML::WriteTransformation( const Rectangle& rRect,
-        sal_Int32 nXmlNamespace, sal_Bool bFlipH, sal_Bool bFlipV, sal_Int32 nRotation )
+        sal_Int32 nXmlNamespace, bool bFlipH, bool bFlipV, sal_Int32 nRotation )
 {
     mpFS->startElementNS( nXmlNamespace, XML_xfrm,
                           XML_flipH, bFlipH ? "1" : NULL,
@@ -1009,7 +1009,7 @@ void DrawingML::WriteTransformation( const Rectangle& rRect,
     mpFS->endElementNS( nXmlNamespace, XML_xfrm );
 }
 
-void DrawingML::WriteShapeTransformation( Reference< XShape > rXShape, sal_Int32 nXmlNamespace, sal_Bool bFlipH, sal_Bool bFlipV, sal_Bool bSuppressRotation  )
+void DrawingML::WriteShapeTransformation( Reference< XShape > rXShape, sal_Int32 nXmlNamespace, bool bFlipH, bool bFlipV, bool bSuppressRotation  )
 {
     DBG(fprintf(stderr,  "write shape transformation\n" ));
 
@@ -1047,14 +1047,14 @@ void DrawingML::WriteShapeTransformation( Reference< XShape > rXShape, sal_Int32
     WriteTransformation( Rectangle( Point( aPos.X, aPos.Y ), Size( aSize.Width, aSize.Height ) ), nXmlNamespace, bFlipH, bFlipV, PPTX_EXPORT_ROTATE_CLOCKWISIFY(nRotation) );
 }
 
-void DrawingML::WriteRunProperties( Reference< XPropertySet > rRun, sal_Bool bIsField )
+void DrawingML::WriteRunProperties( Reference< XPropertySet > rRun, bool bIsField )
 {
     Reference< XPropertySet > rXPropSet( rRun, UNO_QUERY );
     Reference< XPropertyState > rXPropState( rRun, UNO_QUERY );
     OUString usLanguage;
     PropertyState eState;
     sal_Int16 nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() );
-    sal_Bool bComplex = ( nScriptType == ScriptType::COMPLEX );
+    bool bComplex = ( nScriptType == ScriptType::COMPLEX );
     const char* bold = NULL;
     const char* italic = NULL;
     const char* underline = NULL;
@@ -1166,7 +1166,7 @@ void DrawingML::WriteRunProperties( Reference< XPropertySet > rRun, sal_Bool bIs
         DBG(fprintf(stderr, "run color: %x auto: %x\n", static_cast<unsigned int>( color ), static_cast<unsigned int>( COL_AUTO )));
 
         if( color == COL_AUTO ) { // nCharColor depends to the background color
-            sal_Bool bIsDark = sal_False;
+            bool bIsDark = false;
             GET( bIsDark, IsBackgroundDark );
             color = bIsDark ? 0xffffff : 0x000000;
         }
@@ -1233,7 +1233,7 @@ void DrawingML::WriteRunProperties( Reference< XPropertySet > rRun, sal_Bool bIs
     mpFS->endElementNS( XML_a, XML_rPr );
 }
 
-const char* DrawingML::GetFieldType( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > rRun, sal_Bool& bIsField )
+const char* DrawingML::GetFieldType( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > rRun, bool& bIsField )
 {
     const char* sType = NULL;
     Reference< XPropertySet > rXPropSet( rRun, UNO_QUERY );
@@ -1248,10 +1248,10 @@ const char* DrawingML::GetFieldType( ::com::sun::star::uno::Reference< ::com::su
         Reference< XTextField > rXTextField;
         GET( rXTextField, TextField );
         if( rXTextField.is() ) {
-        bIsField = sal_True;
+        bIsField = true;
             rXPropSet.set( rXTextField, UNO_QUERY );
             if( rXPropSet.is() ) {
-                OUString aFieldKind( rXTextField->getPresentation( sal_True ) );
+                OUString aFieldKind( rXTextField->getPresentation( true ) );
                 DBG(fprintf (stderr, "field kind: %s\n", USS(aFieldKind) ));
                 if( aFieldKind == "Page" ) {
                     return "slidenum";
@@ -1271,7 +1271,7 @@ void DrawingML::GetUUID( OStringBuffer& rBuffer )
 {
     Sequence< sal_uInt8 > aSeq( 16 );
     static const char cDigits[17] = "0123456789ABCDEF";
-    rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True );
+    rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, true );
     int i;
 
     rBuffer.append( '{' );
@@ -1305,7 +1305,7 @@ void DrawingML::GetUUID( OStringBuffer& rBuffer )
 void DrawingML::WriteRun( Reference< XTextRange > rRun )
 {
     const char* sFieldType;
-    sal_Bool bIsField = sal_False;
+    bool bIsField = false;
     OUString sText = rRun->getString();
 
     if( sText.isEmpty()) {
@@ -1548,7 +1548,7 @@ void DrawingML::WriteParagraphProperties( Reference< XTextContent > rParagraph )
     sal_Int16 nAlignment( style::ParagraphAdjust_LEFT );
     GET( nAlignment, ParaAdjust );
 
-    sal_Bool bHasLinespacing = sal_False;
+    bool bHasLinespacing = false;
     LineSpacing aLineSpacing;
     if( GETAD( ParaLineSpacing ) )
         bHasLinespacing = ( mAny >>= aLineSpacing );
@@ -1586,7 +1586,7 @@ void DrawingML::WriteParagraph( Reference< XTextContent > rParagraph )
 
     mpFS->startElementNS( XML_a, XML_p, FSEND );
 
-    sal_Bool bPropertiesWritten = sal_False;
+    bool bPropertiesWritten = false;
     while( enumeration->hasMoreElements() ) {
         Reference< XTextRange > run;
         Any any ( enumeration->nextElement() );
@@ -1594,7 +1594,7 @@ void DrawingML::WriteParagraph( Reference< XTextContent > rParagraph )
         if (any >>= run) {
             if( !bPropertiesWritten ) {
                 WriteParagraphProperties( rParagraph );
-                bPropertiesWritten = sal_True;
+                bPropertiesWritten = true;
             }
             WriteRun( run );
         }
@@ -1632,13 +1632,13 @@ void DrawingML::WriteText( Reference< XInterface > rXIface, bool bBodyPr, bool b
         sVerticalAlignment = GetTextVerticalAdjust(eVerticalAlignment);
 
     const char* sWritingMode = NULL;
-    sal_Bool bVertical = sal_False;
+    bool bVertical = false;
     if( GETA( TextWritingMode ) ) {
         WritingMode eMode;
 
         if( ( mAny >>= eMode ) && eMode == WritingMode_TB_RL ) {
             sWritingMode = "vert";
-            bVertical = sal_True;
+            bVertical = true;
         }
     }
 
@@ -1655,7 +1655,7 @@ void DrawingML::WriteText( Reference< XInterface > rXIface, bool bBodyPr, bool b
                     if ( nTextRotateAngle == -90 )
                     {
                         sWritingMode = "vert";
-                        bVertical = sal_True;
+                        bVertical = true;
                     }
                     break;
                 }
@@ -1671,12 +1671,12 @@ void DrawingML::WriteText( Reference< XInterface > rXIface, bool bBodyPr, bool b
     else if( bVertical && eHorizontalAlignment == TextHorizontalAdjust_LEFT )
         sVerticalAlignment = "b";
 
-    sal_Bool bHasWrap = sal_False;
-    sal_Bool bWrap = sal_False;
+    bool bHasWrap = false;
+    bool bWrap = false;
     // Only custom shapes obey the TextWordWrap option, normal text always wraps.
     if( dynamic_cast<SvxCustomShape*>(rXIface.get()) && GETA( TextWordWrap ) ) {
         mAny >>= bWrap;
-        bHasWrap = sal_True;
+        bHasWrap = true;
     }
 
     if (bBodyPr)
@@ -1760,7 +1760,7 @@ void DrawingML::WritePresetShape( const char* pShape )
     mpFS->endElementNS(  XML_a, XML_prstGeom );
 }
 
-void DrawingML::WritePresetShape( const char* pShape, MSO_SPT eShapeType, sal_Bool bPredefinedHandlesUsed, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, const PropertyValue& rProp )
+void DrawingML::WritePresetShape( const char* pShape, MSO_SPT eShapeType, bool bPredefinedHandlesUsed, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, const PropertyValue& rProp )
 {
     static std::map< OString, std::vector<OString> > aAdjMap = ooxDrawingMLGetAdjNames();
     // If there are predefined adj names for this shape type, look them up now.
@@ -1893,12 +1893,12 @@ void DrawingML::WriteConnectorConnections( EscherConnectorListEntry& rConnectorE
     if( nStartID != -1 )
         mpFS->singleElementNS( XML_a, XML_stCxn,
                                XML_id, I32S( nStartID ),
-                               XML_idx, I64S( rConnectorEntry.GetConnectorRule( sal_True ) ),
+                               XML_idx, I64S( rConnectorEntry.GetConnectorRule( true ) ),
                                FSEND );
     if( nEndID != -1 )
         mpFS->singleElementNS( XML_a, XML_endCxn,
                                XML_id, I32S( nEndID ),
-                               XML_idx, I64S( rConnectorEntry.GetConnectorRule( sal_False ) ),
+                               XML_idx, I64S( rConnectorEntry.GetConnectorRule( false ) ),
                                FSEND );
 }
 
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 2a8fe7ee432d..25d87e7ad978 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -146,7 +146,7 @@ awt::Size ShapeExport::MapSize( const awt::Size& rSize ) const
     return awt::Size( aRetSize.Width(), aRetSize.Height() );
 }
 
-sal_Bool ShapeExport::NonEmptyText( Reference< XInterface > xIface )
+bool ShapeExport::NonEmptyText( Reference< XInterface > xIface )
 {
     Reference< XPropertySet > xPropSet( xIface, UNO_QUERY );
 
@@ -162,7 +162,7 @@ sal_Bool ShapeExport::NonEmptyText( Reference< XInterface > xIface )
                 {
                     DBG(fprintf(stderr, "empty presentation object %d, props:\n", bIsEmptyPresObj));
                     if( bIsEmptyPresObj )
-                       return sal_True;
+                       return true;
                 }
             }
 
@@ -173,7 +173,7 @@ sal_Bool ShapeExport::NonEmptyText( Reference< XInterface > xIface )
                 {
                     DBG(fprintf(stderr, "presentation object %d, props:\n", bIsPresObj));
                     if( bIsPresObj )
-                       return sal_True;
+                       return true;
                 }
             }
         }
@@ -184,10 +184,10 @@ sal_Bool ShapeExport::NonEmptyText( Reference< XInterface > xIface )
     if( xText.is() )
         return xText->getString().getLength();
 
-    return sal_False;
+    return false;
 }
 
-ShapeExport& ShapeExport::WriteBezierShape( Reference< XShape > xShape, sal_Bool bClosed )
+ShapeExport& ShapeExport::WriteBezierShape( Reference< XShape > xShape, bool bClosed )
 {
     DBG(fprintf(stderr, "write open bezier shape\n"));
 
@@ -241,12 +241,12 @@ ShapeExport& ShapeExport::WriteBezierShape( Reference< XShape > xShape, sal_Bool
 
 ShapeExport& ShapeExport::WriteClosedBezierShape( Reference< XShape > xShape )
 {
-    return WriteBezierShape( xShape, sal_True );
+    return WriteBezierShape( xShape, true );
 }
 
 ShapeExport& ShapeExport::WriteOpenBezierShape( Reference< XShape > xShape )
 {
-    return WriteBezierShape( xShape, sal_False );
+    return WriteBezierShape( xShape, false );
 }
 
 ShapeExport& ShapeExport::WriteGroupShape(uno::Reference<drawing::XShape> xShape)
@@ -293,19 +293,19 @@ ShapeExport& ShapeExport::WriteCustomShape( Reference< XShape > xShape )
     DBG(fprintf(stderr, "write custom shape\n"));
 
     Reference< XPropertySet > rXPropSet( xShape, UNO_QUERY );
-    sal_Bool bPredefinedHandlesUsed = sal_True;
+    bool bPredefinedHandlesUsed = true;
     OUString sShapeType;
     sal_uInt32 nMirrorFlags = 0;
     MSO_SPT eShapeType = EscherPropertyContainer::GetCustomShapeType( xShape, nMirrorFlags, sShapeType );
     SdrObjCustomShape* pShape = (SdrObjCustomShape*) GetSdrObjectFromXShape( xShape );
-    sal_Bool bIsDefaultObject = EscherPropertyContainer::IsDefaultObject( pShape, eShapeType );
+    bool bIsDefaultObject = EscherPropertyContainer::IsDefaultObject( pShape, eShapeType );
     const char* sPresetShape = msfilter::util::GetOOXMLPresetGeometry( USS( sShapeType ) );
     DBG(fprintf(stderr, "custom shape type: %s ==> %s\n", USS( sShapeType ), sPresetShape));
     Sequence< PropertyValue > aGeometrySeq;
     sal_Int32 nAdjustmentValuesIndex = -1;
 
-    sal_Bool bFlipH = false;
-    sal_Bool bFlipV = false;
+    bool bFlipH = false;
+    bool bFlipV = false;
 
     if( GETA( CustomShapeGeometry ) ) {
         DBG(fprintf(stderr, "got custom shape geometry\n"));
@@ -325,7 +325,7 @@ ShapeExport& ShapeExport::WriteCustomShape( Reference< XShape > xShape )
                     nAdjustmentValuesIndex = i;
                 else if ( rProp.Name == "Handles" ) {
                     if( !bIsDefaultObject )
-                        bPredefinedHandlesUsed = sal_False;
+                        bPredefinedHandlesUsed = false;
                     // TODO: update nAdjustmentsWhichNeedsToBeConverted here
                 }
             }
@@ -416,7 +416,7 @@ ShapeExport& ShapeExport::WriteEllipseShape( Reference< XShape > xShape )
 
     // visual shape properties
     pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
-    WriteShapeTransformation( xShape, XML_a,0,0,false);
+    WriteShapeTransformation( xShape, XML_a, false, false, false);
     WritePresetShape( "ellipse" );
     Reference< XPropertySet > xProps( xShape, UNO_QUERY );
     if( xProps.is() )
@@ -524,7 +524,7 @@ void ShapeExport::WriteGraphicObjectShapePart( Reference< XShape > xShape, const
 
     // visual shape properties
     pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
-    WriteShapeTransformation( xShape, XML_a,0,0,false);
+    WriteShapeTransformation( xShape, XML_a, false, false, false);
     WritePresetShape( "rect" );
     // graphic object can come with the frame (bnc#654525)
     WriteOutline( xShapeProps );
@@ -535,8 +535,8 @@ void ShapeExport::WriteGraphicObjectShapePart( Reference< XShape > xShape, const
 
 ShapeExport& ShapeExport::WriteConnectorShape( Reference< XShape > xShape )
 {
-    sal_Bool bFlipH = false;
-    sal_Bool bFlipV = false;
+    bool bFlipH = false;
+    bool bFlipV = false;
 
     DBG(fprintf(stderr, "write connector shape\n"));
 
@@ -580,13 +580,13 @@ ShapeExport& ShapeExport::WriteConnectorShape( Reference< XShape > xShape )
 
     Rectangle aRect( Point( aStartPoint.X, aStartPoint.Y ), Point( aEndPoint.X, aEndPoint.Y ) );
     if( aRect.getWidth() < 0 ) {
-        bFlipH = sal_True;
+        bFlipH = true;
         aRect.setX( aEndPoint.X );
         aRect.setWidth( aStartPoint.X - aEndPoint.X );
     }
 
     if( aRect.getHeight() < 0 ) {
-        bFlipV = sal_True;
+        bFlipV = true;
         aRect.setY( aEndPoint.Y );
         aRect.setHeight( aStartPoint.Y - aEndPoint.Y );
     }
@@ -626,8 +626,8 @@ ShapeExport& ShapeExport::WriteConnectorShape( Reference< XShape > xShape )
 
 ShapeExport& ShapeExport::WriteLineShape( Reference< XShape > xShape )
 {
-    sal_Bool bFlipH = false;
-    sal_Bool bFlipV = false;
+    bool bFlipH = false;
+    bool bFlipV = false;
 
     DBG(fprintf(stderr, "write line shape\n"));
 
@@ -728,7 +728,7 @@ ShapeExport& ShapeExport::WriteRectangleShape( Reference< XShape > xShape )
 
     // visual shape properties
     pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
-    WriteShapeTransformation( xShape, XML_a,0,0,false);
+    WriteShapeTransformation( xShape, XML_a, false, false, false);
     WritePresetShape( "rect" );
     Reference< XPropertySet > xProps( xShape, UNO_QUERY );
     if( xProps.is() )
@@ -940,7 +940,7 @@ ShapeExport& ShapeExport::WriteTextShape( Reference< XShape > xShape )
 
     // visual shape properties
     pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
-    WriteShapeTransformation( xShape, XML_a,0,0,false);
+    WriteShapeTransformation( xShape, XML_a, false, false, false);
     WritePresetShape( "rect" );
     uno::Reference<beans::XPropertySet> xPropertySet(xShape, UNO_QUERY);
     WriteBlipOrNormalFill(xPropertySet, "GraphicURL");
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index fe82ea02a662..b4b97b54dfe7 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -129,7 +129,7 @@ sal_uInt32 VMLExport::EnterGroup( const OUString& rShapeName, const Rectangle* p
     if ( rShapeName.getLength() )
         pAttrList->add( XML_alt, OUStringToOString( rShapeName, RTL_TEXTENCODING_UTF8 ) );
 
-    sal_Bool rbAbsolutePos = true;
+    bool rbAbsolutePos = true;
     //editAs
     OUString rEditAs = EscherEx::GetEditAs();
     if (!rEditAs.isEmpty())
@@ -893,7 +893,7 @@ void VMLExport::AddLineDimensions( const Rectangle& rRectangle )
             .makeStringAndClear() );
 }
 
-void VMLExport::AddRectangleDimensions( OStringBuffer& rBuffer, const Rectangle& rRectangle, sal_Bool rbAbsolutePos)
+void VMLExport::AddRectangleDimensions( OStringBuffer& rBuffer, const Rectangle& rRectangle, bool rbAbsolutePos)
 {
     if ( !rBuffer.isEmpty() )
         rBuffer.append( ";" );
@@ -1107,7 +1107,7 @@ void VMLExport::EndShape( sal_Int32 nShapeElement )
     }
 }
 
-sal_uInt32 VMLExport::AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri, sal_Int16 eVOri, sal_Int16 eHRel, sal_Int16 eVRel, const Point* pNdTopLeft, const sal_Bool bOOxmlExport )
+sal_uInt32 VMLExport::AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri, sal_Int16 eVOri, sal_Int16 eHRel, sal_Int16 eVRel, const Point* pNdTopLeft, const bool bOOxmlExport )
 {
     m_pSdrObject = &rObj;
     m_eHOri = eHOri;