oox: sal_Bool->bool

Change-Id: Icddec34e91305cfc3f9d852472bb86eab4d8cb26

23 files changed, 133 insertions, 133 deletions

diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx
index e7ff93fc6609..8c7378de3523 100644
--- a/include/oox/ole/olehelper.hxx
+++ b/include/oox/ole/olehelper.hxx
@@ -168,11 +168,11 @@ protected:
 public:
     MSConvertOCXControls( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel );
     virtual ~MSConvertOCXControls();
-    sal_Bool ReadOCXStorage( SotStorageRef& rSrc1, ::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp );
-    sal_Bool ReadOCXCtlsStream(SotStorageStreamRef& rSrc1, ::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp,
+    bool ReadOCXStorage( SotStorageRef& rSrc1, ::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp );
+    bool ReadOCXCtlsStream(SotStorageStreamRef& rSrc1, ::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp,
                                    sal_Int32 nPos, sal_Int32 nSize );
-    static sal_Bool WriteOCXStream( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, SotStorageRef &rSrc1, const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > &rControlModel, const com::sun::star::awt::Size& rSize,OUString &rName);
-    static sal_Bool WriteOCXExcelKludgeStream( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutStrm, const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > &rControlModel, const com::sun::star::awt::Size& rSize,OUString &rName);
+    static bool WriteOCXStream( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, SotStorageRef &rSrc1, const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > &rControlModel, const com::sun::star::awt::Size& rSize,OUString &rName);
+    static bool WriteOCXExcelKludgeStream( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutStrm, const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > &rControlModel, const com::sun::star::awt::Size& rSize,OUString &rName);
 };
 
 
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index 6f2b1ae117cf..5537f3e58077 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -444,7 +444,7 @@ sal_Bool SAL_CALL FilterBase::filter( const Sequence< PropertyValue >& rMediaDes
     if( !mxImpl->mxModel.is() || !mxImpl->mxModelFactory.is() || (mxImpl->meDirection == FILTERDIRECTION_UNKNOWN) )
         throw RuntimeException();
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     setMediaDescriptor( rMediaDescSeq );
     DocumentOpenedGuard aOpenedGuard( mxImpl->maFileUrl );
     if( aOpenedGuard.isValid() || mxImpl->maFileUrl.isEmpty() )
diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx
index c209e6515bf7..0e63245e660c 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -243,13 +243,13 @@ void OOXMLDocPropHandler::UpdateDocStatistic( const OUString& aChars )
 
     if ( !aName.isEmpty() )
     {
-        sal_Bool bFound = sal_False;
+        bool bFound = false;
         sal_Int32 nLen = aSet.getLength();
         for ( sal_Int32 nInd = 0; nInd < nLen; nInd++ )
             if ( aSet[nInd].Name.equals( aName ) )
             {
                 aSet[nInd].Value = uno::makeAny( aChars.toInt32() );
-                bFound = sal_True;
+                bFound = true;
                 break;
             }
 
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx
index 0b2b20aa47d6..292e8a4c1e67 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -424,7 +424,7 @@ void TrendlineConverter::convertFromModel( const Reference< XDataSeries >& rxDat
             aPropSet.setProperty( PROP_MovingAveragePeriod, mrModel.mnPeriod );
 
             // Intercept
-            sal_Bool hasIntercept = mrModel.mfIntercept.has();
+            bool hasIntercept = mrModel.mfIntercept.has();
             aPropSet.setProperty( PROP_ForceIntercept, hasIntercept);
             if (hasIntercept)
                 aPropSet.setProperty( PROP_InterceptValue,  mrModel.mfIntercept.get());
diff --git a/oox/source/drawingml/customshapepresetdata.cxx b/oox/source/drawingml/customshapepresetdata.cxx
index 7e4ecdeb8993..a4856a89e11e 100644
--- a/oox/source/drawingml/customshapepresetdata.cxx
+++ b/oox/source/drawingml/customshapepresetdata.cxx
@@ -801,7 +801,7 @@ void CustomShapeProperties::initializePresetDataMap()
                 aStream.ReadLine(aLine);
                 if (aLine == "true" || aLine == "false")
                 {
-                    aPropertyMap.setProperty(PROP_MirroredX, sal_Bool(aLine == "true" ? sal_True : sal_False));
+                    aPropertyMap.setProperty(PROP_MirroredX, aLine == "true");
                 }
                 else
                     SAL_WARN("oox", "CustomShapeProperties::initializePresetDataMap: unexpected MirroredX parameter");
@@ -811,7 +811,7 @@ void CustomShapeProperties::initializePresetDataMap()
                 aStream.ReadLine(aLine);
                 if (aLine == "true" || aLine == "false")
                 {
-                    aPropertyMap.setProperty(PROP_MirroredY, sal_Bool(aLine == "true" ? sal_True : sal_False));
+                    aPropertyMap.setProperty(PROP_MirroredY, aLine == "true");
                 }
                 else
                     SAL_WARN("oox", "CustomShapeProperties::initializePresetDataMap: unexpected MirroredY parameter");
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index 4048cbc0a3a2..276d5bb51efd 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -211,8 +211,8 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi
         sal_uInt32 i;
         PropertyMap aPropertyMap;
         aPropertyMap.setProperty( PROP_Type, OUString( "ooxml-non-primitive" ));
-        aPropertyMap.setProperty( PROP_MirroredX, (sal_Bool) mbMirroredX );
-        aPropertyMap.setProperty( PROP_MirroredY, (sal_Bool) mbMirroredY );
+        aPropertyMap.setProperty( PROP_MirroredX, mbMirroredX );
+        aPropertyMap.setProperty( PROP_MirroredY, mbMirroredY );
         // Note 1: If Equations are defined - they are processed using internal div by 360 coordinates
         // while if they are not, standard ooxml coordinates are used.
         // This size specifically affects scaling.
@@ -261,11 +261,11 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi
 
         if ( maPath2DList.size() )
         {
-            sal_Bool bAllZero = sal_True;
+            bool bAllZero = true;
             for ( i=0; i < maPath2DList.size(); i++ )
             {
                 if ( maPath2DList[i].w || maPath2DList[i].h ) {
-                    bAllZero = sal_False;
+                    bAllZero = false;
                     break;
                 }
             }
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index 56ce61bc459a..ade9bde96bdd 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -48,7 +48,7 @@ struct IteratorAttr
 
     sal_Int32 mnAxis;
     sal_Int32 mnCnt;
-    sal_Bool  mbHideLastTrans;
+    bool  mbHideLastTrans;
     sal_Int32 mnPtType;
     sal_Int32 mnSt;
     sal_Int32 mnStep;
diff --git a/oox/source/drawingml/table/tableproperties.cxx b/oox/source/drawingml/table/tableproperties.cxx
index 994fe3a70689..e7f5799a248a 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -143,12 +143,12 @@ static void SetTableStyleProperties(TableStyle* &pTableStyle , const sal_Int32&
     pTableStyle->getLastCol().getTextBoldStyle() = textBoldStyle;
 }
 
- sal_Bool CreateTableStyle(TableStyle* &pTableStyle , const OUString& styleId)
+ bool CreateTableStyle(TableStyle* &pTableStyle , const OUString& styleId)
 {
-    sal_Bool createdTblStyle = sal_False;
+    bool createdTblStyle = false;
     if(styleId.equalsAscii("{5C22544A-7EE6-4342-B048-85BDC9FD1C3A}")){           //Medium Style 2 Accenat 1
         pTableStyle = new TableStyle();
-        createdTblStyle = sal_True;
+        createdTblStyle = true;
         //first row style
         //fill color and type
         oox::drawingml::FillPropertiesPtr pFstRowFillProperties( new oox::drawingml::FillProperties );
@@ -185,7 +185,7 @@ static void SetTableStyleProperties(TableStyle* &pTableStyle , const sal_Int32&
     else if (styleId.equalsAscii("{21E4AEA4-8DFA-4A89-87EB-49C32662AFE0}"))         //Medium Style 2 Accent 2
     {
         pTableStyle = new TableStyle();
-        createdTblStyle = sal_True;
+        createdTblStyle = true;
         oox::drawingml::FillPropertiesPtr pFstRowFillProperties( new oox::drawingml::FillProperties );
         pFstRowFillProperties->moFillType.set(XML_solidFill);
         pFstRowFillProperties->maFillColor.setSchemeClr(XML_accent2);
@@ -217,7 +217,7 @@ static void SetTableStyleProperties(TableStyle* &pTableStyle , const sal_Int32&
     else if (styleId.equalsAscii("{C4B1156A-380E-4F78-BDF5-A606A8083BF9}"))         //Medium Style 4 Accent 4
     {
         pTableStyle = new TableStyle();
-        createdTblStyle = sal_True;
+        createdTblStyle = true;
         SetTableStyleProperties(pTableStyle, XML_accent4, XML_dk1, XML_accent4);
     }
 
diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx b/oox/source/drawingml/textbodypropertiescontext.cxx
index 5370350b56ca..315f679ed3c7 100644
--- a/oox/source/drawingml/textbodypropertiescontext.cxx
+++ b/oox/source/drawingml/textbodypropertiescontext.cxx
@@ -44,7 +44,7 @@ TextBodyPropertiesContext::TextBodyPropertiesContext( ContextHandler2Helper& rPa
 {
     // ST_TextWrappingType
     sal_Int32 nWrappingType = rAttribs.getToken( XML_wrap, XML_square );
-    mrTextBodyProp.maPropertyMap.setProperty( PROP_TextWordWrap, static_cast< sal_Bool >( nWrappingType == XML_square ));
+    mrTextBodyProp.maPropertyMap.setProperty( PROP_TextWordWrap, nWrappingType == XML_square );
 
     // ST_Coordinate
     OUString sValue;
diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx
index 858a488dedd0..76e162218240 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -296,7 +296,7 @@ void BulletList::pushToPropMap( const ::oox::core::XmlFilterBase* pFilterBase, P
     OUString aBulletFontName;
     sal_Int16 nBulletFontPitch = 0;
     sal_Int16 nBulletFontFamily = 0;
-    sal_Bool bSymbolFont = sal_False;
+    bool bSymbolFont = false;
     if( pFilterBase) {
         if (maBulletFont.getFontData( aBulletFontName, nBulletFontPitch, nBulletFontFamily, *pFilterBase ) )
         {
@@ -319,7 +319,7 @@ void BulletList::pushToPropMap( const ::oox::core::XmlFilterBase* pFilterBase, P
                  aBulletFontName.equalsIgnoreAsciiCase("StarMath") ||
                  aBulletFontName.equalsIgnoreAsciiCase("ZapfDingbats") ) {
                 aFontDesc.CharSet = RTL_TEXTENCODING_SYMBOL;
-                bSymbolFont = sal_True;
+                bSymbolFont = true;
             }
             rPropMap.setProperty( PROP_BulletFont, aFontDesc);
             rPropMap.setProperty( PROP_BulletFontName, aBulletFontName);
diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx
index 1128918fd2aa..953794810e2e 100644
--- a/oox/source/drawingml/textrun.cxx
+++ b/oox/source/drawingml/textrun.cxx
@@ -90,7 +90,7 @@ sal_Int32 TextRun::insertAt(
                     while ( true )
                     {
                         sal_Int32 nCount = 0;
-                        sal_Bool bSymbol = ( getText()[ nIndex ] & 0xff00 ) == 0xf000;
+                        bool bSymbol = ( getText()[ nIndex ] & 0xff00 ) == 0xf000;
                         if ( bSymbol )
                         {
                             do
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 79e3dbaeb1f4..f6e02dbf8818 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -821,9 +821,9 @@ void ChartExport::exportChart( Reference< ::com::sun::star::chart::XChartDocumen
         mxNewDiagram.set( xNewDoc->getFirstDiagram());
 
     // get Properties of ChartDocument
-    sal_Bool bHasMainTitle = sal_False;
-    sal_Bool bHasSubTitle = sal_False;
-    sal_Bool bHasLegend = sal_False;
+    bool bHasMainTitle = false;
+    bool bHasSubTitle = false;
+    bool bHasLegend = false;
     Reference< beans::XPropertySet > xDocPropSet( rChartDoc, uno::UNO_QUERY );
     if( xDocPropSet.is())
     {
@@ -983,7 +983,7 @@ void ChartExport::exportTitle( Reference< XShape > xShape )
 
     // TODO: bodyPr
     const char* sWritingMode = NULL;
-    sal_Bool bVertical = sal_False;
+    bool bVertical = false;
     xPropSet->getPropertyValue("StackedText") >>= bVertical;
     if( bVertical )
         sWritingMode = "wordArtVert";
@@ -1240,9 +1240,9 @@ void ChartExport::exportDataTable( )
     FSHelperPtr pFS = GetFS();
     Reference< beans::XPropertySet > aPropSet( mxDiagram, uno::UNO_QUERY );
 
-    sal_Bool bShowVBorder = sal_False;
-    sal_Bool bShowHBorder = sal_False;
-    sal_Bool bShowOutline = sal_False;
+    bool bShowVBorder = false;
+    bool bShowHBorder = false;
+    bool bShowOutline = false;
 
     if (GetProperty( aPropSet, "DataTableHBorder"))
         mAny >>= bShowHBorder;
@@ -1298,7 +1298,7 @@ void ChartExport::exportBarChart( Reference< chart2::XChartType > xChartType )
     pFS->startElement( FSNS( XML_c, nTypeId ),
             FSEND );
     // bar direction
-    sal_Bool bVertical = sal_False;
+    bool bVertical = false;
     Reference< XPropertySet > xPropSet( mxDiagram , uno::UNO_QUERY);
     if( GetProperty( xPropSet, "Vertical" ) )
         mAny >>= bVertical;
@@ -1638,7 +1638,7 @@ void ChartExport::exportSeries( Reference< chart2::XChartType > xChartType, sal_
     // special export for stock charts
     if( eChartType == chart::TYPEID_STOCK )
     {
-        sal_Bool bJapaneseCandleSticks = sal_False;
+        bool bJapaneseCandleSticks = false;
         Reference< beans::XPropertySet > xCTProp( xChartType, uno::UNO_QUERY );
         if( xCTProp.is())
             xCTProp->getPropertyValue("Japanese") >>= bJapaneseCandleSticks;
@@ -2080,17 +2080,17 @@ void ChartExport::exportAxes( )
 void ChartExport::exportAxis( AxisIdPair aAxisIdPair )
 {
     // get some properties from document first
-    sal_Bool bHasXAxisTitle = sal_False,
-        bHasYAxisTitle = sal_False,
-        bHasZAxisTitle = sal_False,
-        bHasSecondaryXAxisTitle = sal_False,
-        bHasSecondaryYAxisTitle = sal_False;
-    sal_Bool bHasXAxisMajorGrid = sal_False,
-        bHasXAxisMinorGrid = sal_False,
-        bHasYAxisMajorGrid = sal_False,
-        bHasYAxisMinorGrid = sal_False,
-        bHasZAxisMajorGrid = sal_False,
-        bHasZAxisMinorGrid = sal_False;
+    bool bHasXAxisTitle = false,
+        bHasYAxisTitle = false,
+        bHasZAxisTitle = false,
+        bHasSecondaryXAxisTitle = false,
+        bHasSecondaryYAxisTitle = false;
+    bool bHasXAxisMajorGrid = false,
+        bHasXAxisMinorGrid = false,
+        bHasYAxisMajorGrid = false,
+        bHasYAxisMinorGrid = false,
+        bHasZAxisMajorGrid = false,
+        bHasZAxisMinorGrid = false;
 
        Reference< XPropertySet > xDiagramProperties (mxDiagram, uno::UNO_QUERY);
 
@@ -2232,7 +2232,7 @@ void ChartExport::_exportAxis(
     // logBase, min, max
     if(GetProperty( xAxisProp, "Logarithmic" ) )
     {
-        sal_Bool bLogarithmic = sal_False;
+        bool bLogarithmic = false;
         mAny >>= bLogarithmic;
         if( bLogarithmic )
         {
@@ -2245,7 +2245,7 @@ void ChartExport::_exportAxis(
     }
 
     // orientation: minMax, maxMin
-    sal_Bool bReverseDirection = sal_False;
+    bool bReverseDirection = false;
     if(GetProperty( xAxisProp, "ReverseDirection" ) )
         mAny >>= bReverseDirection;
 
@@ -2254,7 +2254,7 @@ void ChartExport::_exportAxis(
             XML_val, orientation,
             FSEND );
 
-    sal_Bool bAutoMax = sal_False;
+    bool bAutoMax = false;
     if(GetProperty( xAxisProp, "AutoMax" ) )
         mAny >>= bAutoMax;
 
@@ -2267,7 +2267,7 @@ void ChartExport::_exportAxis(
             FSEND );
     }
 
-    sal_Bool bAutoMin = sal_False;
+    bool bAutoMin = false;
     if(GetProperty( xAxisProp, "AutoMin" ) )
         mAny >>= bAutoMin;
 
@@ -2282,7 +2282,7 @@ void ChartExport::_exportAxis(
 
     pFS->endElement( FSNS( XML_c, XML_scaling ) );
 
-    sal_Bool bVisible = sal_True;
+    bool bVisible = true;
     if( xAxisProp.is() )
     {
         xAxisProp->getPropertyValue(
@@ -2324,8 +2324,8 @@ void ChartExport::_exportAxis(
     if(GetProperty( xAxisProp, "Marks" ) )
     {
         mAny >>= nValue;
-        sal_Bool bInner = nValue & ::com::sun::star::chart::ChartAxisMarks::INNER;
-        sal_Bool bOuter = nValue & ::com::sun::star::chart::ChartAxisMarks::OUTER;
+        bool bInner = nValue & ::com::sun::star::chart::ChartAxisMarks::INNER;
+        bool bOuter = nValue & ::com::sun::star::chart::ChartAxisMarks::OUTER;
         const char* majorTickMark = NULL;
         if( bInner && bOuter )
             majorTickMark = "cross";
@@ -2343,8 +2343,8 @@ void ChartExport::_exportAxis(
     if(GetProperty( xAxisProp, "HelpMarks" ) )
     {
         mAny >>= nValue;
-        sal_Bool bInner = nValue & ::com::sun::star::chart::ChartAxisMarks::INNER;
-        sal_Bool bOuter = nValue & ::com::sun::star::chart::ChartAxisMarks::OUTER;
+        bool bInner = nValue & ::com::sun::star::chart::ChartAxisMarks::INNER;
+        bool bOuter = nValue & ::com::sun::star::chart::ChartAxisMarks::OUTER;
         const char* minorTickMark = NULL;
         if( bInner && bOuter )
             minorTickMark = "cross";
@@ -2360,7 +2360,7 @@ void ChartExport::_exportAxis(
     }
     // tickLblPos
     const char* sTickLblPos = NULL;
-    sal_Bool bDisplayLabel = sal_True;
+    bool bDisplayLabel = true;
     if(GetProperty( xAxisProp, "DisplayLabels" ) )
         mAny >>= bDisplayLabel;
     if( bDisplayLabel && (GetProperty( xAxisProp, "LabelPosition" ) ) )
@@ -2400,7 +2400,7 @@ void ChartExport::_exportAxis(
             FSEND );
 
     // crosses & crossesAt
-    sal_Bool bCrossesValue = sal_False;
+    bool bCrossesValue = false;
     const char* sCrosses = NULL;
     if(GetProperty( xAxisProp, "CrossoverPosition" ) )
     {
@@ -2418,7 +2418,7 @@ void ChartExport::_exportAxis(
                 sCrosses = "autoZero";
                 break;
             default:
-                bCrossesValue = sal_True;
+                bCrossesValue = true;
                 break;
         }
     }
@@ -2464,7 +2464,7 @@ void ChartExport::_exportAxis(
     }
 
     // majorUnit
-    sal_Bool bAutoStepMain = sal_False;
+    bool bAutoStepMain = false;
     if(GetProperty( xAxisProp, "AutoStepMain" ) )
         mAny >>= bAutoStepMain;
 
@@ -2477,7 +2477,7 @@ void ChartExport::_exportAxis(
             FSEND );
     }
     // minorUnit
-    sal_Bool bAutoStepHelp = sal_False;
+    bool bAutoStepHelp = false;
     if(GetProperty( xAxisProp, "AutoStepHelp" ) )
         mAny >>= bAutoStepHelp;
 
@@ -2490,7 +2490,7 @@ void ChartExport::_exportAxis(
             FSEND );
     }
 
-    sal_Bool bDisplayUnits = sal_False;
+    bool bDisplayUnits = false;
     if( nAxisType == XML_valAx && GetProperty( xAxisProp, "DisplayUnits" ) )
     {
         mAny >>= bDisplayUnits;
@@ -2771,10 +2771,10 @@ void ChartExport::exportGrouping( bool isBar )
     FSHelperPtr pFS = GetFS();
     Reference< XPropertySet > xPropSet( mxDiagram , uno::UNO_QUERY);
     // grouping
-    sal_Bool bStacked = sal_False;
+    bool bStacked = false;
     if( GetProperty( xPropSet, "Stacked" ) )
         mAny >>= bStacked;
-    sal_Bool bPercentage = sal_False;
+    bool bPercentage = false;
     if( GetProperty( xPropSet, "Percent" ) )
         mAny >>= bPercentage;
 
@@ -2910,7 +2910,7 @@ void ChartExport::exportTrendlines( Reference< chart2::XDataSeries > xSeries )
                     XML_val, OString::number(aExtrapolateBackward).getStr(),
                     FSEND );
 
-            sal_Bool aForceIntercept = false;
+            bool aForceIntercept = false;
             xProperties->getPropertyValue("ForceIntercept") >>= aForceIntercept;
 
             if (aForceIntercept)
@@ -2927,11 +2927,11 @@ void ChartExport::exportTrendlines( Reference< chart2::XDataSeries > xSeries )
             Reference< XPropertySet > xEquationProperties( xRegCurve->getEquationProperties() );
 
             // Show Equation
-            sal_Bool aShowEquation = false;
+            bool aShowEquation = false;
             xEquationProperties->getPropertyValue("ShowEquation") >>= aShowEquation;
 
             // Show R^2
-            sal_Bool aShowCorrelationCoefficient = false;
+            bool aShowCorrelationCoefficient = false;
             xEquationProperties->getPropertyValue("ShowCorrelationCoefficient") >>= aShowCorrelationCoefficient;
 
             pFS->singleElement( FSNS( XML_c, XML_dispRSqr ),
@@ -3255,7 +3255,7 @@ void ChartExport::exportView3D()
     // rAngAx
     if( GetProperty( xPropSet, "RightAngledAxes" ) )
     {
-        sal_Bool bRightAngled = sal_False;
+        bool bRightAngled = false;
         mAny >>= bRightAngled;
         const char* sRightAngled = bRightAngled ? "1":"0";
         pFS->singleElement( FSNS( XML_c, XML_rAngAx ),
@@ -3278,7 +3278,7 @@ void ChartExport::exportView3D()
 
 bool ChartExport::isDeep3dChart()
 {
-    sal_Bool isDeep = sal_False;
+    bool isDeep = false;
     if( mbIs3DChart )
     {
         Reference< XPropertySet > xPropSet( mxDiagram , uno::UNO_QUERY);
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 25d87e7ad978..28b01ab60fbd 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -157,7 +157,7 @@ bool ShapeExport::NonEmptyText( Reference< XInterface > xIface )
         {
             if ( xPropSetInfo->hasPropertyByName( "IsEmptyPresentationObject" ) )
             {
-                sal_Bool bIsEmptyPresObj = sal_False;
+                bool bIsEmptyPresObj = false;
                 if ( xPropSet->getPropertyValue( "IsEmptyPresentationObject" ) >>= bIsEmptyPresObj )
                 {
                     DBG(fprintf(stderr, "empty presentation object %d, props:\n", bIsEmptyPresObj));
@@ -168,7 +168,7 @@ bool ShapeExport::NonEmptyText( Reference< XInterface > xIface )
 
             if ( xPropSetInfo->hasPropertyByName( "IsPresentationObject" ) )
             {
-                sal_Bool bIsPresObj = sal_False;
+                bool bIsPresObj = false;
                 if ( xPropSet->getPropertyValue( "IsPresentationObject" ) >>= bIsPresObj )
                 {
                     DBG(fprintf(stderr, "presentation object %d, props:\n", bIsPresObj));
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 5488c93d2180..c384b8c8be13 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -536,7 +536,7 @@ void ControlConverter::convertToAxState( PropertySet& rPropSet,
 
     sal_Int16 nState = API_STATE_DONTKNOW;
 
-    sal_Bool bTmp = sal_False;
+    bool bTmp = false;
     // need to use State for current state ( I think this is regardless of whether
     // control is awt or not )
     rPropSet.getProperty( nState, PROP_State );
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index 24d6e430229d..8b393ea0dc91 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -487,7 +487,7 @@ MSConvertOCXControls::importControlFromStream( ::oox::BinaryInputStream& rInStrm
     return rxFormComp.is();
 }
 
-sal_Bool
+bool
 MSConvertOCXControls::ReadOCXCtlsStream( SotStorageStreamRef& rSrc1, Reference< XFormComponent > & rxFormComp,
                                    sal_Int32 nPos,
                                    sal_Int32 nStreamSize)
@@ -499,7 +499,7 @@ MSConvertOCXControls::ReadOCXCtlsStream( SotStorageStreamRef& rSrc1, Reference<
         OUString aStrmClassId = ::oox::ole::OleHelper::importGuid( aCtlsStrm );
         return  importControlFromStream( aCtlsStrm, rxFormComp, aStrmClassId, nStreamSize );
     }
-    return sal_False;
+    return false;
 }
 
 bool MSConvertOCXControls::importControlFromStream( ::oox::BinaryInputStream& rInStrm, Reference< XFormComponent >& rxFormComp, const OUString& rStrmClassId,
@@ -537,7 +537,7 @@ bool MSConvertOCXControls::importControlFromStream( ::oox::BinaryInputStream& rI
     return rxFormComp.is();
 }
 
-sal_Bool MSConvertOCXControls::ReadOCXStorage( SotStorageRef& xOleStg,
+bool MSConvertOCXControls::ReadOCXStorage( SotStorageRef& xOleStg,
                                   Reference< XFormComponent > & rxFormComp )
 {
     if ( xOleStg.Is() )
@@ -568,14 +568,14 @@ sal_Bool MSConvertOCXControls::ReadOCXStorage( SotStorageRef& xOleStg,
             return rxFormComp.is();
         }
     }
-    return  sal_False;
+    return  false;
 }
 
-sal_Bool MSConvertOCXControls::WriteOCXExcelKludgeStream( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutStrm, const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > &rxControlModel, const com::sun::star::awt::Size& rSize,OUString &rName )
+bool MSConvertOCXControls::WriteOCXExcelKludgeStream( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutStrm, const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > &rxControlModel, const com::sun::star::awt::Size& rSize,OUString &rName )
 {
     OleFormCtrlExportHelper exportHelper( comphelper::getProcessComponentContext(), rxModel, rxControlModel );
     if ( !exportHelper.isValid() )
-        return sal_False;
+        return false;
     rName = exportHelper.getTypeName();
     SvGlobalName aName;
     OUString sId = exportHelper.getGUID();
@@ -583,10 +583,10 @@ sal_Bool MSConvertOCXControls::WriteOCXExcelKludgeStream( const ::com::sun::star
     BinaryXOutputStream xOut( xOutStrm, false );
     OleHelper::exportGuid( xOut, aName );
     exportHelper.exportControl( xOutStrm, rSize );
-    return sal_True;
+    return true;
 }
 
-sal_Bool MSConvertOCXControls::WriteOCXStream( const Reference< XModel >& rxModel, SotStorageRef &xOleStg,
+bool MSConvertOCXControls::WriteOCXStream( const Reference< XModel >& rxModel, SotStorageRef &xOleStg,
     const Reference< XControlModel > &rxControlModel,
     const com::sun::star::awt::Size& rSize, OUString &rName)
 {
@@ -595,7 +595,7 @@ sal_Bool MSConvertOCXControls::WriteOCXStream( const Reference< XModel >& rxMode
     OleFormCtrlExportHelper exportHelper( comphelper::getProcessComponentContext(), rxModel, rxControlModel );
 
     if ( !exportHelper.isValid() )
-        return sal_False;
+        return false;
 
     OUString sId = exportHelper.getGUID();
     aName.MakeId(sId);
@@ -618,7 +618,7 @@ sal_Bool MSConvertOCXControls::WriteOCXStream( const Reference< XModel >& rxMode
         Reference< XOutputStream > xOut = new utl::OSeekableOutputStreamWrapper( *pContents );
         exportHelper.exportControl( xOut, rSize );
     }
-    return sal_True;
+    return true;
 }
 
 } // namespace ole
diff --git a/oox/source/ppt/pptfilterhelpers.cxx b/oox/source/ppt/pptfilterhelpers.cxx
index 3d3d36c59e38..7df6ca4648be 100644
--- a/oox/source/ppt/pptfilterhelpers.cxx
+++ b/oox/source/ppt/pptfilterhelpers.cxx
@@ -29,46 +29,46 @@ namespace oox { namespace ppt {
 
     static const transition gTransitions[] =
     {
-        { "wipe(up)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::TOPTOBOTTOM, sal_True },
-        { "wipe(right)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::LEFTTORIGHT, sal_False },
-        { "wipe(left)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::LEFTTORIGHT, sal_True },
-        { "wipe(down)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::TOPTOBOTTOM, sal_False },
-        { "wheel(1)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::ONEBLADE, sal_True },
-        { "wheel(2)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::TWOBLADEVERTICAL, sal_True },
-        { "wheel(3)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::THREEBLADE, sal_True },
-        { "wheel(4)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::FOURBLADE, sal_True },
-        { "wheel(8)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::EIGHTBLADE, sal_True },
-        { "strips(downLeft)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALRIGHT, sal_True },
-        { "strips(upLeft)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALLEFT, sal_False },
-        { "strips(downRight)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALLEFT, sal_True },
-        { "strips(upRight)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALRIGHT, sal_False },
-        { "barn(inVertical)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, sal_False },
-        { "barn(outVertical)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, sal_True },
-        { "barn(inHorizontal)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, sal_False },
-        { "barn(outHorizontal)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, sal_True },
-        { "randombar(vertical)", ::com::sun::star::animations::TransitionType::RANDOMBARWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, sal_True},
-        { "randombar(horizontal)", ::com::sun::star::animations::TransitionType::RANDOMBARWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, sal_True },
-        { "checkerboard(down)", ::com::sun::star::animations::TransitionType::CHECKERBOARDWIPE, ::com::sun::star::animations::TransitionSubType::DOWN, sal_True},
-        { "checkerboard(across)", ::com::sun::star::animations::TransitionType::CHECKERBOARDWIPE, ::com::sun::star::animations::TransitionSubType::ACROSS, sal_True },
-        { "plus(out)", ::com::sun::star::animations::TransitionType::FOURBOXWIPE, ::com::sun::star::animations::TransitionSubType::CORNERSIN, sal_False },
-        { "plus(in)", ::com::sun::star::animations::TransitionType::FOURBOXWIPE, ::com::sun::star::animations::TransitionSubType::CORNERSIN, sal_True },
-        { "diamond(out)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::DIAMOND, sal_True },
-        { "diamond(in)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::DIAMOND, sal_False },
-        { "circle(out)", ::com::sun::star::animations::TransitionType::ELLIPSEWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, sal_True },
-        { "circle(in)", ::com::sun::star::animations::TransitionType::ELLIPSEWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, sal_False },
-        { "box(out)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::RECTANGLE, sal_True },
-        { "box(in)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::RECTANGLE, sal_False },
-        { "wedge", ::com::sun::star::animations::TransitionType::FANWIPE, ::com::sun::star::animations::TransitionSubType::CENTERTOP, sal_True },
-        { "blinds(vertical)", ::com::sun::star::animations::TransitionType::BLINDSWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, sal_True },
-        { "blinds(horizontal)", ::com::sun::star::animations::TransitionType::BLINDSWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, sal_True },
-        { "fade", ::com::sun::star::animations::TransitionType::FADE, ::com::sun::star::animations::TransitionSubType::CROSSFADE, sal_True },
-        { "slide(fromTop)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMTOP, sal_True },
-        { "slide(fromRight)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMRIGHT, sal_True },
-        { "slide(fromLeft)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMLEFT, sal_True },
-        { "slide(fromBottom)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMBOTTOM, sal_True },
-        { "dissolve", ::com::sun::star::animations::TransitionType::DISSOLVE, ::com::sun::star::animations::TransitionSubType::DEFAULT, sal_True },
-        { "image", ::com::sun::star::animations::TransitionType::DISSOLVE, ::com::sun::star::animations::TransitionSubType::DEFAULT, sal_True }, // TODO
-        { NULL, 0, 0, sal_False }
+        { "wipe(up)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::TOPTOBOTTOM, true },
+        { "wipe(right)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::LEFTTORIGHT, false },
+        { "wipe(left)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::LEFTTORIGHT, true },
+        { "wipe(down)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::TOPTOBOTTOM, false },
+        { "wheel(1)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::ONEBLADE, true },
+        { "wheel(2)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::TWOBLADEVERTICAL, true },
+        { "wheel(3)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::THREEBLADE, true },
+        { "wheel(4)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::FOURBLADE, true },
+        { "wheel(8)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::EIGHTBLADE, true },
+        { "strips(downLeft)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALRIGHT, true },
+        { "strips(upLeft)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALLEFT, false },
+        { "strips(downRight)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALLEFT, true },
+        { "strips(upRight)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALRIGHT, false },
+        { "barn(inVertical)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, false },
+        { "barn(outVertical)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, true },
+        { "barn(inHorizontal)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, false },
+        { "barn(outHorizontal)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, true },
+        { "randombar(vertical)", ::com::sun::star::animations::TransitionType::RANDOMBARWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, true},
+        { "randombar(horizontal)", ::com::sun::star::animations::TransitionType::RANDOMBARWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, true },
+        { "checkerboard(down)", ::com::sun::star::animations::TransitionType::CHECKERBOARDWIPE, ::com::sun::star::animations::TransitionSubType::DOWN, true},
+        { "checkerboard(across)", ::com::sun::star::animations::TransitionType::CHECKERBOARDWIPE, ::com::sun::star::animations::TransitionSubType::ACROSS, true },
+        { "plus(out)", ::com::sun::star::animations::TransitionType::FOURBOXWIPE, ::com::sun::star::animations::TransitionSubType::CORNERSIN, false },
+        { "plus(in)", ::com::sun::star::animations::TransitionType::FOURBOXWIPE, ::com::sun::star::animations::TransitionSubType::CORNERSIN, true },
+        { "diamond(out)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::DIAMOND, true },
+        { "diamond(in)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::DIAMOND, false },
+        { "circle(out)", ::com::sun::star::animations::TransitionType::ELLIPSEWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, true },
+        { "circle(in)", ::com::sun::star::animations::TransitionType::ELLIPSEWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, false },
+        { "box(out)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::RECTANGLE, true },
+        { "box(in)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::RECTANGLE, false },
+        { "wedge", ::com::sun::star::animations::TransitionType::FANWIPE, ::com::sun::star::animations::TransitionSubType::CENTERTOP, true },
+        { "blinds(vertical)", ::com::sun::star::animations::TransitionType::BLINDSWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, true },
+        { "blinds(horizontal)", ::com::sun::star::animations::TransitionType::BLINDSWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, true },
+        { "fade", ::com::sun::star::animations::TransitionType::FADE, ::com::sun::star::animations::TransitionSubType::CROSSFADE, true },
+        { "slide(fromTop)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMTOP, true },
+        { "slide(fromRight)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMRIGHT, true },
+        { "slide(fromLeft)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMLEFT, true },
+        { "slide(fromBottom)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMBOTTOM, true },
+        { "dissolve", ::com::sun::star::animations::TransitionType::DISSOLVE, ::com::sun::star::animations::TransitionSubType::DEFAULT, true },
+        { "image", ::com::sun::star::animations::TransitionType::DISSOLVE, ::com::sun::star::animations::TransitionSubType::DEFAULT, true }, // TODO
+        { NULL, 0, 0, false }
     };
 
     const transition* transition::find( const OUString& rName )
diff --git a/oox/source/ppt/pptfilterhelpers.hxx b/oox/source/ppt/pptfilterhelpers.hxx
index cf167614073f..910f4f4b3bda 100644
--- a/oox/source/ppt/pptfilterhelpers.hxx
+++ b/oox/source/ppt/pptfilterhelpers.hxx
@@ -76,10 +76,10 @@ namespace oox { namespace ppt {
         const sal_Char* mpName;
         sal_Int16 mnType;
         sal_Int16 mnSubType;
-        sal_Bool mbDirection; // true: default geometric direction
+        bool mbDirection; // true: default geometric direction
 
         static const transition* find( const OUString& rName );
-        static const sal_Char* find( const sal_Int16 mnType, const sal_Int16 mnSubType, const sal_Bool bDirection );
+        static const sal_Char* find( const sal_Int16 mnType, const sal_Int16 mnSubType, const bool bDirection );
     };
     // END CUT&PASTE
 
diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx b/oox/source/ppt/pptgraphicshapecontext.cxx
index 7a411bf2f73b..b0772a87d7e0 100644
--- a/oox/source/ppt/pptgraphicshapecontext.cxx
+++ b/oox/source/ppt/pptgraphicshapecontext.cxx
@@ -76,7 +76,7 @@ ContextHandlerRef PPTGraphicShapeContext::onCreateContext( sal_Int32 aElementTok
         sal_Int32 nSubType( rAttribs.getToken( XML_type, XML_obj ) );
         mpShapePtr->setSubType( nSubType );
         OUString sIdx( rAttribs.getString( XML_idx ).get() );
-        sal_Bool bHasIdx = !sIdx.isEmpty();
+        bool bHasIdx = !sIdx.isEmpty();
         sal_Int32 nIdx = sIdx.toInt32();
         if( rAttribs.hasAttribute( XML_idx ) )
             mpShapePtr->setSubTypeIndex( nIdx );
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index 4c0a8e7e1275..c3aa2208beeb 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -100,7 +100,7 @@ sal_Int32 PowerPointImport::getSchemeColor( sal_Int32 nToken ) const
     sal_Int32 nColor = 0;
     if ( mpActualSlidePersist )
     {
-        sal_Bool bColorMapped = sal_False;
+        bool bColorMapped = false;
         oox::drawingml::ClrMapPtr pClrMapPtr( mpActualSlidePersist->getClrMap() );
         if ( pClrMapPtr )
             bColorMapped = pClrMapPtr->getColorMap( nToken );
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 953e2b8b6dc0..0c5ebe0b74c4 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -127,7 +127,7 @@ void PPTShape::addShape(
         {
             oox::drawingml::TextListStylePtr aMasterTextListStyle;
             Reference< lang::XMultiServiceFactory > xServiceFact( rFilterBase.getModel(), UNO_QUERY_THROW );
-            sal_Bool bClearText = sal_False;
+            bool bClearText = false;
 
             if ( sServiceName != "com.sun.star.drawing.GraphicObjectShape" &&
                  sServiceName != "com.sun.star.drawing.OLE2Shape" )
@@ -175,19 +175,19 @@ void PPTShape::addShape(
                     break;
                     case XML_dt :
                         sServiceName = "com.sun.star.presentation.DateTimeShape";
-                        bClearText = sal_True;
+                        bClearText = true;
                     break;
                     case XML_hdr :
                         sServiceName = "com.sun.star.presentation.HeaderShape";
-                        bClearText = sal_True;
+                        bClearText = true;
                     break;
                     case XML_ftr :
                         sServiceName = "com.sun.star.presentation.FooterShape";
-                        bClearText = sal_True;
+                        bClearText = true;
                     break;
                     case XML_sldNum :
                         sServiceName = "com.sun.star.presentation.SlideNumberShape";
-                        bClearText = sal_True;
+                        bClearText = true;
                     break;
                     case XML_sldImg :
                         sServiceName = "com.sun.star.presentation.PageShape";
diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx
index 617373380640..64747a4f3e39 100644
--- a/oox/source/ppt/pptshapecontext.cxx
+++ b/oox/source/ppt/pptshapecontext.cxx
@@ -214,7 +214,7 @@ ContextHandlerRef PPTShapeContext::onCreateContext( sal_Int32 aElementToken, con
         case PPT_TOKEN( txBody ):
         {
             oox::drawingml::TextBodyPtr xTextBody( new oox::drawingml::TextBody( mpShapePtr->getTextBody() ) );
-            xTextBody->getTextProperties().maPropertyMap.setProperty( PROP_FontIndependentLineSpacing, static_cast< sal_Bool >( sal_True ));
+            xTextBody->getTextProperties().maPropertyMap.setProperty( PROP_FontIndependentLineSpacing, true );
             mpShapePtr->setTextBody( xTextBody );
             return new oox::drawingml::TextBodyContext( *this, *xTextBody );
         }
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx
index 8bd8a4c477d9..a0eb00152436 100644
--- a/oox/source/ppt/presentationfragmenthandler.cxx
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
@@ -98,14 +98,14 @@ void ResolveTextFields( XmlFilterBase& rFilter )
                 {
                     const OUString sSlide = "#Slide ";
                     const OUString sNotes = "#Notes ";
-                    sal_Bool bNotes = sal_False;
+                    bool bNotes = false;
                     sal_Int32 nPageNumber = 0;
                     if ( aURL.match( sSlide ) )
                         nPageNumber = aURL.copy( sSlide.getLength() ).toInt32();
                     else if ( aURL.match( sNotes ) )
                     {
                         nPageNumber = aURL.copy( sNotes.getLength() ).toInt32();
-                        bNotes = sal_True;
+                        bNotes = true;
                     }
                     if ( nPageNumber )
                     {
@@ -376,7 +376,7 @@ void PresentationFragmentHandler::finalizeImport()
     // writing back the original PageCount of this document, it can be accessed from the XModel
     // via getArgs after the import.
     rFilterData["OriginalPageCount"] = makeAny(nPageCount);
-    sal_Bool bImportNotesPages = rFilterData.getUnpackedValueOrDefault("ImportNotesPages", sal_True);
+    bool bImportNotesPages = rFilterData.getUnpackedValueOrDefault("ImportNotesPages", sal_True);
     OUString aPageRange = rFilterData.getUnpackedValueOrDefault("PageRange", OUString());
 
     if( !aPageRange.getLength() )
diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx
index f0b5db7dd88c..ff31be238f49 100644
--- a/oox/source/ppt/timenode.cxx
+++ b/oox/source/ppt/timenode.cxx
@@ -298,7 +298,7 @@ namespace oox { namespace ppt {
             Reference< XCommand > xCommand( xNode, UNO_QUERY );
             Reference< XIterateContainer > xIterateContainer( xNode, UNO_QUERY );
             sal_Int16 nInt16 = 0;
-            sal_Bool bBool = sal_False;
+            bool bBool = false;
             double fDouble = 0;
             OUString sString;
             Sequence< NamedValue > aSeq;