chart2: sal_Bool->bool

Change-Id: I85751b4e636596ef88ef02bc958abdc6abf98427

101 files changed, 581 insertions, 581 deletions

diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
index 94e9120fe37d..aa90d3dafd71 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
@@ -149,7 +149,7 @@ OUString AccessibleChartShape::getAccessibleName()
 sal_Bool AccessibleChartShape::containsPoint( const awt::Point& aPoint )
     throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bReturn = sal_False;
+    bool bReturn = false;
     if ( m_pAccShape )
     {
         bReturn = m_pAccShape->containsPoint( aPoint );
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 3c07f886339d..ddad87b19fad 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -537,20 +537,20 @@ uno::Reference< util::XNumberFormats > SAL_CALL AxisWrapper::getNumberFormats()
     return uno::Reference< util::XNumberFormats >();
 }
 
-void AxisWrapper::getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDimensionIndex, sal_Bool& rbMainAxis )
+void AxisWrapper::getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDimensionIndex, bool& rbMainAxis )
 {
     switch( eType )
     {
         case X_AXIS:
-            rnDimensionIndex = 0; rbMainAxis = sal_True; break;
+            rnDimensionIndex = 0; rbMainAxis = true; break;
         case Y_AXIS:
-            rnDimensionIndex = 1; rbMainAxis = sal_True; break;
+            rnDimensionIndex = 1; rbMainAxis = true; break;
         case Z_AXIS:
-            rnDimensionIndex = 2; rbMainAxis = sal_True; break;
+            rnDimensionIndex = 2; rbMainAxis = true; break;
         case SECOND_X_AXIS:
-            rnDimensionIndex = 0; rbMainAxis = sal_False; break;
+            rnDimensionIndex = 0; rbMainAxis = false; break;
         case SECOND_Y_AXIS:
-            rnDimensionIndex = 1; rbMainAxis = sal_False; break;
+            rnDimensionIndex = 1; rbMainAxis = false; break;
     }
 }
 
@@ -612,7 +612,7 @@ Reference< chart2::XAxis > AxisWrapper::getAxis()
     try
     {
         sal_Int32 nDimensionIndex = 0;
-        sal_Bool  bMainAxis = sal_True;
+        bool  bMainAxis = true;
         AxisWrapper::getDimensionAndMainAxisBool( m_eType, nDimensionIndex, bMainAxis );
 
         Reference< XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
@@ -664,7 +664,7 @@ const std::vector< WrappedProperty* > AxisWrapper::createWrappedProperties()
         WrappedGapwidthProperty* pWrappedGapwidthProperty( new WrappedGapwidthProperty( m_spChart2ModelContact ) );
         WrappedBarOverlapProperty* pWrappedBarOverlapProperty( new WrappedBarOverlapProperty( m_spChart2ModelContact ) );
         sal_Int32 nDimensionIndex = 0;
-        sal_Bool  bMainAxis = sal_True;
+        bool  bMainAxis = true;
         sal_Int32 nAxisIndex = 0;
         AxisWrapper::getDimensionAndMainAxisBool( m_eType, nDimensionIndex, bMainAxis );
         if( !bMainAxis )
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
index 61ea830d5513..e6bebcad483c 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
@@ -65,7 +65,7 @@ public:
     AxisWrapper( tAxisType eType, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
     virtual ~AxisWrapper();
 
-    static void getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDimensionIndex, sal_Bool& rbMainAxis );
+    static void getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDimensionIndex, bool& rbMainAxis );
 
     /// XServiceInfo declarations
     APPHELPER_XSERVICEINFO_DECL()
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index 969f830f940e..7c71bb18203f 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
@@ -141,7 +141,7 @@ uno::Reference< drawing::XDrawPage > Chart2ModelContact::getDrawPage()
     return xResult;
 }
 
-sal_Bool Chart2ModelContact::getExplicitValuesForAxis(
+bool Chart2ModelContact::getExplicitValuesForAxis(
     const Reference< XAxis > & xAxis,
     ExplicitScaleData &  rOutExplicitScale,
     ExplicitIncrementData & rOutExplicitIncrement )
@@ -152,7 +152,7 @@ sal_Bool Chart2ModelContact::getExplicitValuesForAxis(
         return pProvider->getExplicitValuesForAxis(
             xAxis, rOutExplicitScale, rOutExplicitIncrement );
     }
-    return sal_False;
+    return false;
 }
 
 sal_Int32 Chart2ModelContact::getExplicitNumberFormatKeyForAxis(
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
index c73da310cda4..675147362b8a 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
@@ -70,7 +70,7 @@ public:
     /** get the current values calculated for an axis in the current view in
         case properties are 'auto'.
      */
-    sal_Bool getExplicitValuesForAxis(
+    bool getExplicitValuesForAxis(
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XAxis > & xAxis,
         ExplicitScaleData &  rOutExplicitScale,
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index 406c2ff76100..0689070da999 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
@@ -650,9 +650,9 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator )
         return;
 
     // remember some diagram properties to reset later
-    sal_Bool bStacked = sal_False;
-    sal_Bool bPercent = sal_False;
-    sal_Bool bDeep = sal_False;
+    bool bStacked = false;
+    bool bPercent = false;
+    bool bDeep = false;
     uno::Reference< ::com::sun::star::chart::XChartDocument > xOldDoc( xChartDoc, uno::UNO_QUERY );
     OSL_ASSERT( xOldDoc.is());
     uno::Reference< beans::XPropertySet > xDiaProp( xOldDoc->getDiagram(), uno::UNO_QUERY );
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 053ac1c43507..169c5d9ef7ee 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -307,7 +307,7 @@ WrappedDataSourceLabelsInFirstRowProperty::~WrappedDataSourceLabelsInFirstRowPro
 void WrappedDataSourceLabelsInFirstRowProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
                 throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    sal_Bool bLabelsInFirstRow = sal_True;
+    bool bLabelsInFirstRow = true;
     if( ! (rOuterValue >>= bLabelsInFirstRow) )
         throw lang::IllegalArgumentException("Property DataSourceLabelsInFirstRow requires value of type boolean", 0, 0 );
 
@@ -350,7 +350,7 @@ Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyValue( const Reference
             m_spChart2ModelContact->getChartModel(), aRangeString, aSequenceMapping, bUseColumns
             , bFirstCellAsLabel, bHasCategories ) )
     {
-        sal_Bool bLabelsInFirstRow = sal_True;
+        bool bLabelsInFirstRow = true;
         if( bUseColumns )
             bLabelsInFirstRow = bFirstCellAsLabel;
         else
@@ -405,7 +405,7 @@ WrappedDataSourceLabelsInFirstColumnProperty::~WrappedDataSourceLabelsInFirstCol
 void WrappedDataSourceLabelsInFirstColumnProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
                 throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    sal_Bool bLabelsInFirstRow = sal_True;
+    bool bLabelsInFirstRow = true;
     if( ! (rOuterValue >>= bLabelsInFirstRow) )
         throw lang::IllegalArgumentException("Property DataSourceLabelsInFirstRow requires value of type boolean", 0, 0 );
 
@@ -448,7 +448,7 @@ Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyValue( const Refere
             m_spChart2ModelContact->getChartModel(), aRangeString, aSequenceMapping, bUseColumns
             , bFirstCellAsLabel, bHasCategories ) )
     {
-        sal_Bool bLabelsInFirstColumn = sal_True;
+        bool bLabelsInFirstColumn = true;
         if( bUseColumns )
             bLabelsInFirstColumn = bHasCategories;
         else
@@ -500,7 +500,7 @@ WrappedHasLegendProperty::~WrappedHasLegendProperty()
 void WrappedHasLegendProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
                 throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    sal_Bool bNewValue = sal_True;
+    bool bNewValue = true;
     if( ! (rOuterValue >>= bNewValue) )
         throw lang::IllegalArgumentException("Property HasLegend requires value of type boolean", 0, 0 );
 
@@ -510,7 +510,7 @@ void WrappedHasLegendProperty::setPropertyValue( const Any& rOuterValue, const R
         if(xLegend.is())
         {
             Reference< beans::XPropertySet > xLegendProp( xLegend, uno::UNO_QUERY_THROW );
-            sal_Bool bOldValue = sal_True;
+            bool bOldValue = true;
             Any aAOld = xLegendProp->getPropertyValue("Show");
             aAOld >>= bOldValue;
             if( bOldValue != bNewValue )
@@ -584,7 +584,7 @@ WrappedHasMainTitleProperty::~WrappedHasMainTitleProperty()
 void WrappedHasMainTitleProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
                 throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    sal_Bool bNewValue = sal_True;
+    bool bNewValue = true;
     if( ! (rOuterValue >>= bNewValue) )
         throw lang::IllegalArgumentException("Property HasMainTitle requires value of type boolean", 0, 0 );
 
@@ -607,7 +607,7 @@ Any WrappedHasMainTitleProperty::getPropertyValue( const Reference< beans::XProp
     Any aRet;
     try
     {
-        aRet <<= sal_Bool( TitleHelper::getTitle( TitleHelper::MAIN_TITLE, m_spChart2ModelContact->getChartModel() ).is() );
+        aRet <<= TitleHelper::getTitle( TitleHelper::MAIN_TITLE, m_spChart2ModelContact->getChartModel() ).is();
     }
     catch (const uno::Exception& ex)
     {
@@ -657,7 +657,7 @@ WrappedHasSubTitleProperty::~WrappedHasSubTitleProperty()
 void WrappedHasSubTitleProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
                 throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    sal_Bool bNewValue = sal_True;
+    bool bNewValue = true;
     if( ! (rOuterValue >>= bNewValue) )
         throw lang::IllegalArgumentException("Property HasSubTitle requires value of type boolean", 0, 0 );
 
@@ -680,7 +680,7 @@ Any WrappedHasSubTitleProperty::getPropertyValue( const Reference< beans::XPrope
     Any aRet;
     try
     {
-        aRet <<= sal_Bool( TitleHelper::getTitle( TitleHelper::SUB_TITLE, m_spChart2ModelContact->getChartModel() ).is() );
+        aRet <<= TitleHelper::getTitle( TitleHelper::SUB_TITLE, m_spChart2ModelContact->getChartModel() ).is();
     }
     catch (const uno::Exception& ex)
     {
@@ -700,7 +700,7 @@ Any WrappedHasSubTitleProperty::getPropertyDefault( const Reference< beans::XPro
 ChartDocumentWrapper::ChartDocumentWrapper(
     const Reference< uno::XComponentContext > & xContext ) :
         m_spChart2ModelContact( new Chart2ModelContact( xContext ) ),
-        m_bUpdateAddIn( sal_True ),
+        m_bUpdateAddIn( true ),
         m_bIsDisposed( false )
 {
 }
@@ -1065,11 +1065,11 @@ void ChartDocumentWrapper::setAddIn( const Reference< util::XRefreshable >& xAdd
     }
 }
 
-void ChartDocumentWrapper::setUpdateAddIn( sal_Bool bUpdateAddIn )
+void ChartDocumentWrapper::setUpdateAddIn( bool bUpdateAddIn )
 {
     m_bUpdateAddIn = bUpdateAddIn;
 }
-sal_Bool ChartDocumentWrapper::getUpdateAddIn() const
+bool ChartDocumentWrapper::getUpdateAddIn() const
 {
     return m_bUpdateAddIn;
 }
@@ -1364,7 +1364,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
                         Sequence< Any > aArguments(2);
                         Reference<frame::XModel> xModel(this);
                         aArguments[0]=uno::makeAny(xModel);
-                        sal_Bool bRefreshAddIn = sal_True;
+                        bool bRefreshAddIn = true;
                         aArguments[1]=uno::makeAny(bRefreshAddIn);
                         xViewInit->initialize(aArguments);
                     }
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index 047f803bf4fe..d33e617faeaf 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -452,7 +452,7 @@ DataSeriesPointWrapper::DataSeriesPointWrapper(
         , m_eType( DATA_SERIES )
         , m_nSeriesIndexInNewAPI( -1 )
         , m_nPointIndex( -1 )
-        , m_bLinesAllowed(sal_True)
+        , m_bLinesAllowed(true)
         , m_xDataSeries(0)
 {
     //need initialize call afterwards
@@ -493,7 +493,7 @@ DataSeriesPointWrapper::DataSeriesPointWrapper( eType _eType,
     , m_eType( _eType )
     , m_nSeriesIndexInNewAPI( nSeriesIndexInNewAPI )
     , m_nPointIndex( (_eType == DATA_POINT) ? nPointIndex : -1 )
-    , m_bLinesAllowed( sal_False )
+    , m_bLinesAllowed( false )
     , m_xDataSeries(0)
 {
 }
@@ -616,7 +616,7 @@ beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const OU
         if( rPropertyName == "FillColor")
         {
             Reference< beans::XPropertySet > xSeriesProp( getDataSeries(), uno::UNO_QUERY );
-            sal_Bool bVaryColorsByPoint = sal_False;
+            bool bVaryColorsByPoint = false;
             if( xSeriesProp.is() && (xSeriesProp->getPropertyValue("VaryColorsByPoint") >>= bVaryColorsByPoint)
                 && bVaryColorsByPoint )
                 return beans::PropertyState_DIRECT_VALUE;
@@ -816,7 +816,7 @@ Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const OUString& rProperty
         if( rPropertyName == "FillColor" )
         {
             Reference< beans::XPropertySet > xSeriesProp( getDataSeries(), uno::UNO_QUERY );
-            sal_Bool bVaryColorsByPoint = sal_False;
+            bool bVaryColorsByPoint = false;
             if( xSeriesProp.is() && (xSeriesProp->getPropertyValue("VaryColorsByPoint") >>= bVaryColorsByPoint)
                 && bVaryColorsByPoint )
             {
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
index 743a5c172c44..f0cff4cc2d06 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
@@ -134,7 +134,7 @@ private:
     sal_Int32           m_nSeriesIndexInNewAPI;
     sal_Int32           m_nPointIndex;
 
-    sal_Bool            m_bLinesAllowed;
+    bool            m_bLinesAllowed;
 
     //this should only be used, if the DataSeriesPointWrapper is initialized via the XInitialize interface
     //because a big change in the chartmodel may lead to an dataseriespointer that is not connected to the model anymore
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index bd240f219b65..a62c6e242850 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -846,7 +846,7 @@ sal_Bool SAL_CALL DiagramWrapper::isExcludingDiagramPositioning() throw (uno::Ru
         Any aRelativePosition( xDiaProps->getPropertyValue( "RelativePosition" ) );
         if( aRelativeSize.hasValue() && aRelativePosition.hasValue() )
         {
-            sal_Bool bPosSizeExcludeAxes = false;
+            bool bPosSizeExcludeAxes = false;
             xDiaProps->getPropertyValue( "PosSizeExcludeAxes" ) >>= bPosSizeExcludeAxes;
             return bPosSizeExcludeAxes;
         }
@@ -1364,7 +1364,7 @@ bool WrappedStackingProperty::detectInnerValue( StackMode& eStackMode ) const
 void WrappedStackingProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
                 throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    sal_Bool bNewValue = false;
+    bool bNewValue = false;
     if( ! (rOuterValue >>= bNewValue) )
         throw lang::IllegalArgumentException( "Stacking Properties require boolean values", 0, 0 );
 
@@ -1396,7 +1396,7 @@ Any WrappedStackingProperty::getPropertyValue( const Reference< beans::XProperty
     StackMode eInnerStackMode;
     if( detectInnerValue( eInnerStackMode ) )
     {
-        sal_Bool bValue = (eInnerStackMode == m_eStackMode);
+        bool bValue = (eInnerStackMode == m_eStackMode);
         Any aAny;
         aAny <<= bValue;
         return aAny;
@@ -1408,7 +1408,7 @@ Any WrappedStackingProperty::getPropertyDefault( const Reference< beans::XProper
                         throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
-    aRet <<= sal_Bool( sal_False );
+    aRet <<= false;
     return aRet;
 }
 
@@ -1448,7 +1448,7 @@ WrappedDim3DProperty::~WrappedDim3DProperty()
 void WrappedDim3DProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
                 throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    sal_Bool bNew3D = false;
+    bool bNew3D = false;
     if( ! (rOuterValue >>= bNew3D) )
         throw lang::IllegalArgumentException( "Property Dim3D requires boolean value", 0, 0 );
 
@@ -1458,7 +1458,7 @@ void WrappedDim3DProperty::setPropertyValue( const Any& rOuterValue, const Refer
     if( !xDiagram.is() )
         return;
 
-    sal_Bool bOld3D = DiagramHelper::getDimension( xDiagram ) == 3;
+    bool bOld3D = DiagramHelper::getDimension( xDiagram ) == 3;
     if( bOld3D != bNew3D )
         DiagramHelper::setDimension( xDiagram, bNew3D ? 3 : 2 );
 }
@@ -1469,7 +1469,7 @@ Any WrappedDim3DProperty::getPropertyValue( const Reference< beans::XPropertySet
     Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
     if( xDiagram.is() )
     {
-        sal_Bool b3D = DiagramHelper::getDimension( xDiagram ) == 3;
+        bool b3D = DiagramHelper::getDimension( xDiagram ) == 3;
         m_aOuterValue <<= b3D;
     }
     return m_aOuterValue;
@@ -1479,7 +1479,7 @@ Any WrappedDim3DProperty::getPropertyDefault( const Reference< beans::XPropertyS
                         throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
-    aRet <<= sal_Bool( sal_False );
+    aRet <<= false;
     return aRet;
 }
 
@@ -1519,7 +1519,7 @@ WrappedVerticalProperty::~WrappedVerticalProperty()
 void WrappedVerticalProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
                 throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    sal_Bool bNewVertical = false;
+    bool bNewVertical = false;
     if( ! (rOuterValue >>= bNewVertical) )
         throw lang::IllegalArgumentException( "Property Vertical requires boolean value", 0, 0 );
 
@@ -1531,7 +1531,7 @@ void WrappedVerticalProperty::setPropertyValue( const Any& rOuterValue, const Re
 
     bool bFound = false;
     bool bAmbiguous = false;
-    sal_Bool bOldVertical = DiagramHelper::getVertical( xDiagram, bFound, bAmbiguous );
+    bool bOldVertical = DiagramHelper::getVertical( xDiagram, bFound, bAmbiguous );
     if( bFound && ( bOldVertical != bNewVertical || bAmbiguous ) )
         DiagramHelper::setVertical( xDiagram, bNewVertical );
 }
@@ -1544,7 +1544,7 @@ Any WrappedVerticalProperty::getPropertyValue( const Reference< beans::XProperty
     Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
     if( xDiagram.is() )
     {
-        sal_Bool bVertical = DiagramHelper::getVertical( xDiagram, bFound, bAmbiguous );
+        bool bVertical = DiagramHelper::getVertical( xDiagram, bFound, bAmbiguous );
         if( bFound )
             m_aOuterValue <<= bVertical;
     }
@@ -1555,7 +1555,7 @@ Any WrappedVerticalProperty::getPropertyDefault( const Reference< beans::XProper
                         throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
-    aRet <<= sal_Bool( sal_False );
+    aRet <<= false;
     return aRet;
 }
 
@@ -1999,7 +1999,7 @@ WrappedIncludeHiddenCellsProperty::~WrappedIncludeHiddenCellsProperty()
 void WrappedIncludeHiddenCellsProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
                 throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    sal_Bool bNewValue = false;
+    bool bNewValue = false;
     if( ! (rOuterValue >>= bNewValue) )
         throw lang::IllegalArgumentException( "Property Dim3D requires boolean value", 0, 0 );
 
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index 5aa6c35324b4..380bc7bc6f14 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -83,7 +83,7 @@ Any WrappedLegendAlignmentProperty::getPropertyValue( const Reference< beans::XP
     Any aRet;
     if( xInnerPropertySet.is() )
     {
-        sal_Bool bShowLegend = sal_True;
+        bool bShowLegend = true;
         xInnerPropertySet->getPropertyValue( "Show" ) >>= bShowLegend;
         if(!bShowLegend)
         {
@@ -103,12 +103,12 @@ void WrappedLegendAlignmentProperty::setPropertyValue( const Any& rOuterValue, c
 {
     if(xInnerPropertySet.is())
     {
-        sal_Bool bNewShowLegend = sal_True;
-        sal_Bool bOldShowLegend = sal_True;
+        bool bNewShowLegend = true;
+        bool bOldShowLegend = true;
         {
             ::com::sun::star::chart::ChartLegendPosition eOuterPos(::com::sun::star::chart::ChartLegendPosition_NONE);
             if( (rOuterValue >>= eOuterPos)  && eOuterPos == ::com::sun::star::chart::ChartLegendPosition_NONE )
-                bNewShowLegend = sal_False;
+                bNewShowLegend = false;
             xInnerPropertySet->getPropertyValue( "Show" ) >>= bOldShowLegend;
         }
         if(bNewShowLegend!=bOldShowLegend)
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
index 1afed5737854..ad3c3ddd0384 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
@@ -112,7 +112,7 @@ WrappedRefreshAddInAllowedProperty::~WrappedRefreshAddInAllowedProperty()
 void WrappedRefreshAddInAllowedProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const
                         throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    sal_Bool bUpdateAddIn = sal_True;
+    bool bUpdateAddIn = true;
     if( ! (rOuterValue >>= bUpdateAddIn) )
         throw lang::IllegalArgumentException( "The property RefreshAddInAllowed requires type boolean", 0, 0 );
 
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index 616a7b6ac9dd..1070945b1b0a 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -147,11 +147,11 @@ WrappedAxisAndGridExistenceProperty::~WrappedAxisAndGridExistenceProperty()
 void WrappedAxisAndGridExistenceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
                 throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    sal_Bool bNewValue = false;
+    bool bNewValue = false;
     if( ! (rOuterValue >>= bNewValue) )
         throw lang::IllegalArgumentException( "Has axis or grid properties require boolean values", 0, 0 );
 
-    sal_Bool bOldValue = sal_False;
+    bool bOldValue = false;
     getPropertyValue( xInnerPropertySet ) >>= bOldValue;
 
     if( bOldValue == bNewValue )
@@ -181,12 +181,12 @@ Any WrappedAxisAndGridExistenceProperty::getPropertyValue( const Reference< bean
     Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
     if(m_bAxis)
     {
-        sal_Bool bShown = AxisHelper::isAxisShown( m_nDimensionIndex, m_bMain, xDiagram );
+        bool bShown = AxisHelper::isAxisShown( m_nDimensionIndex, m_bMain, xDiagram );
         aRet <<= bShown;
     }
     else
     {
-        sal_Bool bShown = AxisHelper::isGridShown( m_nDimensionIndex, 0, m_bMain, xDiagram );
+        bool bShown = AxisHelper::isGridShown( m_nDimensionIndex, 0, m_bMain, xDiagram );
         aRet <<= bShown;
     }
     return aRet;
@@ -269,11 +269,11 @@ WrappedAxisTitleExistenceProperty::~WrappedAxisTitleExistenceProperty()
 void WrappedAxisTitleExistenceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
                 throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    sal_Bool bNewValue = false;
+    bool bNewValue = false;
     if( ! (rOuterValue >>= bNewValue) )
         throw lang::IllegalArgumentException( "Has axis or grid properties require boolean values", 0, 0 );
 
-    sal_Bool bOldValue = sal_False;
+    bool bOldValue = false;
     getPropertyValue( xInnerPropertySet ) >>= bOldValue;
 
     if( bOldValue == bNewValue )
@@ -294,11 +294,11 @@ void WrappedAxisTitleExistenceProperty::setPropertyValue( const Any& rOuterValue
 Any WrappedAxisTitleExistenceProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
                         throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    sal_Bool bHasTitle = sal_False;
+    bool bHasTitle = false;
 
     Reference< chart2::XTitle > xTitle( TitleHelper::getTitle( m_eTitleType, m_spChart2ModelContact->getChartModel() ) );
     if( xTitle.is() && !TitleHelper::getCompleteString( xTitle ).isEmpty() )
-        bHasTitle = sal_True;
+        bHasTitle = true;
 
     Any aRet;
     aRet <<= bHasTitle;
@@ -310,7 +310,7 @@ Any WrappedAxisTitleExistenceProperty::getPropertyDefault( const Reference< bean
                         throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
-    aRet <<= sal_Bool( sal_False );
+    aRet <<= false;
     return aRet;
 }
 
@@ -375,11 +375,11 @@ WrappedAxisLabelExistenceProperty::~WrappedAxisLabelExistenceProperty()
 void WrappedAxisLabelExistenceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
                 throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    sal_Bool bNewValue = false;
+    bool bNewValue = false;
     if( ! (rOuterValue >>= bNewValue) )
         throw lang::IllegalArgumentException( "Has axis or grid properties require boolean values", 0, 0 );
 
-    sal_Bool bOldValue = sal_False;
+    bool bOldValue = false;
     getPropertyValue( xInnerPropertySet ) >>= bOldValue;
 
     if( bOldValue == bNewValue )
@@ -407,7 +407,7 @@ Any WrappedAxisLabelExistenceProperty::getPropertyValue( const Reference< beans:
     if( xProp.is() )
         aRet = xProp->getPropertyValue( "DisplayLabels" );
     else
-        aRet <<= sal_False;
+        aRet <<= false;
     return aRet;
 }
 
@@ -415,7 +415,7 @@ Any WrappedAxisLabelExistenceProperty::getPropertyDefault( const Reference< bean
                         throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
-    aRet <<= sal_Bool( sal_True );
+    aRet <<= true;
     return aRet;
 }
 
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
index 38f830f320da..9a1966dc280d 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
@@ -150,7 +150,7 @@ void WrappedScaleProperty::setPropertyValue( tScaleProperty eScaleProperty, cons
 
     chart2::ScaleData aScaleData( xAxis->getScaleData() );
 
-    sal_Bool bBool = false;
+    bool bBool = false;
     switch( eScaleProperty )
     {
         case SCALE_PROP_MAX:
@@ -485,26 +485,26 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
         }
         case SCALE_PROP_AUTO_MAX:
         {
-            aRet <<= (sal_Bool)( !aScaleData.Maximum.hasValue() );
+            aRet <<= !aScaleData.Maximum.hasValue();
             break;
         }
         case SCALE_PROP_AUTO_MIN:
         {
-            aRet <<= (sal_Bool)( !aScaleData.Minimum.hasValue() );
+            aRet <<= !aScaleData.Minimum.hasValue();
             break;
         }
         case SCALE_PROP_AUTO_STEPMAIN:
         {
-            aRet <<= (sal_Bool)( !aScaleData.IncrementData.Distance.hasValue() );
+            aRet <<= !aScaleData.IncrementData.Distance.hasValue();
             break;
         }
         case SCALE_PROP_AUTO_STEPHELP:
         {
             Sequence< chart2::SubIncrement >& rSubIncrements( aScaleData.IncrementData.SubIncrements );
             if( rSubIncrements.getLength() > 0 )
-                aRet <<= (sal_Bool)( !rSubIncrements[ 0 ].IntervalCount.hasValue() );
+                aRet <<= !rSubIncrements[ 0 ].IntervalCount.hasValue();
             else
-                aRet <<= sal_True;
+                aRet <<= true;
             break;
         }
         case SCALE_PROP_ORIGIN:
@@ -565,12 +565,12 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
         }
         case SCALE_PROP_LOGARITHMIC:
         {
-            aRet <<= static_cast< sal_Bool >( AxisHelper::isLogarithmic(aScaleData.Scaling) );
+            aRet <<= AxisHelper::isLogarithmic(aScaleData.Scaling);
             break;
         }
         case SCALE_PROP_REVERSEDIRECTION:
         {
-            aRet <<= static_cast< sal_Bool >( AxisOrientation_REVERSE == aScaleData.Orientation );
+            aRet <<= AxisOrientation_REVERSE == aScaleData.Orientation;
             break;
         }
         default:
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index 6189fee41e87..f0e5080b3525 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -190,8 +190,8 @@ protected:
             // todo: use a valid context
             xErrorBarProperties = ::chart::createErrorBar( uno::Reference< uno::XComponentContext >() );
             //default in new and old api are different
-            xErrorBarProperties->setPropertyValue( "ShowPositiveError" , uno::makeAny(sal_Bool(sal_False)) );
-            xErrorBarProperties->setPropertyValue( "ShowNegativeError" , uno::makeAny(sal_Bool(sal_False)) );
+            xErrorBarProperties->setPropertyValue( "ShowPositiveError" , uno::makeAny(false) );
+            xErrorBarProperties->setPropertyValue( "ShowNegativeError" , uno::makeAny(false) );
             xErrorBarProperties->setPropertyValue( "ErrorBarStyle" , uno::makeAny(::com::sun::star::chart::ErrorBarStyle::NONE) );
             xSeriesPropertySet->setPropertyValue( "ErrorBarY" , uno::makeAny( xErrorBarProperties ) );
         }
@@ -332,7 +332,7 @@ WrappedMeanValueProperty::~WrappedMeanValueProperty()
 
 sal_Bool WrappedMeanValueProperty::getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     uno::Reference< chart2::XRegressionCurveContainer > xRegCnt( xSeriesPropertySet, uno::UNO_QUERY );
     if( xRegCnt.is() )
         bRet = RegressionCurveHelper::hasMeanValueLine( xRegCnt );
@@ -588,8 +588,8 @@ WrappedErrorIndicatorProperty::~WrappedErrorIndicatorProperty()
     uno::Reference< beans::XPropertySet > xErrorBarProperties;
     if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue( "ErrorBarY" ) >>= xErrorBarProperties ) && xErrorBarProperties.is())
     {
-        sal_Bool bPositive = sal_False;
-        sal_Bool bNegative = sal_False;
+        bool bPositive = false;
+        bool bNegative = false;
         xErrorBarProperties->getPropertyValue( "ShowPositiveError" ) >>= bPositive;
         xErrorBarProperties->getPropertyValue( "ShowNegativeError" ) >>= bNegative;
 
@@ -607,19 +607,19 @@ void WrappedErrorIndicatorProperty::setValueToSeries( const Reference< beans::XP
     uno::Reference< beans::XPropertySet > xErrorBarProperties( getOrCreateErrorBarProperties(xSeriesPropertySet) );
     if( xErrorBarProperties.is() )
     {
-        sal_Bool bPositive = sal_False;
-        sal_Bool bNegative = sal_False;
+        bool bPositive = false;
+        bool bNegative = false;
         switch( aNewValue )
         {
             case ::com::sun::star::chart::ChartErrorIndicatorType_TOP_AND_BOTTOM:
-                bPositive = sal_True;
-                bNegative = sal_True;
+                bPositive = true;
+                bNegative = true;
                 break;
             case ::com::sun::star::chart::ChartErrorIndicatorType_UPPER:
-                bPositive = sal_True;
+                bPositive = true;
                 break;
             case ::com::sun::star::chart::ChartErrorIndicatorType_LOWER:
-                bNegative = sal_True;
+                bNegative = true;
                 break;
             default:
                 break;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index d1b320553adc..9fef7daa751e 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -75,7 +75,7 @@ WrappedStockProperty::~WrappedStockProperty()
 void WrappedStockProperty::setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& /*xInnerPropertySet*/ ) const
                 throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
 {
-    sal_Bool bNewValue = false;
+    bool bNewValue = false;
     if( ! (rOuterValue >>= bNewValue) )
         throw lang::IllegalArgumentException( "stock properties require type sal_Bool", 0, 0 );
 
@@ -152,12 +152,12 @@ WrappedVolumeProperty::~WrappedVolumeProperty()
 
             if(    aTemplateAndService.second == "com.sun.star.chart2.template.StockVolumeLowHighClose"
                 || aTemplateAndService.second == "com.sun.star.chart2.template.StockVolumeOpenLowHighClose" )
-                m_aOuterValue <<= sal_Bool(sal_True);
+                m_aOuterValue <<= true;
             else if( !aTemplateAndService.second.isEmpty() || !m_aOuterValue.hasValue() )
-                m_aOuterValue <<= sal_Bool(sal_False);
+                m_aOuterValue <<= false;
         }
         else if(!m_aOuterValue.hasValue())
-            m_aOuterValue <<= sal_Bool(sal_False);
+            m_aOuterValue <<= false;
     }
     return m_aOuterValue;
 }
@@ -221,12 +221,12 @@ WrappedUpDownProperty::~WrappedUpDownProperty()
 
             if(    aTemplateAndService.second == "com.sun.star.chart2.template.StockOpenLowHighClose"
                 || aTemplateAndService.second == "com.sun.star.chart2.template.StockVolumeOpenLowHighClose" )
-                m_aOuterValue <<= sal_Bool(sal_True);
+                m_aOuterValue <<= true;
             else if( !aTemplateAndService.second.isEmpty() || !m_aOuterValue.hasValue() )
-                m_aOuterValue <<= sal_Bool(sal_False);
+                m_aOuterValue <<= false;
         }
         else if(!m_aOuterValue.hasValue())
-            m_aOuterValue <<= sal_Bool(sal_False);
+            m_aOuterValue <<= false;
     }
     return m_aOuterValue;
 }
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index e4784797110c..94174dd67114 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -564,7 +564,7 @@ void DataBrowser::RenewTable()
     long   nOldRow     = GetCurRow();
     sal_uInt16 nOldColId   = GetCurColumnId();
 
-    sal_Bool bLastUpdateMode = GetUpdateMode();
+    bool bLastUpdateMode = GetUpdateMode();
     SetUpdateMode( false );
 
     if( IsModified() )
@@ -718,7 +718,7 @@ double DataBrowser::GetCellNumber( long nRow, sal_uInt16 nColumnId ) const
 
 void DataBrowser::Resize()
 {
-    sal_Bool bLastUpdateMode = GetUpdateMode();
+    bool bLastUpdateMode = GetUpdateMode();
     SetUpdateMode( false );
 
     ::svt::EditBrowseBox::Resize();
@@ -1010,7 +1010,7 @@ void DataBrowser::PaintCell(
         rDev.SetClipRegion(Region(rRect));
 
     // allow for a disabled control ...
-    sal_Bool bEnabled = IsEnabled();
+    bool bEnabled = IsEnabled();
     Color aOriginalColor = rDev.GetTextColor();
     if( ! bEnabled )
         rDev.SetTextColor( GetSettings().GetStyleSettings().GetDisableColor() );
@@ -1221,7 +1221,7 @@ sal_Int16 DataBrowser::GetFirstVisibleColumNumber() const
 
 void DataBrowser::ColumnResized( sal_uInt16 nColId )
 {
-    sal_Bool bLastUpdateMode = GetUpdateMode();
+    bool bLastUpdateMode = GetUpdateMode();
     SetUpdateMode( false );
 
     EditBrowseBox::ColumnResized( nColId );
@@ -1231,7 +1231,7 @@ void DataBrowser::ColumnResized( sal_uInt16 nColId )
 
 void DataBrowser::EndScroll()
 {
-    sal_Bool bLastUpdateMode = GetUpdateMode();
+    bool bLastUpdateMode = GetUpdateMode();
     SetUpdateMode( false );
 
     EditBrowseBox::EndScroll();
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 1ceba0663a11..8dab243e5012 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -564,7 +564,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
                         Reference< chart2::XRegressionCurveCalculator > xCalculator( xCurve->getCalculator(), uno::UNO_QUERY_THROW );
                         sal_Int32 aDegree = 2;
                         sal_Int32 aPeriod = 2;
-                        sal_Bool aForceIntercept = false;
+                        bool aForceIntercept = false;
                         double aInterceptValue = 0.0;
                         uno::Reference< beans::XPropertySet > xProperties( xCurve, uno::UNO_QUERY );
                         if ( xProperties.is())
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index 3302233c094e..87734a58d8c4 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -84,7 +84,7 @@ void LegendPositionResources::writeToResources( const uno::Reference< frame::XMo
         if( xProp.is() )
         {
             //show
-            sal_Bool bShowLegend = sal_False;
+            bool bShowLegend = false;
             xProp->getPropertyValue( "Show" ) >>= bShowLegend;
             if (m_pCbxShow)
                 m_pCbxShow->Check( bShowLegend );
@@ -125,7 +125,7 @@ void LegendPositionResources::writeToModel( const ::com::sun::star::uno::Referen
 {
     try
     {
-        sal_Bool bShowLegend = m_pCbxShow ? m_pCbxShow->IsChecked() : false;
+        bool bShowLegend = m_pCbxShow ? m_pCbxShow->IsChecked() : false;
         ChartModel* pModel = dynamic_cast<ChartModel*>(xChartModel.get());
         uno::Reference< beans::XPropertySet > xProp( LegendHelper::getLegend( *pModel,m_xCC,bShowLegend ), uno::UNO_QUERY );
         if( xProp.is() )
diff --git a/chart2/source/controller/dialogs/res_Titles.cxx b/chart2/source/controller/dialogs/res_Titles.cxx
index 3f13b9b5b0e4..a00cae54bd7b 100644
--- a/chart2/source/controller/dialogs/res_Titles.cxx
+++ b/chart2/source/controller/dialogs/res_Titles.cxx
@@ -131,13 +131,13 @@ void TitleResources::writeToResources( const TitleDialogData& rInput )
 
 void TitleResources::readFromResources( TitleDialogData& rOutput )
 {
-    rOutput.aExistenceList[0] = static_cast<sal_Bool>(!m_pEd_Main->GetText().isEmpty());
-    rOutput.aExistenceList[1] = static_cast<sal_Bool>(!m_pEd_Sub->GetText().isEmpty());
-    rOutput.aExistenceList[2] = static_cast<sal_Bool>(!m_pEd_XAxis->GetText().isEmpty());
-    rOutput.aExistenceList[3] = static_cast<sal_Bool>(!m_pEd_YAxis->GetText().isEmpty());
-    rOutput.aExistenceList[4] = static_cast<sal_Bool>(!m_pEd_ZAxis->GetText().isEmpty());
-    rOutput.aExistenceList[5] = static_cast<sal_Bool>(!m_pEd_SecondaryXAxis->GetText().isEmpty());
-    rOutput.aExistenceList[6] = static_cast<sal_Bool>(!m_pEd_SecondaryYAxis->GetText().isEmpty());
+    rOutput.aExistenceList[0] = !m_pEd_Main->GetText().isEmpty();
+    rOutput.aExistenceList[1] = !m_pEd_Sub->GetText().isEmpty();
+    rOutput.aExistenceList[2] = !m_pEd_XAxis->GetText().isEmpty();
+    rOutput.aExistenceList[3] = !m_pEd_YAxis->GetText().isEmpty();
+    rOutput.aExistenceList[4] = !m_pEd_ZAxis->GetText().isEmpty();
+    rOutput.aExistenceList[5] = !m_pEd_SecondaryXAxis->GetText().isEmpty();
+    rOutput.aExistenceList[6] = !m_pEd_SecondaryYAxis->GetText().isEmpty();
 
     rOutput.aTextList[0] = m_pEd_Main->GetText();
     rOutput.aTextList[1] = m_pEd_Sub->GetText();
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index d76636d46c5a..164f930c164c 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -130,7 +130,7 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( Window* pWindow
     m_pMFPerspective->Enable( m_pCbxPerspective->IsChecked() );
 
     //RightAngledAxes
-    sal_Bool bRightAngledAxes = false;
+    bool bRightAngledAxes = false;
 
     uno::Reference< chart2::XDiagram > xDiagram( m_xSceneProperties, uno::UNO_QUERY );
     if( ChartTypeHelper::isSupportingRightAngledAxes(
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index b4f0d859cca7..eaa6ed5dc8f0 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -152,7 +152,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
     else
     {
         m_pCbShowDescription->EnableTriState( false );
-        sal_Bool bCheck = sal_False;
+        bool bCheck = false;
         if( aState == SFX_ITEM_SET )
             bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
         m_pCbShowDescription->Check( bCheck );
@@ -200,7 +200,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
     else
     {
         m_pCbTextOverlap->EnableTriState( false );
-        sal_Bool bCheck = sal_False;
+        bool bCheck = false;
         if( aState == SFX_ITEM_SET )
             bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
         m_pCbTextOverlap->Check( bCheck );
@@ -219,7 +219,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
     else
     {
         m_pCbTextBreak->EnableTriState( false );
-        sal_Bool bCheck = sal_False;
+        bool bCheck = false;
         if( aState == SFX_ITEM_SET )
             bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
         m_pCbTextBreak->Check( bCheck );
@@ -261,7 +261,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
     ToggleShowLabel( (void*)0 );
 }
 
-void SchAxisLabelTabPage::ShowStaggeringControls( sal_Bool bShowStaggeringControls )
+void SchAxisLabelTabPage::ShowStaggeringControls( bool bShowStaggeringControls )
 {
     m_bShowStaggeringControls = bShowStaggeringControls;
 
@@ -284,7 +284,7 @@ void SchAxisLabelTabPage::SetComplexCategories( bool bComplexCategories )
 
 IMPL_LINK_NOARG(SchAxisLabelTabPage, ToggleShowLabel)
 {
-    sal_Bool bEnable = ( m_pCbShowDescription->GetState() != TRISTATE_FALSE );
+    bool bEnable = ( m_pCbShowDescription->GetState() != TRISTATE_FALSE );
 
     m_pOrientHlp->Enable( bEnable );
     m_pFlOrder->Enable( bEnable );
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index 6d9aa3b1b57c..0013a0b440de 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -58,7 +58,7 @@ private:
     FixedText*               m_pFtTextDirection;
     TextDirectionListBox*    m_pLbTextDirection;
 
-    sal_Bool                m_bShowStaggeringControls;
+    bool                m_bShowStaggeringControls;
 
     sal_Int32           m_nInitialDegrees;
     bool                m_bHasInitialDegrees;       /// false = DialControl in tristate
@@ -78,7 +78,7 @@ public:
     virtual bool FillItemSet( SfxItemSet& rOutAttrs ) SAL_OVERRIDE;
     virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE;
 
-    void ShowStaggeringControls( sal_Bool bShowStaggeringControls );
+    void ShowStaggeringControls( bool bShowStaggeringControls );
     void SetComplexCategories( bool bComplexCategories );
 };
 } //namespace chart
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 2f071381160b..0108a454fcfc 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -219,16 +219,16 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
     PlaceLabelsSelectHdl( (void*)0 );
 
     // Tick marks
-    long nTicks=0,nMinorTicks=0;
+    long nTicks = 0, nMinorTicks = 0;
     if(rInAttrs.GetItemState(SCHATTR_AXIS_TICKS,true, &pPoolItem)== SFX_ITEM_SET)
-        nTicks=((const SfxInt32Item*)pPoolItem)->GetValue();
+        nTicks = ((const SfxInt32Item*)pPoolItem)->GetValue();
     if(rInAttrs.GetItemState(SCHATTR_AXIS_HELPTICKS,true, &pPoolItem)== SFX_ITEM_SET)
-        nMinorTicks=((const SfxInt32Item*)pPoolItem)->GetValue();
+        nMinorTicks = ((const SfxInt32Item*)pPoolItem)->GetValue();
 
-    m_pCB_TicksInner->Check(sal_Bool(nTicks&CHAXIS_MARK_INNER));
-    m_pCB_TicksOuter->Check(sal_Bool(nTicks&CHAXIS_MARK_OUTER));
-    m_pCB_MinorInner->Check(sal_Bool(nMinorTicks&CHAXIS_MARK_INNER));
-    m_pCB_MinorOuter->Check(sal_Bool(nMinorTicks&CHAXIS_MARK_OUTER));
+    m_pCB_TicksInner->Check(bool(nTicks&CHAXIS_MARK_INNER));
+    m_pCB_TicksOuter->Check(bool(nTicks&CHAXIS_MARK_OUTER));
+    m_pCB_MinorInner->Check(bool(nMinorTicks&CHAXIS_MARK_INNER));
+    m_pCB_MinorOuter->Check(bool(nMinorTicks&CHAXIS_MARK_OUTER));
 
     // Tick position
     if( rInAttrs.GetItemState( SCHATTR_AXIS_MARK_POSITION, false, &pPoolItem ) == SFX_ITEM_SET )
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index b73f7b609005..02e386f93a19 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -502,7 +502,7 @@ void DataSourceTabPage::updateControlState()
 
     m_pFT_DATALABELS->Show(!bHasCategories);
     m_pFT_CATEGORIES->Show( bHasCategories);
-    sal_Bool bShowIB = bHasRangeChooser;
+    bool bShowIB = bHasRangeChooser;
 
     m_pIMB_RANGE_CAT->Show(bShowIB);
 
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index c5eda1fd0b99..1c30d3b02f3e 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -85,7 +85,7 @@ void PolarOptionsTabPage::Reset(const SfxItemSet& rInAttrs)
     }
     if (rInAttrs.GetItemState(SCHATTR_CLOCKWISE, true, &pPoolItem) == SFX_ITEM_SET)
     {
-        sal_Bool bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
+        bool bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
         m_pCB_Clockwise->Check(bCheck);
     }
     else
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 63052fb3c76e..a9e854f9e58b 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -203,11 +203,11 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls()
 
     if( m_bIsDirty )
     {
-        sal_Bool bFirstCellAsLabel = ( m_pCB_FirstColumnAsLabel->IsChecked() && !m_pRB_Columns->IsChecked() )
+        bool bFirstCellAsLabel = ( m_pCB_FirstColumnAsLabel->IsChecked() && !m_pRB_Columns->IsChecked() )
             || ( m_pCB_FirstRowAsLabel->IsChecked()    && !m_pRB_Rows->IsChecked() );
-        sal_Bool bHasCategories = ( m_pCB_FirstColumnAsLabel->IsChecked() && m_pRB_Columns->IsChecked() )
+        bool bHasCategories = ( m_pCB_FirstColumnAsLabel->IsChecked() && m_pRB_Columns->IsChecked() )
             || ( m_pCB_FirstRowAsLabel->IsChecked()    && m_pRB_Rows->IsChecked() );
-        sal_Bool bTimeBased = m_pCB_TimeBased->IsChecked();
+        bool bTimeBased = m_pCB_TimeBased->IsChecked();
 
         Sequence< beans::PropertyValue > aArguments(
             DataSourceHelper::createArguments(
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index e0a7c42ca6d4..4b2fed5c0b5a 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -147,7 +147,7 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
 
     if (rInAttrs.GetItemState(SCHATTR_BAR_CONNECT, true, &pPoolItem) == SFX_ITEM_SET)
     {
-        sal_Bool bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
+        bool bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
         m_pCBConnect->Check(bCheck);
     }
 
@@ -160,7 +160,7 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
     {
         // model property is "group bars per axis", UI feature is the other way
         // round: "show bars side by side"
-        sal_Bool bCheck = ! static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
+        bool bCheck = ! static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
         m_pCBAxisSideBySide->Check( bCheck );
     }
     else
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index e551c54b128d..f7e189888add 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -79,8 +79,8 @@ void TitlesAndObjectsTabPage::initializePage()
         uno::Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram( m_xChartModel );
         uno::Sequence< sal_Bool > aPossibilityList;
         uno::Sequence< sal_Bool > aExistenceList;
-        AxisHelper::getAxisOrGridPossibilities( aPossibilityList, xDiagram, sal_False );
-        AxisHelper::getAxisOrGridExcistence( aExistenceList, xDiagram, sal_False );
+        AxisHelper::getAxisOrGridPossibilities( aPossibilityList, xDiagram, false );
+        AxisHelper::getAxisOrGridExcistence( aExistenceList, xDiagram, false );
         m_pCB_Grid_X->Enable( aPossibilityList[0] );
         m_pCB_Grid_Y->Enable( aPossibilityList[1] );
         m_pCB_Grid_Z->Enable( aPossibilityList[2] );
@@ -123,7 +123,7 @@ void TitlesAndObjectsTabPage::commitToModel()
     {
         uno::Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram( xModel );
         uno::Sequence< sal_Bool > aOldExistenceList;
-        AxisHelper::getAxisOrGridExcistence( aOldExistenceList, xDiagram, sal_False );
+        AxisHelper::getAxisOrGridExcistence( aOldExistenceList, xDiagram, false );
         uno::Sequence< sal_Bool > aNewExistenceList(aOldExistenceList);
         aNewExistenceList[0] = m_pCB_Grid_X->IsChecked();
         aNewExistenceList[1] = m_pCB_Grid_Y->IsChecked();
diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
index c87cd2ceb51f..1cf5a8e81b3d 100644
--- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx
+++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
@@ -71,8 +71,8 @@ public:
     void setAddIn( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable >& xAddIn );
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable > getAddIn() const;
 
-    void setUpdateAddIn( sal_Bool bUpdateAddIn );
-    sal_Bool getUpdateAddIn() const;
+    void setUpdateAddIn( bool bUpdateAddIn );
+    bool getUpdateAddIn() const;
 
     void setBaseDiagram( const OUString& rBaseDiagram );
     OUString getBaseDiagram() const;
@@ -210,7 +210,7 @@ private: //member
 
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable > m_xAddIn;
     OUString   m_aBaseDiagram;
-    sal_Bool        m_bUpdateAddIn;
+    bool        m_bUpdateAddIn;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >   m_xChartView;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>
diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
index 2ee4ca1d7de1..4173005d8811 100644
--- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
+++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
@@ -65,7 +65,7 @@ private:
 
     sal_Int32 m_nBarOverlap;
     sal_Int32 m_nGapWidth;
-    sal_Bool  m_bConnectBars;
+    bool  m_bConnectBars;
 
     bool m_bSupportingAxisSideBySide;
     bool m_bGroupBarsPerAxis;
diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
index 5113b9914098..5bb42e98720a 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
@@ -110,7 +110,7 @@ private:
         com::sun::star::awt::XWindow >               m_xParentWindow;
 
     CreationWizard*     m_pDialog;
-    sal_Bool            m_bUnlockControllersOnExecute;
+    bool            m_bUnlockControllersOnExecute;
 };
 
 } //namespace chart
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index 328dd8cad1b0..6a15e71846f7 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -217,7 +217,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI
 
         case SCHATTR_AXIS_LOGARITHM:
             {
-                sal_Bool bValue = AxisHelper::isLogarithmic( rScale.Scaling );
+                bool bValue = AxisHelper::isLogarithmic( rScale.Scaling );
                 rOutItemSet.Put( SfxBoolItem( nWhichId, bValue ));
             }
             break;
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 782b0f9c8e95..57643b71db85 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -238,7 +238,7 @@ DataPointItemConverter::DataPointItemConverter(
     uno::Reference< XChartType > xChartType( DiagramHelper::getChartTypeOfSeries( xDiagram , xSeries ) );
     bool bFound = false;
     bool bAmbiguous = false;
-    sal_Bool bSwapXAndY = DiagramHelper::getVertical( xDiagram, bFound, bAmbiguous );
+    bool bSwapXAndY = DiagramHelper::getVertical( xDiagram, bFound, bAmbiguous );
     m_aAvailableLabelPlacements = ChartTypeHelper::getSupportedLabelPlacements( xChartType, DiagramHelper::getDimension( xDiagram ), bSwapXAndY, xSeries );
 
     m_bForbidPercentValue = AxisType::CATEGORY != ChartTypeHelper::getAxisType( xChartType, 0 );
@@ -319,19 +319,19 @@ bool DataPointItemConverter::ApplySpecialItem(
                 sal_Bool& rValue = (SCHATTR_DATADESCR_SHOW_NUMBER==nWhichId) ? aLabel.ShowNumber : (
                     (SCHATTR_DATADESCR_SHOW_PERCENTAGE==nWhichId) ? aLabel.ShowNumberInPercent : (
                     (SCHATTR_DATADESCR_SHOW_CATEGORY==nWhichId) ? aLabel.ShowCategoryName : aLabel.ShowLegendSymbol ));
-                sal_Bool bOldValue = rValue;
-                rValue = static_cast< sal_Bool >( rItem.GetValue() );
+                bool bOldValue = rValue;
+                rValue = rItem.GetValue();
                 if( m_bOverwriteLabelsForAttributedDataPointsAlso )
                 {
                     Reference< chart2::XDataSeries > xSeries( GetPropertySet(), uno::UNO_QUERY);
-                    if( bOldValue != rValue ||
+                    if( (bOldValue ? 1 : 0) != rValue ||
                         DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "Label" , aOldValue ) )
                     {
                         DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "Label" , uno::makeAny( aLabel ) );
                         bChanged = true;
                     }
                 }
-                else if( bOldValue != rValue )
+                else if( (bOldValue ? 1 : 0) != rValue )
                 {
                     GetPropertySet()->setPropertyValue( "Label" , uno::makeAny( aLabel ));
                     bChanged = true;
@@ -541,7 +541,7 @@ void DataPointItemConverter::FillSpecialItem(
             chart2::DataPointLabel aLabel;
             if( GetPropertySet()->getPropertyValue( "Label" ) >>= aLabel )
             {
-                sal_Bool bValue = (SCHATTR_DATADESCR_SHOW_NUMBER==nWhichId) ? aLabel.ShowNumber : (
+                bool bValue = (SCHATTR_DATADESCR_SHOW_NUMBER==nWhichId) ? aLabel.ShowNumber : (
                     (SCHATTR_DATADESCR_SHOW_PERCENTAGE==nWhichId) ? aLabel.ShowNumberInPercent : (
                     (SCHATTR_DATADESCR_SHOW_CATEGORY==nWhichId) ? aLabel.ShowCategoryName : aLabel.ShowLegendSymbol ));
 
diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
index d57e69872056..31e1e3ca0b91 100644
--- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
@@ -109,8 +109,8 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe
             const SfxPoolItem* pPoolItem = NULL;
             if( rInItemSet.GetItemState( SCHATTR_LEGEND_SHOW, true, &pPoolItem ) == SFX_ITEM_SET )
             {
-                sal_Bool bShow = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
-                sal_Bool bWasShown = sal_True;
+                bool bShow = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
+                bool bWasShown = true;
                 if( ! (GetPropertySet()->getPropertyValue( "Show" ) >>= bWasShown) ||
                     ( bWasShown != bShow ))
                 {
@@ -175,7 +175,7 @@ void LegendItemConverter::FillSpecialItem(
     {
         case SCHATTR_LEGEND_SHOW:
         {
-            sal_Bool bShow = sal_True;
+            bool bShow = true;
             GetPropertySet()->getPropertyValue( "Show" ) >>= bShow;
             rOutItemSet.Put( SfxBoolItem(SCHATTR_LEGEND_SHOW, bShow) );
         }
diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index e0efdc3b71d8..34042ca23fb8 100644
--- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -249,7 +249,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf
 
         case SCHATTR_BAR_CONNECT:
         {
-            sal_Bool bOldConnectBars = sal_False;
+            bool bOldConnectBars = false;
             m_bConnectBars = static_cast< const SfxBoolItem & >(
                 rItemSet.Get( nWhichId )).GetValue();
             if( m_bSupportingBarConnectors )
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 446a816a429d..b711d6b40188 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -93,8 +93,8 @@ using ::com::sun::star::uno::Sequence;
 
 ChartController::ChartController(uno::Reference<uno::XComponentContext> const & xContext) :
     m_aLifeTimeManager( NULL ),
-    m_bSuspended( sal_False ),
-    m_bCanClose( sal_True ),
+    m_bSuspended( false ),
+    m_bCanClose( true ),
     m_xCC(xContext), //@todo is it allowed to hold this context??
     m_xFrame( NULL ),
     m_aModelMutex(),
@@ -142,8 +142,8 @@ void ChartController::RefCountable::release()
 ChartController::TheModel::TheModel( const uno::Reference< frame::XModel > & xModel ) :
     m_xModel( xModel ),
     m_xCloseable( NULL ),
-    m_bOwnership( sal_True ),
-    m_bOwnershipIsWellKnown( sal_False )
+    m_bOwnership( true ),
+    m_bOwnershipIsWellKnown( false )
 {
     m_xCloseable =
         uno::Reference< util::XCloseable >( xModel, uno::UNO_QUERY );
@@ -153,10 +153,10 @@ ChartController::TheModel::~TheModel()
 {
 }
 
-void ChartController::TheModel::SetOwnership( sal_Bool bGetsOwnership )
+void ChartController::TheModel::SetOwnership( bool bGetsOwnership )
 {
     m_bOwnership                = bGetsOwnership;
-    m_bOwnershipIsWellKnown = sal_True;
+    m_bOwnershipIsWellKnown = true;
 }
 
 void ChartController::TheModel::addListener( ChartController* pController )
@@ -209,7 +209,7 @@ void ChartController::TheModel::tryTermination()
                 m_xCloseable->close(sal_True);
 
                 m_bOwnership                = false;
-                m_bOwnershipIsWellKnown = sal_True;
+                m_bOwnershipIsWellKnown = true;
             }
             catch( const util::CloseVetoException& )
             {
@@ -222,7 +222,7 @@ void ChartController::TheModel::tryTermination()
 #endif
 
                 m_bOwnership                = false;
-                m_bOwnershipIsWellKnown = sal_True;
+                m_bOwnershipIsWellKnown = true;
                 return;
             }
 
@@ -289,24 +289,24 @@ ChartController::TheModelRef::~TheModelRef()
     if(m_pTheModel)
         m_pTheModel->release();
 }
-sal_Bool ChartController::TheModelRef::is() const
+bool ChartController::TheModelRef::is() const
 {
     return (m_pTheModel != 0);
 }
 
 // private methods
 
-sal_Bool ChartController::impl_isDisposedOrSuspended() const
+bool ChartController::impl_isDisposedOrSuspended() const
 {
     if( m_aLifeTimeManager.impl_isDisposed() )
-        return sal_True;
+        return true;
 
     if( m_bSuspended )
     {
         OSL_FAIL( "This Controller is suspended" );
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 // lang::XServiceInfo
@@ -655,7 +655,7 @@ sal_Bool SAL_CALL ChartController::suspend( sal_Bool bSuspend )
     if( m_aLifeTimeManager.impl_isDisposed() )
         return sal_False; //behave passive if already disposed, return false because request was not accepted //@todo? correct
 
-    if(bSuspend==m_bSuspended)
+    if(bSuspend == (m_bSuspended ? 1 : 0))
     {
         OSL_FAIL( "new suspend mode equals old suspend mode" );
         return sal_True;
@@ -1160,7 +1160,7 @@ void SAL_CALL ChartController::dispatch(
         }
         else
         {
-            this->executeDispatch_MoveSeries( sal_True );
+            this->executeDispatch_MoveSeries( true );
         }
     }
     else if ( aCommand == "Backward" )
@@ -1171,7 +1171,7 @@ void SAL_CALL ChartController::dispatch(
         }
         else
         {
-            this->executeDispatch_MoveSeries( sal_False );
+            this->executeDispatch_MoveSeries( false );
         }
     }
     else if( aCommand == "NewArrangement")
@@ -1283,7 +1283,7 @@ void SAL_CALL ChartController::executeDispatch_SourceData()
     }
 }
 
-void SAL_CALL ChartController::executeDispatch_MoveSeries( sal_Bool bForward )
+void SAL_CALL ChartController::executeDispatch_MoveSeries( bool bForward )
 {
     ControllerLockGuardUNO aCLGuard( getModel() );
 
diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx
index 0698d56b682a..a207f517803b 100644
--- a/chart2/source/controller/main/ChartController.hxx
+++ b/chart2/source/controller/main/ChartController.hxx
@@ -462,7 +462,7 @@ private:
 
             virtual ~TheModel();
 
-            void        SetOwnership( sal_Bool bGetsOwnership );
+            void        SetOwnership( bool bGetsOwnership );
             void        addListener( ChartController* pController );
             void        removeListener(  ChartController* pController );
             void        tryTermination();
@@ -475,11 +475,11 @@ private:
 
             //the ownership between model and controller is not clear at first
             //each controller might consider himself as owner of the model first
-            sal_Bool volatile       m_bOwnership;
+            bool volatile       m_bOwnership;
             //with a XCloseable::close call and during XCloseListener::queryClosing
             //the ownership can be regulated more explicit,
             //if so the ownership is considered to be well known
-            sal_Bool volatile       m_bOwnershipIsWellKnown;
+            bool volatile       m_bOwnershipIsWellKnown;
     };
     class TheModelRef
     {
@@ -489,7 +489,7 @@ private:
             TheModelRef& operator=(ChartController::TheModel* pTheModel);
             TheModelRef& operator=(const TheModelRef& rTheModel);
             virtual ~TheModelRef();
-            sal_Bool is() const;
+            bool is() const;
                 TheModel* operator->() const { return m_pTheModel; }
         private:
             TheModel*               m_pTheModel;
@@ -500,8 +500,8 @@ private:
     mutable ::apphelper::LifeTimeManager    m_aLifeTimeManager;
 
     mutable ::osl::Mutex    m_aControllerMutex;
-    sal_Bool volatile       m_bSuspended;
-    sal_Bool volatile       m_bCanClose;
+    bool volatile       m_bSuspended;
+    bool volatile       m_bCanClose;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>        m_xCC;
 
@@ -548,7 +548,7 @@ private:
 private:
     //private methods
 
-    sal_Bool            impl_isDisposedOrSuspended() const;
+    bool            impl_isDisposedOrSuspended() const;
     ::std::auto_ptr< ReferenceSizeProvider > impl_createReferenceSizeProvider();
     void                impl_adaptDataSeriesAutoResize();
 
@@ -606,7 +606,7 @@ private:
     void SAL_CALL       executeDispatch_InsertSpecialCharacter();
     void SAL_CALL       executeDispatch_EditText( const Point* pMousePixel = NULL );
     void SAL_CALL       executeDispatch_SourceData();
-    void SAL_CALL       executeDispatch_MoveSeries( sal_Bool bForward );
+    void SAL_CALL       executeDispatch_MoveSeries( bool bForward );
 
     void                StartTextEdit( const Point* pMousePixel = NULL );
     bool                EndTextEdit();
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index 034b32678e94..ea435b650227 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -109,8 +109,8 @@ void ChartController::executeDispatch_InsertAxes()
     {
         InsertAxisOrGridDialogData aDialogInput;
         uno::Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram(getModel());
-        AxisHelper::getAxisOrGridExcistence( aDialogInput.aExistenceList, xDiagram, sal_True );
-        AxisHelper::getAxisOrGridPossibilities( aDialogInput.aPossibilityList, xDiagram, sal_True );
+        AxisHelper::getAxisOrGridExcistence( aDialogInput.aExistenceList, xDiagram, true );
+        AxisHelper::getAxisOrGridPossibilities( aDialogInput.aPossibilityList, xDiagram, true );
 
         SolarMutexGuard aGuard;
         SchAxisDlg aDlg( m_pChartWindow, aDialogInput );
@@ -147,8 +147,8 @@ void ChartController::executeDispatch_InsertGrid()
     {
         InsertAxisOrGridDialogData aDialogInput;
         uno::Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram(getModel());
-        AxisHelper::getAxisOrGridExcistence( aDialogInput.aExistenceList, xDiagram, sal_False );
-        AxisHelper::getAxisOrGridPossibilities( aDialogInput.aPossibilityList, xDiagram, sal_False );
+        AxisHelper::getAxisOrGridExcistence( aDialogInput.aExistenceList, xDiagram, false );
+        AxisHelper::getAxisOrGridPossibilities( aDialogInput.aPossibilityList, xDiagram, false );
 
         SolarMutexGuard aGuard;
         SchGridDlg aDlg( m_pChartWindow, aDialogInput );//aItemSet, b3D, bNet, bSecondaryX, bSecondaryY );
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index ace308d08fdd..729c816116b2 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -73,7 +73,7 @@ void ChartController::StartTextEdit( const Point* pMousePixel )
     if( xChartViewProps.is() )
         xChartViewProps->setPropertyValue( "SdrViewIsInEditMode", uno::makeAny(sal_True) );
 
-    sal_Bool bEdit = m_pDrawViewWrapper->SdrBeginTextEdit( pTextObj
+    bool bEdit = m_pDrawViewWrapper->SdrBeginTextEdit( pTextObj
                     , m_pDrawViewWrapper->GetPageView()
                     , m_pChartWindow
                     , false //bIsNewObj
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 66ea74f1ef6a..aded435f7e4a 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1886,7 +1886,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
 
     Point aMousePos( m_pChartWindow->PixelToLogic( rEvent.GetPosPixel()));
     sal_uInt16 nModifier = rEvent.GetModifier();
-    sal_Bool bLeftDown = rEvent.IsLeft();
+    bool bLeftDown = rEvent.IsLeft();
 
     if ( m_pDrawViewWrapper->IsTextEdit() )
     {
diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx
index f0b5fed3fa73..dd424a5551ac 100644
--- a/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/chart2/source/controller/main/ChartFrameloader.cxx
@@ -33,7 +33,7 @@ using namespace ::com::sun::star;
 
 ChartFrameLoader::ChartFrameLoader(
         uno::Reference<uno::XComponentContext> const & xContext)
-        : m_bCancelRequired( sal_False )
+        : m_bCancelRequired( false )
 {
     m_xCC = xContext;
     m_oCancelFinished.reset();
@@ -43,15 +43,15 @@ ChartFrameLoader::~ChartFrameLoader()
 {
 }
 
-    sal_Bool ChartFrameLoader
+    bool ChartFrameLoader
 ::impl_checkCancel()
 {
     if(m_bCancelRequired)
     {
         m_oCancelFinished.set();
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 // lang::XServiceInfo
@@ -180,9 +180,9 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT
 ::cancel() throw (uno::RuntimeException, std::exception)
 {
     m_oCancelFinished.reset();
-    m_bCancelRequired = sal_True;
+    m_bCancelRequired = true;
     m_oCancelFinished.wait();
-    m_bCancelRequired = sal_False;
+    m_bCancelRequired = false;
 }
 
 } //namespace chart
diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx
index 769a38572cfd..024ed2c1c2a0 100644
--- a/chart2/source/controller/main/ChartFrameloader.hxx
+++ b/chart2/source/controller/main/ChartFrameloader.hxx
@@ -40,11 +40,11 @@ class ChartFrameLoader : public ::cppu::WeakImplHelper2<
 {
 private:
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>        m_xCC;
-    sal_Bool            m_bCancelRequired;
+    bool            m_bCancelRequired;
     ::osl::Condition    m_oCancelFinished;
 
 private:
-        sal_Bool impl_checkCancel();
+        bool impl_checkCancel();
     //no default constructor
     ChartFrameLoader(){}
 public:
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
index f9e8e9816f77..9daa3dbee01b 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
@@ -64,7 +64,7 @@ DragMethod_RotateDiagram::DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWr
     , m_nAdditionalHorizontalAngleDegree(0)
     , m_nAdditionalVerticalAngleDegree(0)
     , m_eRotationDirection(eRotationDirection)
-    , m_bRightAngledAxes(sal_False)
+    , m_bRightAngledAxes(false)
 {
     m_pScene = SelectionHelper::getSceneToRotate( rDrawViewWrapper.getNamedSdrObject( rObjectCID ) );
     SdrObject* pObj = rDrawViewWrapper.getSelectedObject();
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
index c9d1fb1045bd..98825dfea7f2 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
@@ -75,7 +75,7 @@ private:
     sal_Int32 m_nAdditionalVerticalAngleDegree;
 
     RotationDirection m_eRotationDirection;
-    sal_Bool    m_bRightAngledAxes;
+    bool    m_bRightAngledAxes;
 };
 
 } //  namespace chart
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 5398e2e0d07b..c20e0af58f20 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -121,7 +121,7 @@ void DrawCommandDispatch::setAttributes( SdrObject* pObj )
         DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper();
         if ( pDrawModelWrapper && pDrawViewWrapper && pDrawViewWrapper->GetCurrentObjIdentifier() == OBJ_CUSTOMSHAPE )
         {
-            sal_Bool bAttributesAppliedFromGallery = sal_False;
+            bool bAttributesAppliedFromGallery = false;
             if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) )
             {
                 ::std::vector< OUString > aObjList;
@@ -162,7 +162,7 @@ void DrawCommandDispatch::setAttributes( SdrObject* pObj )
                                         double a = nAngle * F_PI18000;
                                         pObj->NbcRotate( pObj->GetSnapRect().Center(), nAngle, sin( a ), cos( a ) );
                                     }
-                                    bAttributesAppliedFromGallery = sal_True;
+                                    bAttributesAppliedFromGallery = true;
                                 }
                             }
                             break;
@@ -510,7 +510,7 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID )
                                 if ( pTextObj )
                                 {
                                     pTextObj->SetLogicRect( aRect );
-                                    sal_Bool bVertical = ( nID == COMMAND_ID_DRAW_TEXT_VERTICAL );
+                                    bool bVertical = ( nID == COMMAND_ID_DRAW_TEXT_VERTICAL );
                                     pTextObj->SetVerticalWriting( bVertical );
                                     if ( bVertical )
                                     {
@@ -530,7 +530,7 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID )
                         {
                             if ( pObj->ISA( SdrCaptionObj ) )
                             {
-                                sal_Bool bIsVertical( COMMAND_ID_DRAW_CAPTION_VERTICAL == nID );
+                                bool bIsVertical( COMMAND_ID_DRAW_CAPTION_VERTICAL == nID );
                                 SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( pObj );
                                 if ( pTextObj )
                                 {
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index 2f808e0de828..dea277159f20 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -259,7 +259,7 @@ void ShapeController::executeDispatch_FormatLine()
         {
             SdrObject* pSelectedObj = pDrawViewWrapper->getSelectedObject();
             SfxItemSet aAttr( pDrawViewWrapper->GetDefaultAttr() );
-            sal_Bool bHasMarked = pDrawViewWrapper->AreObjectsMarked();
+            bool bHasMarked = pDrawViewWrapper->AreObjectsMarked();
             if ( bHasMarked )
             {
                 pDrawViewWrapper->MergeAttrFromMarked( aAttr, false );
@@ -298,7 +298,7 @@ void ShapeController::executeDispatch_FormatArea()
         if ( pParent && pDrawModelWrapper && pDrawViewWrapper )
         {
             SfxItemSet aAttr( pDrawViewWrapper->GetDefaultAttr() );
-            sal_Bool bHasMarked = pDrawViewWrapper->AreObjectsMarked();
+            bool bHasMarked = pDrawViewWrapper->AreObjectsMarked();
             if ( bHasMarked )
             {
                 pDrawViewWrapper->MergeAttrFromMarked( aAttr, false );
@@ -340,7 +340,7 @@ void ShapeController::executeDispatch_TextAttributes()
         if ( pParent && pDrawViewWrapper )
         {
             SfxItemSet aAttr( pDrawViewWrapper->GetDefaultAttr() );
-            sal_Bool bHasMarked = pDrawViewWrapper->AreObjectsMarked();
+            bool bHasMarked = pDrawViewWrapper->AreObjectsMarked();
             if ( bHasMarked )
             {
                 pDrawViewWrapper->MergeAttrFromMarked( aAttr, false );
diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx
index 253091f97cc0..946dcbafdf03 100644
--- a/chart2/source/controller/main/ShapeToolbarController.cxx
+++ b/chart2/source/controller/main/ShapeToolbarController.cxx
@@ -184,7 +184,7 @@ void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Even
         aFind->second = Event.IsEnabled;
         if ( m_pToolbarController.is() )
         {
-            sal_Bool bCheckmark = sal_False;
+            bool bCheckmark = false;
             ToolBox& rTb = m_pToolbarController->GetToolBox();
 
             for ( sal_uInt16 i = 0; i < rTb.GetItemCount(); ++i )
diff --git a/chart2/source/inc/AxisHelper.hxx b/chart2/source/inc/AxisHelper.hxx
index b6e4a611c9dd..3aff9dd6f6a7 100644
--- a/chart2/source/inc/AxisHelper.hxx
+++ b/chart2/source/inc/AxisHelper.hxx
@@ -92,9 +92,9 @@ public:
     static void hideGrid( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid
                 , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram );
 
-    static sal_Bool isAxisShown( sal_Int32 nDimensionIndex, bool bMainAxis
+    static bool isAxisShown( sal_Int32 nDimensionIndex, bool bMainAxis
                 , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram );
-    static sal_Bool isGridShown( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid
+    static bool isGridShown( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid
                 , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram );
 
     static void makeAxisVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis );
@@ -106,9 +106,9 @@ public:
     static void hideAxisIfNoDataIsAttached( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis
                                           , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram);
 
-    SAL_DLLPRIVATE static sal_Bool areAxisLabelsVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xAxisProperties );
-    static sal_Bool isAxisVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis );
-    static sal_Bool isGridVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xGridProperties );
+    SAL_DLLPRIVATE static bool areAxisLabelsVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xAxisProperties );
+    static bool isAxisVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis );
+    static bool isGridVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xGridProperties );
 
     static ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XCoordinateSystem >
@@ -206,10 +206,10 @@ public:
                     ::com::sun::star::chart2::XDiagram >& xDiagram );
 
     static void getAxisOrGridPossibilities( ::com::sun::star::uno::Sequence< sal_Bool >& rPossibilityList
-        , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram>& xDiagram, sal_Bool bAxis=sal_True );
+        , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram>& xDiagram, bool bAxis=true );
 
     static void getAxisOrGridExcistence( ::com::sun::star::uno::Sequence< sal_Bool >& rExcistenceList
-        , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram>& xDiagram, sal_Bool bAxis=sal_True );
+        , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram>& xDiagram, bool bAxis=true );
 
     static bool changeVisibilityOfGrids( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram>& xDiagram
                         , const ::com::sun::star::uno::Sequence< sal_Bool >& rOldExistenceList
diff --git a/chart2/source/inc/ChartTypeHelper.hxx b/chart2/source/inc/ChartTypeHelper.hxx
index 2a3c7c50c592..1751a83cc850 100644
--- a/chart2/source/inc/ChartTypeHelper.hxx
+++ b/chart2/source/inc/ChartTypeHelper.hxx
@@ -36,16 +36,16 @@ namespace chart
 class OOO_DLLPUBLIC_CHARTTOOLS ChartTypeHelper
 {
 public:
-    static sal_Bool isSupportingGeometryProperties(  const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
-    static sal_Bool isSupportingStatisticProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
-    static sal_Bool isSupportingRegressionProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
-    static sal_Bool isSupportingMainAxis(            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex );
-    static sal_Bool isSupportingSecondaryAxis(       const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex );
-    static sal_Bool isSupportingAreaProperties(      const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
-    static sal_Bool isSupportingSymbolProperties(    const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
-    static sal_Bool isSupportingOverlapAndGapWidthProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
-    static sal_Bool isSupportingBarConnectors(       const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
-    static sal_Bool isSupportingRightAngledAxes(     const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
+    static bool isSupportingGeometryProperties(  const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+    static bool isSupportingStatisticProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+    static bool isSupportingRegressionProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+    static bool isSupportingMainAxis(            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex );
+    static bool isSupportingSecondaryAxis(       const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex );
+    static bool isSupportingAreaProperties(      const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+    static bool isSupportingSymbolProperties(    const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+    static bool isSupportingOverlapAndGapWidthProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+    static bool isSupportingBarConnectors(       const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+    static bool isSupportingRightAngledAxes(     const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
     static bool     isSupportingAxisSideBySide(      const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
     static bool     isSupportingStartingAngle(       const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
     //starting value for bars or baseline for areas for example
@@ -56,7 +56,7 @@ public:
 
     //returns sequence of ::com::sun::star::chart::DataLabelPlacement
     static ::com::sun::star::uno::Sequence < sal_Int32 > getSupportedLabelPlacements(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Bool bSwapXAndY
+        const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, bool bSwapXAndY
         , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries );
 
     //returns sequence of ::com::sun::star::chart::MissingValueTreatment
diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx
index 485579c61364..7c779c94f654 100644
--- a/chart2/source/inc/CommonConverters.hxx
+++ b/chart2/source/inc/CommonConverters.hxx
@@ -223,10 +223,10 @@ template< typename T >
 }
 
 OOO_DLLPUBLIC_CHARTTOOLS
-sal_Bool hasDoubleValue( const ::com::sun::star::uno::Any& rAny );
+bool hasDoubleValue( const ::com::sun::star::uno::Any& rAny );
 
 OOO_DLLPUBLIC_CHARTTOOLS
-sal_Bool  hasLongOrShortValue( const ::com::sun::star::uno::Any& rAny );
+bool  hasLongOrShortValue( const ::com::sun::star::uno::Any& rAny );
 OOO_DLLPUBLIC_CHARTTOOLS
 sal_Int16 getShortForLongAlso( const ::com::sun::star::uno::Any& rAny );
 
diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx
index ce7626d00977..4b208585fefd 100644
--- a/chart2/source/inc/LifeTime.hxx
+++ b/chart2/source/inc/LifeTime.hxx
@@ -39,21 +39,21 @@ friend class LifeTimeGuard;
 protected:
     mutable ::osl::Mutex                    m_aAccessMutex;
 public:
-OOO_DLLPUBLIC_CHARTTOOLS    LifeTimeManager( ::com::sun::star::lang::XComponent* pComponent, sal_Bool bLongLastingCallsCancelable = sal_False );
+OOO_DLLPUBLIC_CHARTTOOLS    LifeTimeManager( ::com::sun::star::lang::XComponent* pComponent, bool bLongLastingCallsCancelable = false );
 OOO_DLLPUBLIC_CHARTTOOLS    virtual ~LifeTimeManager();
 
 OOO_DLLPUBLIC_CHARTTOOLS    bool        impl_isDisposed( bool bAssert=true );
-OOO_DLLPUBLIC_CHARTTOOLS    sal_Bool    dispose() throw(::com::sun::star::uno::RuntimeException);
+OOO_DLLPUBLIC_CHARTTOOLS    bool    dispose() throw(::com::sun::star::uno::RuntimeException);
 
 public:
     ::cppu::OMultiTypeInterfaceContainerHelper      m_aListenerContainer;
 
 protected:
-    virtual sal_Bool    impl_canStartApiCall();
+    virtual bool    impl_canStartApiCall();
     virtual void        impl_apiCallCountReachedNull(){}
 
-    void        impl_registerApiCall(sal_Bool bLongLastingCall);
-    void        impl_unregisterApiCall(sal_Bool bLongLastingCall);
+    void        impl_registerApiCall(bool bLongLastingCall);
+    void        impl_unregisterApiCall(bool bLongLastingCall);
 
     void        impl_init();
 
@@ -63,10 +63,10 @@ protected:
     ::osl::Condition        m_aNoAccessCountCondition;
     sal_Int32 volatile      m_nAccessCount;
 
-    sal_Bool volatile       m_bDisposed;
-    sal_Bool volatile       m_bInDispose;
+    bool volatile       m_bDisposed;
+    bool volatile       m_bInDispose;
 
-    sal_Bool                m_bLongLastingCallsCancelable;
+    bool                m_bLongLastingCallsCancelable;
     ::osl::Condition        m_aNoLongLastingCallCountCondition;
     sal_Int32 volatile      m_nLongLastingCallCount;
 };
@@ -77,48 +77,48 @@ protected:
     ::com::sun::star::util::XCloseable*         m_pCloseable;
 
     ::osl::Condition        m_aEndTryClosingCondition;
-    sal_Bool volatile       m_bClosed;
-    sal_Bool volatile       m_bInTryClose;
+    bool volatile       m_bClosed;
+    bool volatile       m_bInTryClose;
     //the ownership between model and controller is not clear at first
     //each controller might consider him as owner of the model first
     //at start the model is not considered as owner of itself
-    sal_Bool volatile       m_bOwnership;
+    bool volatile       m_bOwnership;
     //with a XCloseable::close call and during XCloseListener::queryClosing
     //the ownership can be regulated more explicit,
     //if so the ownership is considered to be well known
-    sal_Bool volatile       m_bOwnershipIsWellKnown;
+    bool volatile       m_bOwnershipIsWellKnown;
 
 public:
 OOO_DLLPUBLIC_CHARTTOOLS    CloseableLifeTimeManager( ::com::sun::star::util::XCloseable* pCloseable
         , ::com::sun::star::lang::XComponent* pComponent
-        , sal_Bool bLongLastingCallsCancelable = sal_False );
+        , bool bLongLastingCallsCancelable = false );
 OOO_DLLPUBLIC_CHARTTOOLS    virtual ~CloseableLifeTimeManager();
 
 OOO_DLLPUBLIC_CHARTTOOLS    bool        impl_isDisposedOrClosed( bool bAssert=true );
-OOO_DLLPUBLIC_CHARTTOOLS    sal_Bool    g_close_startTryClose(sal_Bool bDeliverOwnership)
+OOO_DLLPUBLIC_CHARTTOOLS    bool    g_close_startTryClose(bool bDeliverOwnership)
                     throw ( ::com::sun::star::uno::Exception );
-OOO_DLLPUBLIC_CHARTTOOLS    sal_Bool    g_close_isNeedToCancelLongLastingCalls( sal_Bool bDeliverOwnership, ::com::sun::star::util::CloseVetoException& ex )
+OOO_DLLPUBLIC_CHARTTOOLS    bool    g_close_isNeedToCancelLongLastingCalls( bool bDeliverOwnership, ::com::sun::star::util::CloseVetoException& ex )
                     throw ( ::com::sun::star::util::CloseVetoException );
-OOO_DLLPUBLIC_CHARTTOOLS    void        g_close_endTryClose(sal_Bool bDeliverOwnership, sal_Bool bMyVeto );
+OOO_DLLPUBLIC_CHARTTOOLS    void        g_close_endTryClose(bool bDeliverOwnership, bool bMyVeto );
 OOO_DLLPUBLIC_CHARTTOOLS    void        g_close_endTryClose_doClose();
-OOO_DLLPUBLIC_CHARTTOOLS    sal_Bool    g_addCloseListener( const ::com::sun::star::uno::Reference<
+OOO_DLLPUBLIC_CHARTTOOLS    bool    g_addCloseListener( const ::com::sun::star::uno::Reference<
                     ::com::sun::star::util::XCloseListener > & xListener )
                     throw(::com::sun::star::uno::RuntimeException);
 
 protected:
-    virtual sal_Bool    impl_canStartApiCall() SAL_OVERRIDE;
+    virtual bool    impl_canStartApiCall() SAL_OVERRIDE;
     virtual void        impl_apiCallCountReachedNull() SAL_OVERRIDE;
 
-    void        impl_setOwnership( sal_Bool bDeliverOwnership, sal_Bool bMyVeto );
-    sal_Bool    impl_shouldCloseAtNextChance();
+    void        impl_setOwnership( bool bDeliverOwnership, bool bMyVeto );
+    bool    impl_shouldCloseAtNextChance();
     void        impl_doClose();
 
     void        impl_init()
     {
-        m_bClosed = sal_False;
-        m_bInTryClose = sal_False;
-        m_bOwnership = sal_False;
-        m_bOwnershipIsWellKnown = sal_False;
+        m_bClosed = false;
+        m_bInTryClose = false;
+        m_bOwnership = false;
+        m_bOwnershipIsWellKnown = false;
         m_aEndTryClosingCondition.set();
     }
 };
@@ -192,20 +192,20 @@ public:
     LifeTimeGuard( LifeTimeManager& rManager )
         : m_guard( rManager.m_aAccessMutex )
         , m_rManager(rManager)
-        , m_bCallRegistered(sal_False)
-        , m_bLongLastingCallRegistered(sal_False)
+        , m_bCallRegistered(false)
+        , m_bLongLastingCallRegistered(false)
     {
 
     }
-    sal_Bool startApiCall(sal_Bool bLongLastingCall=sal_False);
+    bool startApiCall(bool bLongLastingCall=false);
     ~LifeTimeGuard();
     void clear() { m_guard.clear(); }
 
 private:
     osl::ClearableMutexGuard m_guard;
     LifeTimeManager&    m_rManager;
-    sal_Bool            m_bCallRegistered;
-    sal_Bool            m_bLongLastingCallRegistered;
+    bool            m_bCallRegistered;
+    bool            m_bLongLastingCallRegistered;
 
 private:
     // these make no sense
diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx
index 35e89b55b6a3..6b056122bc46 100644
--- a/chart2/source/inc/MediaDescriptorHelper.hxx
+++ b/chart2/source/inc/MediaDescriptorHelper.hxx
@@ -75,115 +75,115 @@ public:
                         m_aModelProperties; //these are properties which are not described in service com.sun.star.document.MediaDescriptor
 
     //@todo define this for debug only, except URL
-    sal_Bool            AsTemplate; //document is a template.
-    sal_Bool            ISSET_AsTemplate;
+    bool            AsTemplate; //document is a template.
+    bool            ISSET_AsTemplate;
     OUString     Author;
-    sal_Bool            ISSET_Author;
+    bool            ISSET_Author;
     OUString     CharacterSet; //identifier of used character set.
-    sal_Bool            ISSET_CharacterSet;
+    bool            ISSET_CharacterSet;
     OUString     Comment;
-    sal_Bool            ISSET_Comment;
+    bool            ISSET_Comment;
 
     ::com::sun::star::uno::Any
                         ComponentData;
-    sal_Bool            ISSET_ComponentData;
+    bool            ISSET_ComponentData;
     OUString     FileName; //deprecated, same as url
-    sal_Bool            ISSET_FileName;
+    bool            ISSET_FileName;
     ::com::sun::star::uno::Any
                         FilterData;
-    sal_Bool            ISSET_FilterData;
+    bool            ISSET_FilterData;
     OUString     FilterName; //internal filter name.
-    sal_Bool            ISSET_FilterName;
+    bool            ISSET_FilterName;
     OUString     FilterFlags;//deprecated,
-    sal_Bool            ISSET_FilterFlags;
+    bool            ISSET_FilterFlags;
     OUString     FilterOptions;
-    sal_Bool            ISSET_FilterOptions;
+    bool            ISSET_FilterOptions;
             //not documented ... @todo remove?
     OUString     FrameName; //name of target frame.
-    sal_Bool            ISSET_FrameName;
-    sal_Bool            Hidden; //load document, invisible.
-    sal_Bool            ISSET_Hidden;
+    bool            ISSET_FrameName;
+    bool            Hidden; //load document, invisible.
+    bool            ISSET_Hidden;
 
     OUString     HierarchicalDocumentName;
-    sal_Bool            ISSET_HierarchicalDocumentName;
+    bool            ISSET_HierarchicalDocumentName;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
                         OutputStream; //a stream to receive the document data for saving
-    sal_Bool            ISSET_OutputStream;
+    bool            ISSET_OutputStream;
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
                         InputStream; //content of document.
-    sal_Bool            ISSET_InputStream;
+    bool            ISSET_InputStream;
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
                         InteractionHandler; //::com::sun::star::task::XInteractionHandler
-    sal_Bool            ISSET_InteractionHandler;
+    bool            ISSET_InteractionHandler;
 
     OUString     JumpMark;   //specifies the name of a mark within the document where the first view is to position itself.
-    sal_Bool            ISSET_JumpMark;
+    bool            ISSET_JumpMark;
     OUString     MediaType; //mime type.
-    sal_Bool            ISSET_MediaType;
+    bool            ISSET_MediaType;
     OUString     OpenFlags; //deprecated
-    sal_Bool            ISSET_OpenFlags;
-    sal_Bool            OpenNewView; //opens a new view for an already loaded document.
-    sal_Bool            ISSET_OpenNewView;
-    sal_Bool            Overwrite; //opens a new view for an already loaded document.
-    sal_Bool            ISSET_Overwrite;
+    bool            ISSET_OpenFlags;
+    bool            OpenNewView; //opens a new view for an already loaded document.
+    bool            ISSET_OpenNewView;
+    bool            Overwrite; //opens a new view for an already loaded document.
+    bool            ISSET_Overwrite;
     OUString     Password;
-    sal_Bool            ISSET_Password;
+    bool            ISSET_Password;
 
         //not documented ... @todo remove?
     ::com::sun::star::awt::Rectangle
                         PosSize; //position and size of document window.
-    sal_Bool            ISSET_PosSize;
+    bool            ISSET_PosSize;
 
     ::com::sun::star::uno::Sequence< sal_Int8 >
                         PostData; //contains the data for HTTP post method as a sequence of bytes.
-    sal_Bool            ISSET_PostData;
+    bool            ISSET_PostData;
     OUString     PostString; //deprecated, contains the data for HTTP post method as a sequence of bytes.
-    sal_Bool            ISSET_PostString;
-    sal_Bool            Preview; //show preview.
-    sal_Bool            ISSET_Preview;
-    sal_Bool            ReadOnly; //open document readonly.
-    sal_Bool            ISSET_ReadOnly;
+    bool            ISSET_PostString;
+    bool            Preview; //show preview.
+    bool            ISSET_Preview;
+    bool            ReadOnly; //open document readonly.
+    bool            ISSET_ReadOnly;
     OUString     Referer; //name of document referrer.
-    sal_Bool            ISSET_Referer;
+    bool            ISSET_Referer;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
                         StatusIndicator; //::com::sun::star::task::XStatusIndicator
-    sal_Bool            ISSET_StatusIndicator;
+    bool            ISSET_StatusIndicator;
         //not documented ... @todo remove?
-    sal_Bool            Silent; //prevents dialogs to query for more information.
-    sal_Bool            ISSET_Silent;
+    bool            Silent; //prevents dialogs to query for more information.
+    bool            ISSET_Silent;
     OUString     TemplateName; //deprecated, name of the template instead of the URL.
-    sal_Bool            ISSET_TemplateName;
+    bool            ISSET_TemplateName;
     OUString     TemplateRegionName; //deprecated, name of the region of the template.
-    sal_Bool            ISSET_TemplateRegionName;
-    sal_Bool            Unpacked;
-    sal_Bool            ISSET_Unpacked;
+    bool            ISSET_TemplateRegionName;
+    bool            Unpacked;
+    bool            ISSET_Unpacked;
     OUString     URL;// FileName, URL of the document.
-    sal_Bool            ISSET_URL;
+    bool            ISSET_URL;
     sal_Int16           Version; //storage version.
-    sal_Bool            ISSET_Version;
+    bool            ISSET_Version;
 
     ::com::sun::star::uno::Any
                         ViewData;
-    sal_Bool            ISSET_ViewData;
+    bool            ISSET_ViewData;
     sal_Int16           ViewId; //id of the initial view.
-    sal_Bool            ISSET_ViewId;
+    bool            ISSET_ViewId;
 
     // new framework objects
     ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
                         Storage;
-    sal_Bool            ISSET_Storage;
+    bool            ISSET_Storage;
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >
                         Stream;
-    sal_Bool            ISSET_Stream;
+    bool            ISSET_Stream;
 
     // undocumented SFX Properties
     ::com::sun::star::uno::Sequence< sal_Int32 >
                         WinExtent;
-    sal_Bool            ISSET_WinExtent;
-    sal_Bool            SetEmbedded;
-    sal_Bool            ISSET_SetEmbedded;
+    bool            ISSET_WinExtent;
+    bool            SetEmbedded;
+    bool            ISSET_SetEmbedded;
 
 protected:
 SAL_DLLPRIVATE void impl_init();
diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx
index 193e21421701..01809de9d128 100644
--- a/chart2/source/inc/ObjectIdentifier.hxx
+++ b/chart2/source/inc/ObjectIdentifier.hxx
@@ -261,7 +261,7 @@ public:
 
     static TitleHelper::eTitleType getTitleTypeForCID( const OUString& rCID );
 
-    static OUString getMovedSeriesCID( const OUString& rObjectCID, sal_Bool bForward );
+    static OUString getMovedSeriesCID( const OUString& rObjectCID, bool bForward );
 
     bool isValid() const;
     bool isAutoGeneratedObject() const;
diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx
index e4f8f9290092..72d2a0bdcb46 100644
--- a/chart2/source/inc/RegressionCurveCalculator.hxx
+++ b/chart2/source/inc/RegressionCurveCalculator.hxx
@@ -53,7 +53,7 @@ protected:
     double m_fCorrelationCoeffitient;
 
     sal_Int32 mDegree;
-    sal_Bool  mForceIntercept;
+    bool  mForceIntercept;
     double    mInterceptValue;
     sal_Int32 mPeriod;
 
diff --git a/chart2/source/inc/ThreeDHelper.hxx b/chart2/source/inc/ThreeDHelper.hxx
index f928a4ca986e..6c27f253231c 100644
--- a/chart2/source/inc/ThreeDHelper.hxx
+++ b/chart2/source/inc/ThreeDHelper.hxx
@@ -80,7 +80,7 @@ public:
 
     static void switchRightAngledAxes( const ::com::sun::star::uno::Reference<
             ::com::sun::star::beans::XPropertySet >& xSceneProperties
-            , sal_Bool bRightAngledAxes, bool bRotateLights=true );
+            , bool bRightAngledAxes, bool bRotateLights=true );
 
     static void adaptRadAnglesForRightAngledAxes( double& rfXAngleRad, double& rfYAngleRad );
     static double getXDegreeAngleLimitForRightAngledAxes();
diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
index 5367c199ac5f..b18381c3378e 100644
--- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx
+++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
@@ -48,7 +48,7 @@ public:
         In contrast to the model data these explicit values are always complete as misssing auto properties are calculated.
         If the given Axis could not be found or for another reason no correct output can be given false is returned.
      */
-    virtual sal_Bool getExplicitValuesForAxis(
+    virtual bool getExplicitValuesForAxis(
         ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > xAxis
         , ExplicitScaleData&  rExplicitScale
         , ExplicitIncrementData& rExplicitIncrement )=0;
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index d4f582e7657f..237c4e8388ca 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -626,7 +626,7 @@ sal_Int32 XMLFilter::impl_Export(
 
         SvtSaveOptions aSaveOpt;
         OUString sUsePrettyPrinting( "UsePrettyPrinting" );
-        sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() );
+        bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() );
         xInfoSet->setPropertyValue( sUsePrettyPrinting, uno::makeAny( bUsePrettyPrinting ) );
         if( ! bOasis )
             xInfoSet->setPropertyValue( "ExportTableNumberList", uno::makeAny( true ));
diff --git a/chart2/source/model/inc/BaseCoordinateSystem.hxx b/chart2/source/model/inc/BaseCoordinateSystem.hxx
index 27dcd8496c55..121138d14f44 100644
--- a/chart2/source/model/inc/BaseCoordinateSystem.hxx
+++ b/chart2/source/model/inc/BaseCoordinateSystem.hxx
@@ -59,7 +59,7 @@ public:
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::uno::XComponentContext > & xContext,
         sal_Int32 nDimensionCount = 2,
-        sal_Bool bSwapXAndYAxis = sal_False );
+        bool bSwapXAndYAxis = false );
     explicit BaseCoordinateSystem( const BaseCoordinateSystem & rSource );
     virtual ~BaseCoordinateSystem();
 
diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx
index 72d5fb6661dd..a7061dbd2453 100644
--- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx
+++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx
@@ -32,7 +32,7 @@ public:
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::uno::XComponentContext > & xContext,
         sal_Int32 nDimensionCount = 2,
-        sal_Bool bSwapXAndYAxis = sal_False );
+        bool bSwapXAndYAxis = false );
     explicit CartesianCoordinateSystem( const CartesianCoordinateSystem & rSource );
     virtual ~CartesianCoordinateSystem();
 
diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx
index 513e0126e6c1..dad791765a17 100644
--- a/chart2/source/model/inc/PolarCoordinateSystem.hxx
+++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx
@@ -32,7 +32,7 @@ public:
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::uno::XComponentContext > & xContext,
         sal_Int32 nDimensionCount = 2,
-        sal_Bool bSwapXAndYAxis = sal_False );
+        bool bSwapXAndYAxis = false );
     explicit PolarCoordinateSystem( const PolarCoordinateSystem & rSource );
     virtual ~PolarCoordinateSystem();
 
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index bd4ea1233266..c4acb4481232 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -125,7 +125,7 @@ namespace chart
 BaseCoordinateSystem::BaseCoordinateSystem(
     const Reference< uno::XComponentContext > & xContext,
     sal_Int32 nDimensionCount /* = 2 */,
-    sal_Bool bSwapXAndYAxis /* = sal_False */ ) :
+    bool bSwapXAndYAxis /* = sal_False */ ) :
         ::property::OPropertySet( m_aMutex ),
         m_xContext( xContext ),
         m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()),
@@ -159,7 +159,7 @@ BaseCoordinateSystem::BaseCoordinateSystem(
     for( sal_Int32 i = 0; i < m_nDimensionCount; ++i )
         m_aOrigin[ i ] = uno::makeAny( double( 0.0 ) );
 
-    setFastPropertyValue_NoBroadcast( PROP_COORDINATESYSTEM_SWAPXANDYAXIS, uno::makeAny( sal_Bool( bSwapXAndYAxis )));
+    setFastPropertyValue_NoBroadcast( PROP_COORDINATESYSTEM_SWAPXANDYAXIS, uno::makeAny( bSwapXAndYAxis ));
 }
 
 // explicit
diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx
index b594f6c50912..d5f2ed60cc31 100644
--- a/chart2/source/model/main/CartesianCoordinateSystem.cxx
+++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx
@@ -44,7 +44,7 @@ namespace chart
 CartesianCoordinateSystem::CartesianCoordinateSystem(
     const uno::Reference< uno::XComponentContext > & xContext,
     sal_Int32 nDimensionCount /* = 2 */,
-    sal_Bool bSwapXAndYAxis /* = sal_False */ ) :
+    bool bSwapXAndYAxis /* = sal_False */ ) :
         BaseCoordinateSystem( xContext, nDimensionCount, bSwapXAndYAxis )
 {}
 
@@ -92,7 +92,7 @@ APPHELPER_XSERVICEINFO_IMPL( CartesianCoordinateSystem,
 
 CartesianCoordinateSystem2d::CartesianCoordinateSystem2d(
     const uno::Reference< uno::XComponentContext > & xContext ) :
-        CartesianCoordinateSystem( xContext, 2, sal_False )
+        CartesianCoordinateSystem( xContext, 2, false )
 {}
 
 CartesianCoordinateSystem2d::~CartesianCoordinateSystem2d()
@@ -114,7 +114,7 @@ APPHELPER_XSERVICEINFO_IMPL( CartesianCoordinateSystem2d, lcl_aImplementationNam
 
 CartesianCoordinateSystem3d::CartesianCoordinateSystem3d(
     const uno::Reference< uno::XComponentContext > & xContext ) :
-        CartesianCoordinateSystem( xContext, 3, sal_False )
+        CartesianCoordinateSystem( xContext, 3, false )
 {}
 
 CartesianCoordinateSystem3d::~CartesianCoordinateSystem3d()
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index bb7f6a44263b..8468ecf71574 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -89,8 +89,8 @@ namespace chart
 
 ChartModel::ChartModel(uno::Reference<uno::XComponentContext > const & xContext)
     : m_aLifeTimeManager( this, this )
-    , m_bReadOnly( sal_False )
-    , m_bModified( sal_False )
+    , m_bReadOnly( false )
+    , m_bModified( false )
     , m_nInLoad(0)
     , m_bUpdateNotificationsPending(false)
     , mbTimeBased(false)
@@ -219,7 +219,7 @@ OUString ChartModel::impl_g_getLocation()
     return m_aResource;
 }
 
-sal_Bool ChartModel::impl_isControllerConnected( const uno::Reference< frame::XController >& xController )
+bool ChartModel::impl_isControllerConnected( const uno::Reference< frame::XController >& xController )
 {
     try
     {
@@ -227,13 +227,13 @@ sal_Bool ChartModel::impl_isControllerConnected( const uno::Reference< frame::XC
         for( sal_Int32 nN = aSeq.getLength(); nN--; )
         {
             if( aSeq[nN] == xController )
-                return sal_True;
+                return true;
         }
     }
     catch (const uno::Exception&)
     {
     }
-    return sal_False;
+    return false;
 }
 
 uno::Reference< frame::XController > ChartModel::impl_getCurrentController() throw(uno::RuntimeException)
@@ -633,7 +633,7 @@ void SAL_CALL ChartModel::close( sal_Bool bDeliverOwnership )
             ////you can empty this block, if you never start longlasting calls or
             ////if your longlasting calls are per default not cancelable (check how you have constructed your LifeTimeManager)
 
-            sal_Bool bLongLastingCallsAreCanceled = sal_False;
+            bool bLongLastingCallsAreCanceled = false;
             try
             {
                 //try to cancel running longlasting calls
@@ -647,7 +647,7 @@ void SAL_CALL ChartModel::close( sal_Bool bDeliverOwnership )
             //if not successful canceled
             if(!bLongLastingCallsAreCanceled)
             {
-                m_aLifeTimeManager.g_close_endTryClose( bDeliverOwnership, sal_True );
+                m_aLifeTimeManager.g_close_endTryClose( bDeliverOwnership, true );
                 throw aVetoException;
             }
         }
@@ -814,7 +814,7 @@ void SAL_CALL ChartModel::attachDataProvider( const uno::Reference< chart2::data
         {
             try
             {
-                sal_Bool bIncludeHiddenCells = ChartModelHelper::isIncludeHiddenCells( Reference< frame::XModel >(this) );
+                bool bIncludeHiddenCells = ChartModelHelper::isIncludeHiddenCells( Reference< frame::XModel >(this) );
                 xProp->setPropertyValue("IncludeHiddenCells", uno::makeAny(bIncludeHiddenCells));
             }
             catch (const beans::UnknownPropertyException&)
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index dd5d5ab5b21d..55a0cd4405f8 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -236,7 +236,7 @@ void SAL_CALL ChartModel::store()
           uno::RuntimeException, std::exception)
 {
     apphelper::LifeTimeGuard aGuard(m_aLifeTimeManager);
-    if(!aGuard.startApiCall(sal_True)) //start LongLastingCall
+    if(!aGuard.startApiCall(true)) //start LongLastingCall
         return; //behave passive if already disposed or closed or throw exception @todo?
 
     OUString aLocation = m_aResource;
@@ -259,14 +259,14 @@ void SAL_CALL ChartModel::storeAsURL(
     throw(io::IOException, uno::RuntimeException, std::exception)
 {
     apphelper::LifeTimeGuard aGuard(m_aLifeTimeManager);
-    if(!aGuard.startApiCall(sal_True)) //start LongLastingCall
+    if(!aGuard.startApiCall(true)) //start LongLastingCall
         return; //behave passive if already disposed or closed or throw exception @todo?
 
     apphelper::MediaDescriptorHelper aMediaDescriptorHelper(rMediaDescriptor);
     uno::Sequence< beans::PropertyValue > aReducedMediaDescriptor(
         aMediaDescriptorHelper.getReducedForModel() );
 
-    m_bReadOnly = sal_False;
+    m_bReadOnly = false;
     aGuard.clear();
 
     // create new storage
@@ -286,7 +286,7 @@ void SAL_CALL ChartModel::storeToURL(
           uno::RuntimeException, std::exception)
 {
     apphelper::LifeTimeGuard aGuard(m_aLifeTimeManager);
-    if(!aGuard.startApiCall(sal_True)) //start LongLastingCall
+    if(!aGuard.startApiCall(true)) //start LongLastingCall
         return; //behave passive if already disposed or closed or throw exception @todo?
     //do not change the internal state of the document here
 
@@ -513,7 +513,7 @@ void SAL_CALL ChartModel::load(
             {
                 attachResource( aMDHelper.URL, rMediaDescriptor );
                 impl_load( rMediaDescriptor, 0 ); // cannot create a storage from binary streams, but I do not need the storage here anyhow
-                m_bReadOnly = sal_True;
+                m_bReadOnly = true;
                 return;
             }
 
diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx
index ad11512aa343..3a82754426fa 100644
--- a/chart2/source/model/main/PolarCoordinateSystem.cxx
+++ b/chart2/source/model/main/PolarCoordinateSystem.cxx
@@ -44,7 +44,7 @@ namespace chart
 PolarCoordinateSystem::PolarCoordinateSystem(
     const uno::Reference< uno::XComponentContext > & xContext,
     sal_Int32 nDimensionCount /* = 2 */,
-    sal_Bool bSwapXAndYAxis /* = sal_False */ ) :
+    bool bSwapXAndYAxis /* = sal_False */ ) :
         BaseCoordinateSystem( xContext, nDimensionCount, bSwapXAndYAxis )
 {}
 
@@ -92,7 +92,7 @@ APPHELPER_XSERVICEINFO_IMPL( PolarCoordinateSystem,
 
 PolarCoordinateSystem2d::PolarCoordinateSystem2d(
     const uno::Reference< uno::XComponentContext > & xContext ) :
-        PolarCoordinateSystem( xContext, 2, sal_False )
+        PolarCoordinateSystem( xContext, 2, false )
 {}
 
 PolarCoordinateSystem2d::~PolarCoordinateSystem2d()
@@ -114,7 +114,7 @@ APPHELPER_XSERVICEINFO_IMPL( PolarCoordinateSystem2d, lcl_aImplementationNamePol
 
 PolarCoordinateSystem3d::PolarCoordinateSystem3d(
     const uno::Reference< uno::XComponentContext > & xContext ) :
-        PolarCoordinateSystem( xContext, 3, sal_False )
+        PolarCoordinateSystem( xContext, 3, false )
 {}
 
 PolarCoordinateSystem3d::~PolarCoordinateSystem3d()
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx
index 8a0334173751..5ccc30855a93 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -166,7 +166,7 @@ sal_Bool SAL_CALL BarChartTypeTemplate::matchesTemplate(
     sal_Bool bAdaptProperties )
     throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
+    bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
 
     //check BarDirection
     if( bResult )
@@ -175,9 +175,9 @@ sal_Bool SAL_CALL BarChartTypeTemplate::matchesTemplate(
         bool bAmbiguous = false;
         bool bVertical = DiagramHelper::getVertical( xDiagram, bFound, bAmbiguous );
         if( m_eBarDirection == HORIZONTAL )
-            bResult = sal_Bool( bVertical );
+            bResult = bVertical;
         else if( m_eBarDirection == VERTICAL )
-            bResult = sal_Bool( !bVertical );
+            bResult = !bVertical;
     }
 
     // adapt solid-type of template according to values in series
diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx
index 999fe504a5b9..42ce1be61ab1 100644
--- a/chart2/source/model/template/BubbleChartType.cxx
+++ b/chart2/source/model/template/BubbleChartType.cxx
@@ -131,7 +131,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
 {
     Reference< chart2::XCoordinateSystem > xResult(
         new CartesianCoordinateSystem(
-            GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ sal_False ));
+            GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ false ));
 
     for( sal_Int32 i=0; i<DimensionCount; ++i )
     {
diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx
index 7c5857753596..9fb275f7a61e 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -79,7 +79,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
 {
     Reference< chart2::XCoordinateSystem > xResult(
         new CartesianCoordinateSystem(
-            GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ sal_False ));
+            GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ false ));
 
     for( sal_Int32 i=0; i<DimensionCount; ++i )
     {
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index 1b2a69d037a0..e1296cfc9d3f 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -320,7 +320,7 @@ sal_Bool SAL_CALL ChartTypeTemplate::matchesTemplate(
     sal_Bool /* bAdaptProperties */ )
     throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bResult = sal_False;
+    bool bResult = false;
 
     if( ! xDiagram.is())
         return bResult;
@@ -449,7 +449,7 @@ void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram
     throw (uno::RuntimeException, std::exception)
 {
     // reset number format if we had percent stacking on
-    sal_Bool bPercent = (getStackMode(0) == StackMode_Y_STACKED_PERCENT);
+    bool bPercent = (getStackMode(0) == StackMode_Y_STACKED_PERCENT);
     if( bPercent )
     {
         Sequence< Reference< chart2::XAxis > > aAxisSeq( AxisHelper::getAllAxesOfDiagram( xDiagram ) );
@@ -754,7 +754,7 @@ void ChartTypeTemplate::adaptAxes(
                     if( nAxisIndex == MAIN_AXIS_INDEX || nAxisIndex == SECONDARY_AXIS_INDEX )
                     {
                         // adapt scales
-                        sal_Bool bPercent = (getStackMode(0) == StackMode_Y_STACKED_PERCENT);
+                        bool bPercent = (getStackMode(0) == StackMode_Y_STACKED_PERCENT);
                         if( bPercent && nDim == 1 )
                         {
                             Reference< beans::XPropertySet > xAxisProp( xAxis, uno::UNO_QUERY );
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index 901cd528eb8e..81489ffdcb99 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -280,7 +280,7 @@ sal_Bool SAL_CALL ColumnLineChartTypeTemplate::matchesTemplate(
     sal_Bool bAdaptProperties )
     throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bResult = sal_False;
+    bool bResult = false;
 
     if( ! xDiagram.is())
         return bResult;
diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx
index 591f259fc056..5d0f544d11fb 100644
--- a/chart2/source/model/template/LineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.cxx
@@ -204,7 +204,7 @@ sal_Bool SAL_CALL LineChartTypeTemplate::matchesTemplate(
     sal_Bool bAdaptProperties )
     throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
+    bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
 
     // check symbol-style and line-style
     // for a template with symbols (or with lines) it is ok, if there is at least one series
diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx
index deef738a1ec1..ab94fe3b018a 100644
--- a/chart2/source/model/template/NetChartType.cxx
+++ b/chart2/source/model/template/NetChartType.cxx
@@ -66,7 +66,7 @@ Reference< XCoordinateSystem > SAL_CALL
 
     Reference< XCoordinateSystem > xResult(
         new PolarCoordinateSystem(
-            GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ sal_False ));
+            GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ false ));
 
     Reference< XAxis > xAxis( xResult->getAxisByDimension( 0, MAIN_AXIS_INDEX ) );
     if( xAxis.is() )
diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx
index c0a907961250..ecf7435146ef 100644
--- a/chart2/source/model/template/NetChartTypeTemplate.cxx
+++ b/chart2/source/model/template/NetChartTypeTemplate.cxx
@@ -88,7 +88,7 @@ sal_Bool SAL_CALL NetChartTypeTemplate::matchesTemplate(
     sal_Bool bAdaptProperties )
     throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
+    bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
 
     uno::Reference< beans::XPropertySet > xChartTypeProp(
         DiagramHelper::getChartTypeByIndex( xDiagram, 0 ), uno::UNO_QUERY_THROW );
diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx
index 101335923bcb..312f25ca8cfa 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -128,7 +128,7 @@ namespace chart
 
 PieChartType::PieChartType(
     const uno::Reference< uno::XComponentContext > & xContext,
-    sal_Bool bUseRings  /* = sal_False */) :
+    bool bUseRings  /* = sal_False */) :
         ChartType( xContext )
 {
     if( bUseRings )
@@ -164,7 +164,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
 {
     Reference< chart2::XCoordinateSystem > xResult(
         new PolarCoordinateSystem(
-            GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ sal_False ));
+            GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ false ));
 
     for( sal_Int32 i=0; i<DimensionCount; ++i )
     {
diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx
index 575bfff47130..f82fb20e2c70 100644
--- a/chart2/source/model/template/PieChartType.hxx
+++ b/chart2/source/model/template/PieChartType.hxx
@@ -31,7 +31,7 @@ public:
     PieChartType(
         ::com::sun::star::uno::Reference<
             ::com::sun::star::uno::XComponentContext > const & xContext,
-        sal_Bool bUseRings = sal_False );
+        bool bUseRings = false );
     virtual ~PieChartType();
 
     virtual OUString SAL_CALL
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx
index 9da96d65045e..77294b0b5c9a 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -165,7 +165,7 @@ PieChartTypeTemplate::PieChartTypeTemplate(
 {
     setFastPropertyValue_NoBroadcast( PROP_PIE_TEMPLATE_OFFSET_MODE,    uno::makeAny( eMode ));
     setFastPropertyValue_NoBroadcast( PROP_PIE_TEMPLATE_DIMENSION,      uno::makeAny( nDim ));
-    setFastPropertyValue_NoBroadcast( PROP_PIE_TEMPLATE_USE_RINGS,      uno::makeAny( sal_Bool( bRings )));
+    setFastPropertyValue_NoBroadcast( PROP_PIE_TEMPLATE_USE_RINGS,      uno::makeAny( bRings ));
 }
 
 PieChartTypeTemplate::~PieChartTypeTemplate()
@@ -311,9 +311,9 @@ sal_Bool SAL_CALL PieChartTypeTemplate::matchesTemplate(
     sal_Bool bAdaptProperties )
     throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
+    bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
 
-    sal_Bool bTemplateUsesRings = sal_False;
+    bool bTemplateUsesRings = false;
     getFastPropertyValue( PROP_PIE_TEMPLATE_USE_RINGS ) >>= bTemplateUsesRings;
     chart2::PieChartOffsetMode ePieOffsetMode;
     getFastPropertyValue( PROP_PIE_TEMPLATE_OFFSET_MODE ) >>= ePieOffsetMode;
@@ -382,7 +382,7 @@ sal_Bool SAL_CALL PieChartTypeTemplate::matchesTemplate(
     {
         uno::Reference< beans::XPropertySet > xCTProp(
             DiagramHelper::getChartTypeByIndex( xDiagram, 0 ), uno::UNO_QUERY_THROW );
-        sal_Bool bUseRings = false;
+        bool bUseRings = false;
         if( xCTProp->getPropertyValue( "UseRings") >>= bUseRings )
         {
             bResult = ( bTemplateUsesRings == bUseRings );
@@ -460,7 +460,7 @@ void SAL_CALL PieChartTypeTemplate::applyStyle(
     {
         uno::Reference< beans::XPropertySet > xProp( xSeries, uno::UNO_QUERY_THROW );
 
-        sal_Bool bTemplateUsesRings = sal_False;
+        bool bTemplateUsesRings = false;
         getFastPropertyValue( PROP_PIE_TEMPLATE_USE_RINGS ) >>= bTemplateUsesRings;
         sal_Int32 nOuterSeriesIndex = 0; //@todo in future this will depend on Orientation of the radius axis scale
         if( nSeriesIndex == nOuterSeriesIndex )
diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx
index 7d83da334ca2..2ae99ea1da32 100644
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -183,7 +183,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
 {
     Reference< chart2::XCoordinateSystem > xResult(
         new CartesianCoordinateSystem(
-            GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ sal_False ));
+            GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ false ));
 
     for( sal_Int32 i=0; i<DimensionCount; ++i )
     {
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
index 371e2a4eeb6a..87efd97332d1 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
@@ -238,7 +238,7 @@ sal_Bool SAL_CALL ScatterChartTypeTemplate::matchesTemplate(
     sal_Bool bAdaptProperties )
     throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
+    bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
 
     // check symbol-style and line-style
     // for a template with symbols (or with lines) it is ok, if there is at least one series
diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx
index cf8ca49af8ee..8f9fae68db66 100644
--- a/chart2/source/model/template/StockChartTypeTemplate.cxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.cxx
@@ -408,14 +408,14 @@ sal_Bool SAL_CALL StockChartTypeTemplate::matchesTemplate(
     sal_Bool /* bAdaptProperties */ )
     throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bResult = sal_False;
+    bool bResult = false;
 
     if( ! xDiagram.is())
         return bResult;
 
     try
     {
-        sal_Bool bHasVolume = false, bHasOpenValue = false, bHasJapaneseStyle = false;
+        bool bHasVolume = false, bHasOpenValue = false, bHasJapaneseStyle = false;
 
         getFastPropertyValue( PROP_STOCKCHARTTYPE_TEMPLATE_VOLUME ) >>= bHasVolume;
         getFastPropertyValue( PROP_STOCKCHARTTYPE_TEMPLATE_OPEN ) >>= bHasOpenValue;
@@ -466,12 +466,12 @@ sal_Bool SAL_CALL StockChartTypeTemplate::matchesTemplate(
             Reference< beans::XPropertySet > xCTProp( xCandleStickChartType, uno::UNO_QUERY );
             if( xCTProp.is())
             {
-                sal_Bool bJapaneseProp = sal_False;
+                bool bJapaneseProp = false;
                 xCTProp->getPropertyValue( "Japanese") >>= bJapaneseProp;
                 bResult = bResult && ( bHasJapaneseStyle == bJapaneseProp );
 
                 // in old chart japanese == showFirst
-                sal_Bool bShowFirstProp = sal_False;
+                bool bShowFirstProp = false;
                 xCTProp->getPropertyValue( "ShowFirst") >>= bShowFirstProp;
                 bResult = bResult && ( bHasOpenValue == bShowFirstProp );
             }
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index 65c297fb6b01..600109454ec7 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -541,10 +541,10 @@ void AxisHelper::makeGridInvisible( const Reference< beans::XPropertySet >& xGri
     }
 }
 
-sal_Bool AxisHelper::isGridShown( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid
+bool AxisHelper::isGridShown( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid
                 , const Reference< ::com::sun::star::chart2::XDiagram >& xDiagram )
 {
-    sal_Bool bRet = false;
+    bool bRet = false;
 
     Reference< XCoordinateSystem > xCooSys = AxisHelper::getCoordinateSystemByIndex( xDiagram, nCooSysIndex );
     if(!xCooSys.is())
@@ -653,15 +653,15 @@ Reference< XAxis > AxisHelper::getParallelAxis( const Reference< XAxis >& xAxis
     return 0;
 }
 
-sal_Bool AxisHelper::isAxisShown( sal_Int32 nDimensionIndex, bool bMainAxis
+bool AxisHelper::isAxisShown( sal_Int32 nDimensionIndex, bool bMainAxis
             , const Reference< XDiagram >& xDiagram )
 {
     return AxisHelper::isAxisVisible( AxisHelper::getAxis( nDimensionIndex, bMainAxis, xDiagram ) );
 }
 
-sal_Bool AxisHelper::isAxisVisible( const Reference< XAxis >& xAxis )
+bool AxisHelper::isAxisVisible( const Reference< XAxis >& xAxis )
 {
-    sal_Bool bRet = false;
+    bool bRet = false;
 
     Reference< beans::XPropertySet > xProps( xAxis, uno::UNO_QUERY );
     if( xProps.is() )
@@ -674,9 +674,9 @@ sal_Bool AxisHelper::isAxisVisible( const Reference< XAxis >& xAxis )
     return bRet;
 }
 
-sal_Bool AxisHelper::areAxisLabelsVisible( const Reference< beans::XPropertySet >& xAxisProperties )
+bool AxisHelper::areAxisLabelsVisible( const Reference< beans::XPropertySet >& xAxisProperties )
 {
-    sal_Bool bRet = false;
+    bool bRet = false;
     if( xAxisProperties.is() )
     {
         xAxisProperties->getPropertyValue( "DisplayLabels" ) >>= bRet;
@@ -684,9 +684,9 @@ sal_Bool AxisHelper::areAxisLabelsVisible( const Reference< beans::XPropertySet
     return bRet;
 }
 
-sal_Bool AxisHelper::isGridVisible( const Reference< beans::XPropertySet >& xGridProperies )
+bool AxisHelper::isGridVisible( const Reference< beans::XPropertySet >& xGridProperies )
 {
-    sal_Bool bRet = false;
+    bool bRet = false;
 
     if( xGridProperies.is() )
     {
@@ -884,7 +884,7 @@ Sequence< Reference< beans::XPropertySet > > AxisHelper::getAllGrids( const Refe
 }
 
 void AxisHelper::getAxisOrGridPossibilities( Sequence< sal_Bool >& rPossibilityList
-        , const Reference< XDiagram>& xDiagram, sal_Bool bAxis )
+        , const Reference< XDiagram>& xDiagram, bool bAxis )
 {
     rPossibilityList.realloc(6);
 
@@ -956,7 +956,7 @@ bool AxisHelper::shouldAxisBeDisplayed( const Reference< XAxis >& xAxis
 }
 
 void AxisHelper::getAxisOrGridExcistence( Sequence< sal_Bool >& rExistenceList
-        , const Reference< XDiagram>& xDiagram, sal_Bool bAxis )
+        , const Reference< XDiagram>& xDiagram, bool bAxis )
 {
     rExistenceList.realloc(6);
 
diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx
index 325a366843ba..816a476aa4e2 100644
--- a/chart2/source/tools/ChartTypeHelper.cxx
+++ b/chart2/source/tools/ChartTypeHelper.cxx
@@ -56,7 +56,7 @@ bool ChartTypeHelper::isSupportingAxisSideBySide(
     return bResult;
 }
 
-sal_Bool ChartTypeHelper::isSupportingGeometryProperties( const uno::Reference< XChartType >& xChartType, sal_Int32 nDimensionCount )
+bool ChartTypeHelper::isSupportingGeometryProperties( const uno::Reference< XChartType >& xChartType, sal_Int32 nDimensionCount )
 {
     //form tab only for 3D-bar and 3D-column charts.
 
@@ -67,15 +67,15 @@ sal_Bool ChartTypeHelper::isSupportingGeometryProperties( const uno::Reference<
         {
             OUString aChartTypeName = xChartType->getChartType();
             if( aChartTypeName.equals(CHART2_SERVICE_NAME_CHARTTYPE_BAR) )
-                return sal_True;
+                return true;
             if( aChartTypeName.equals(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) )
-                return sal_True;
+                return true;
         }
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool ChartTypeHelper::isSupportingStatisticProperties( const uno::Reference< XChartType >& xChartType, sal_Int32 nDimensionCount )
+bool ChartTypeHelper::isSupportingStatisticProperties( const uno::Reference< XChartType >& xChartType, sal_Int32 nDimensionCount )
 {
     //3D charts, pie, net and stock do not support statistic properties
 
@@ -83,30 +83,30 @@ sal_Bool ChartTypeHelper::isSupportingStatisticProperties( const uno::Reference<
     if(xChartType.is())
     {
         if(nDimensionCount==3)
-            return sal_False;
+            return false;
 
         OUString aChartTypeName = xChartType->getChartType();
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
-            return sal_False;
+            return false;
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) )
-            return sal_False;
+            return false;
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET) )
-            return sal_False;
+            return false;
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK) )
-            return sal_False;
+            return false;
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE) ) //todo: BubbleChart support error bars and trend lines
-            return sal_False;
+            return false;
     }
-    return sal_True;
+    return true;
 }
 
-sal_Bool ChartTypeHelper::isSupportingRegressionProperties( const uno::Reference< XChartType >& xChartType, sal_Int32 nDimensionCount )
+bool ChartTypeHelper::isSupportingRegressionProperties( const uno::Reference< XChartType >& xChartType, sal_Int32 nDimensionCount )
 {
     // note: old chart: only scatter chart
     return isSupportingStatisticProperties( xChartType, nDimensionCount );
 }
 
-sal_Bool ChartTypeHelper::isSupportingAreaProperties( const uno::Reference< XChartType >& xChartType, sal_Int32 nDimensionCount )
+bool ChartTypeHelper::isSupportingAreaProperties( const uno::Reference< XChartType >& xChartType, sal_Int32 nDimensionCount )
 {
     //2D line charts, net and stock do not support area properties
 
@@ -117,19 +117,19 @@ sal_Bool ChartTypeHelper::isSupportingAreaProperties( const uno::Reference< XCha
         {
             OUString aChartTypeName = xChartType->getChartType();
             if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_LINE) )
-                return sal_False;
+                return false;
             if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER) )
-                return sal_False;
+                return false;
             if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) )
-                return sal_False;
+                return false;
             if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK) )
-                return sal_False;
+                return false;
         }
     }
-    return sal_True;
+    return true;
 }
 
-sal_Bool ChartTypeHelper::isSupportingSymbolProperties( const uno::Reference< XChartType >& xChartType, sal_Int32 nDimensionCount )
+bool ChartTypeHelper::isSupportingSymbolProperties( const uno::Reference< XChartType >& xChartType, sal_Int32 nDimensionCount )
 {
     //2D line charts, 2D scatter charts and 2D net charts do support symbols
 
@@ -137,20 +137,20 @@ sal_Bool ChartTypeHelper::isSupportingSymbolProperties( const uno::Reference< XC
     if(xChartType.is())
     {
         if(nDimensionCount==3)
-            return sal_False;
+            return false;
 
         OUString aChartTypeName = xChartType->getChartType();
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_LINE) )
-            return sal_True;
+            return true;
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER) )
-            return sal_True;
+            return true;
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) )
-            return sal_True;
+            return true;
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool ChartTypeHelper::isSupportingMainAxis( const uno::Reference< XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex )
+bool ChartTypeHelper::isSupportingMainAxis( const uno::Reference< XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex )
 {
     //pie charts do not support axis at all
     //no 3rd axis for 2D charts
@@ -160,15 +160,15 @@ sal_Bool ChartTypeHelper::isSupportingMainAxis( const uno::Reference< XChartType
     {
         OUString aChartTypeName = xChartType->getChartType();
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
-            return sal_False;
+            return false;
 
         if( nDimensionIndex == 2 )
             return nDimensionCount == 3;
     }
-    return sal_True;
+    return true;
 }
 
-sal_Bool ChartTypeHelper::isSupportingSecondaryAxis( const uno::Reference< XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 /*nDimensionIndex*/ )
+bool ChartTypeHelper::isSupportingSecondaryAxis( const uno::Reference< XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 /*nDimensionIndex*/ )
 {
     //3D, pie and net charts do not support a secondary axis at all
 
@@ -176,20 +176,20 @@ sal_Bool ChartTypeHelper::isSupportingSecondaryAxis( const uno::Reference< XChar
     if(xChartType.is())
     {
          if(nDimensionCount==3)
-            return sal_False;
+            return false;
 
         OUString aChartTypeName = xChartType->getChartType();
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
-            return sal_False;
+            return false;
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) )
-            return sal_False;
+            return false;
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET) )
-            return sal_False;
+            return false;
     }
-    return sal_True;
+    return true;
 }
 
-sal_Bool ChartTypeHelper::isSupportingOverlapAndGapWidthProperties(
+bool ChartTypeHelper::isSupportingOverlapAndGapWidthProperties(
         const uno::Reference< XChartType >& xChartType, sal_Int32 nDimensionCount )
 {
     //2D bar charts do support a this special properties
@@ -198,18 +198,18 @@ sal_Bool ChartTypeHelper::isSupportingOverlapAndGapWidthProperties(
     if(xChartType.is())
     {
          if(nDimensionCount==3)
-            return sal_False;
+            return false;
 
         OUString aChartTypeName = xChartType->getChartType();
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) )
-            return sal_True;
+            return true;
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) )
-            return sal_True;
+            return true;
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool ChartTypeHelper::isSupportingBarConnectors(
+bool ChartTypeHelper::isSupportingBarConnectors(
     const uno::Reference< chart2::XChartType >& xChartType, sal_Int32 nDimensionCount )
 {
     //2D bar charts with stacked series support this
@@ -218,25 +218,25 @@ sal_Bool ChartTypeHelper::isSupportingBarConnectors(
     if(xChartType.is())
     {
         if(nDimensionCount==3)
-            return sal_False;
+            return false;
 
         bool bFound=false;
         bool bAmbiguous=false;
         StackMode eStackMode = DiagramHelper::getStackModeFromChartType( xChartType, bFound, bAmbiguous, 0 );
         if( eStackMode != StackMode_Y_STACKED || bAmbiguous )
-            return sal_False;
+            return false;
 
         OUString aChartTypeName = xChartType->getChartType();
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) )
-            return sal_True;
+            return true;
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) )
-            return sal_True;  // note: old chart was false here
+            return true;  // note: old chart was false here
     }
-    return sal_False;
+    return false;
 }
 
 uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedLabelPlacements( const uno::Reference< chart2::XChartType >& xChartType
-                                                                         , sal_Int32 nDimensionCount, sal_Bool bSwapXAndY
+                                                                         , sal_Int32 nDimensionCount, bool bSwapXAndY
                                                                          , const uno::Reference< chart2::XDataSeries >& xSeries )
 {
     (void)nDimensionCount;
@@ -352,15 +352,15 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedLabelPlacements( const
     return aRet;
 }
 
-sal_Bool ChartTypeHelper::isSupportingRightAngledAxes( const uno::Reference< chart2::XChartType >& xChartType )
+bool ChartTypeHelper::isSupportingRightAngledAxes( const uno::Reference< chart2::XChartType >& xChartType )
 {
     if(xChartType.is())
     {
         OUString aChartTypeName = xChartType->getChartType();
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
-            return sal_False;
+            return false;
     }
-    return sal_True;
+    return true;
 }
 
 bool ChartTypeHelper::isSupportingStartingAngle( const uno::Reference< chart2::XChartType >& xChartType )
diff --git a/chart2/source/tools/CommonConverters.cxx b/chart2/source/tools/CommonConverters.cxx
index 5c6acb285386..d7d27eeb2090 100644
--- a/chart2/source/tools/CommonConverters.cxx
+++ b/chart2/source/tools/CommonConverters.cxx
@@ -475,26 +475,26 @@ uno::Sequence< OUString > DataSequenceToStringSequence(
     return aResult;
 }
 
-sal_Bool hasDoubleValue( const uno::Any& rAny )
+bool hasDoubleValue( const uno::Any& rAny )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     double fValue = 0.0;
     if( rAny >>= fValue )
-        bRet = sal_True;
+        bRet = true;
     return bRet;
 }
 
-sal_Bool hasLongOrShortValue( const uno::Any& rAny )
+bool hasLongOrShortValue( const uno::Any& rAny )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     sal_Int32 n32 = 0;
     if( rAny >>= n32 )
-        bRet = sal_True;
+        bRet = true;
     else
     {
         sal_Int16 n16 = 0;
         if( rAny >>= n16 )
-            bRet = sal_True;
+            bRet = true;
     }
     return bRet;
 }
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index d21b6df6bfe9..8d853cc6501b 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -1073,7 +1073,7 @@ void lcl_switchToDateCategories( const Reference< XChartDocument >& xChartDoc, c
                 if( !( nType & util::NumberFormat::DATE ) )
                 {
                     //set a date format to the axis
-                    sal_Bool bCreate = sal_True;
+                    bool bCreate = true;
                     const LocaleDataWrapper& rLocaleDataWrapper = Application::GetSettings().GetLocaleDataWrapper();
                     Sequence<sal_Int32> aKeySeq = xNumberFormats->queryKeys( util::NumberFormat::DATE,  rLocaleDataWrapper.getLanguageTag().getLocale(), bCreate );
                     if( aKeySeq.getLength() )
@@ -1167,7 +1167,7 @@ sal_Int32 DiagramHelper::getDateNumberFormat( const Reference< util::XNumberForm
     Reference< util::XNumberFormats > xNumberFormats( xNumberFormatsSupplier->getNumberFormats() );
     if( xNumberFormats.is() )
     {
-        sal_Bool bCreate = sal_True;
+        bool bCreate = true;
         const LocaleDataWrapper& rLocaleDataWrapper = Application::GetSettings().GetLocaleDataWrapper();
         Sequence<sal_Int32> aKeySeq = xNumberFormats->queryKeys( util::NumberFormat::DATE,
             rLocaleDataWrapper.getLanguageTag().getLocale(), bCreate );
@@ -1195,7 +1195,7 @@ sal_Int32 DiagramHelper::getPercentNumberFormat( const Reference< util::XNumberF
     Reference< util::XNumberFormats > xNumberFormats( xNumberFormatsSupplier->getNumberFormats() );
     if( xNumberFormats.is() )
     {
-        sal_Bool bCreate = sal_True;
+        bool bCreate = true;
         const LocaleDataWrapper& rLocaleDataWrapper = Application::GetSettings().GetLocaleDataWrapper();
         Sequence<sal_Int32> aKeySeq = xNumberFormats->queryKeys( util::NumberFormat::PERCENT,
             rLocaleDataWrapper.getLanguageTag().getLocale(), bCreate );
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 520edc7274ac..e83fbae4eb05 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -776,7 +776,7 @@ Reference< sheet::XRangeSelection > SAL_CALL InternalDataProvider::getRangeSelec
 sal_Bool SAL_CALL InternalDataProvider::hasDataByRangeRepresentation( const OUString& aRange )
     throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bResult = false;
+    bool bResult = false;
 
     if( aRange.match( lcl_aCategoriesRangeName ))
     {
diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx
index ab47d1a0a134..a0631928f957 100644
--- a/chart2/source/tools/LifeTime.cxx
+++ b/chart2/source/tools/LifeTime.cxx
@@ -29,7 +29,7 @@ using namespace ::com::sun::star;
 namespace apphelper
 {
 
-LifeTimeManager::LifeTimeManager( lang::XComponent* pComponent, sal_Bool bLongLastingCallsCancelable )
+LifeTimeManager::LifeTimeManager( lang::XComponent* pComponent, bool bLongLastingCallsCancelable )
     : m_aListenerContainer( m_aAccessMutex )
     , m_pComponent(pComponent)
     , m_bLongLastingCallsCancelable(bLongLastingCallsCancelable)
@@ -39,8 +39,8 @@ LifeTimeManager::LifeTimeManager( lang::XComponent* pComponent, sal_Bool bLongLa
 
 void LifeTimeManager::impl_init()
 {
-    m_bDisposed = sal_False;
-    m_bInDispose = sal_False;
+    m_bDisposed = false;
+    m_bInDispose = false;
     m_nAccessCount = 0;
     m_nLongLastingCallCount = 0;
     m_aNoAccessCountCondition.set();
@@ -64,18 +64,18 @@ bool LifeTimeManager::impl_isDisposed( bool bAssert )
     }
     return false;
 }
-            sal_Bool LifeTimeManager
+            bool LifeTimeManager
 ::impl_canStartApiCall()
 {
     if( impl_isDisposed() )
-        return sal_False; //behave passive if already disposed
+        return false; //behave passive if already disposed
 
     //mutex is acquired
-    return sal_True;
+    return true;
 }
 
     void LifeTimeManager
-::impl_registerApiCall(sal_Bool bLongLastingCall)
+::impl_registerApiCall(bool bLongLastingCall)
 {
     //only allowed if not disposed
     //do not acquire the mutex here because it will be acquired already
@@ -90,7 +90,7 @@ bool LifeTimeManager::impl_isDisposed( bool bAssert )
         m_aNoLongLastingCallCountCondition.reset();
 }
     void LifeTimeManager
-::impl_unregisterApiCall(sal_Bool bLongLastingCall)
+::impl_unregisterApiCall(bool bLongLastingCall)
 {
     //Mutex needs to be acquired exactly ones
     //mutex may be released inbetween in special case of impl_apiCallCountReachedNull()
@@ -111,7 +111,7 @@ bool LifeTimeManager::impl_isDisposed( bool bAssert )
     }
 }
 
-        sal_Bool LifeTimeManager
+        bool LifeTimeManager
 ::dispose() throw(uno::RuntimeException)
 {
     //hold no mutex
@@ -121,7 +121,7 @@ bool LifeTimeManager::impl_isDisposed( bool bAssert )
         if( m_bDisposed || m_bInDispose )
         {
             OSL_TRACE( "This component is already disposed " );
-            return sal_False; //behave passive if already disposed
+            return false; //behave passive if already disposed
         }
 
         m_bInDispose = true;
@@ -147,7 +147,7 @@ bool LifeTimeManager::impl_isDisposed( bool bAssert )
     {
         osl::ClearableGuard< osl::Mutex > aGuard( m_aAccessMutex );
         OSL_ENSURE( !m_bDisposed, "dispose was called already" );
-        m_bDisposed = sal_True;
+        m_bDisposed = true;
         aGuard.clear();
     }
     //no mutex is acquired
@@ -158,13 +158,13 @@ bool LifeTimeManager::impl_isDisposed( bool bAssert )
 
     //we are the only ones working on our data now
 
-    return sal_True;
+    return true;
     //--release all resources and references after calling this method successful
 }
 
 CloseableLifeTimeManager::CloseableLifeTimeManager( ::com::sun::star::util::XCloseable* pCloseable
         , ::com::sun::star::lang::XComponent* pComponent
-        , sal_Bool bLongLastingCallsCancelable )
+        , bool bLongLastingCallsCancelable )
         : LifeTimeManager( pComponent, bLongLastingCallsCancelable )
         , m_pCloseable(pCloseable)
 {
@@ -192,26 +192,26 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert )
     return false;
 }
 
-        sal_Bool CloseableLifeTimeManager
-::g_close_startTryClose(sal_Bool bDeliverOwnership)
+        bool CloseableLifeTimeManager
+::g_close_startTryClose(bool bDeliverOwnership)
     throw ( uno::Exception )
 {
     //no mutex is allowed to be acquired
     {
         osl::ResettableGuard< osl::Mutex > aGuard( m_aAccessMutex );
         if( impl_isDisposedOrClosed(false) )
-            return sal_False;
+            return false;
 
         //Mutex needs to be acquired exactly ones; will be released inbetween
         if( !impl_canStartApiCall() )
-            return sal_False;
+            return false;
         //mutex is acquired
 
         //not closed already -> we try to close again
-        m_bInTryClose = sal_True;
+        m_bInTryClose = true;
         m_aEndTryClosingCondition.reset();
 
-        impl_registerApiCall(sal_False);
+        impl_registerApiCall(false);
     }
 
     //no mutex is acquired
@@ -246,29 +246,29 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert )
     catch( const uno::Exception& )
     {
         //no mutex is acquired
-        g_close_endTryClose(bDeliverOwnership, sal_False);
+        g_close_endTryClose(bDeliverOwnership, false);
         throw;
     }
-    return sal_True;
+    return true;
 }
 
     void CloseableLifeTimeManager
-::g_close_endTryClose(sal_Bool bDeliverOwnership, sal_Bool /* bMyVeto */ )
+::g_close_endTryClose(bool bDeliverOwnership, bool /* bMyVeto */ )
 {
     //this method is called, if the try to close was not successful
     osl::Guard< osl::Mutex > aGuard( m_aAccessMutex );
-    impl_setOwnership( bDeliverOwnership, sal_False );
+    impl_setOwnership( bDeliverOwnership, false );
 
-    m_bInTryClose = sal_False;
+    m_bInTryClose = false;
     m_aEndTryClosingCondition.set();
 
     //Mutex needs to be acquired exactly ones
     //mutex may be released inbetween in special case of impl_apiCallCountReachedNull()
-    impl_unregisterApiCall(sal_False);
+    impl_unregisterApiCall(false);
 }
 
-    sal_Bool CloseableLifeTimeManager
-::g_close_isNeedToCancelLongLastingCalls( sal_Bool bDeliverOwnership, util::CloseVetoException& ex )
+    bool CloseableLifeTimeManager
+::g_close_isNeedToCancelLongLastingCalls( bool bDeliverOwnership, util::CloseVetoException& ex )
     throw ( util::CloseVetoException )
 {
     //this method is called when no closelistener has had a veto during queryclosing
@@ -279,19 +279,19 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert )
     osl::Guard< osl::Mutex > aGuard( m_aAccessMutex );
     //this count cannot grow after try of close has started, because we wait in all those methods for end of try closing
     if( !m_nLongLastingCallCount )
-        return sal_False;
+        return false;
 
       if(m_bLongLastingCallsCancelable)
-        return sal_True;
+        return true;
 
-    impl_setOwnership( bDeliverOwnership, sal_True );
+    impl_setOwnership( bDeliverOwnership, true );
 
-    m_bInTryClose = sal_False;
+    m_bInTryClose = false;
     m_aEndTryClosingCondition.set();
 
     //Mutex needs to be acquired exactly ones
     //mutex may be released inbetween in special case of impl_apiCallCountReachedNull()
-    impl_unregisterApiCall(sal_False);
+    impl_unregisterApiCall(false);
 
     throw ex;
 }
@@ -302,22 +302,22 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert )
     //this method is called, if the try to close was successful
     osl::ResettableGuard< osl::Mutex > aGuard( m_aAccessMutex );
 
-    m_bInTryClose       = sal_False;
+    m_bInTryClose       = false;
     m_aEndTryClosingCondition.set();
 
     //Mutex needs to be acquired exactly ones
     //mutex may be released inbetween in special case of impl_apiCallCountReachedNull()
-    impl_unregisterApiCall(sal_False);
+    impl_unregisterApiCall(false);
     impl_doClose();
 }
 
     void CloseableLifeTimeManager
-::impl_setOwnership( sal_Bool bDeliverOwnership, sal_Bool bMyVeto )
+::impl_setOwnership( bool bDeliverOwnership, bool bMyVeto )
 {
     m_bOwnership            = bDeliverOwnership && bMyVeto;
-    m_bOwnershipIsWellKnown = sal_True;
+    m_bOwnershipIsWellKnown = true;
 }
-    sal_Bool CloseableLifeTimeManager
+    bool CloseableLifeTimeManager
 ::impl_shouldCloseAtNextChance()
 {
     return m_bOwnership;
@@ -343,7 +343,7 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert )
         return; //behave as passive as possible, if disposed or closed already
 
 
-    m_bClosed = sal_True;
+    m_bClosed = true;
 
     NegativeGuard< osl::Mutex > aNegativeGuard( m_aAccessMutex );
     //mutex is not acquired, mutex will be reacquired at the end of this method automatically
@@ -388,31 +388,31 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert )
     //mutex will be reacquired in destructor of aNegativeGuard
 }
 
-    sal_Bool CloseableLifeTimeManager
+    bool CloseableLifeTimeManager
 ::g_addCloseListener( const uno::Reference< util::XCloseListener > & xListener )
     throw(uno::RuntimeException)
 {
     osl::Guard< osl::Mutex > aGuard( m_aAccessMutex );
     //Mutex needs to be acquired exactly ones; will be released inbetween
     if( !impl_canStartApiCall() )
-        return sal_False;
+        return false;
     //mutex is acquired
 
     m_aListenerContainer.addInterface( ::getCppuType((const uno::Reference< util::XCloseListener >*)0),xListener );
-    m_bOwnership = sal_False;
-    return sal_True;
+    m_bOwnership = false;
+    return true;
 }
 
-    sal_Bool CloseableLifeTimeManager
+    bool CloseableLifeTimeManager
 ::impl_canStartApiCall()
 {
     //Mutex needs to be acquired exactly ones before calling this method
     //the mutex will be released inbetween and reacquired
 
     if( impl_isDisposed() )
-        return sal_False; //behave passive if already disposed
+        return false; //behave passive if already disposed
     if( m_bClosed )
-        return sal_False; //behave passive if closing is already done
+        return false; //behave passive if closing is already done
 
     //during try-close most calls need to wait for the decision
     while( m_bInTryClose )
@@ -425,31 +425,31 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert )
         m_aEndTryClosingCondition.wait(); //@todo??? this may block??? try closing
         m_aAccessMutex.acquire();
         if( m_bDisposed || m_bInDispose || m_bClosed )
-            return sal_False; //return if closed already
+            return false; //return if closed already
     }
     //mutex is acquired
-    return sal_True;
+    return true;
 }
 
-    sal_Bool LifeTimeGuard
-::startApiCall(sal_Bool bLongLastingCall)
+    bool LifeTimeGuard
+::startApiCall(bool bLongLastingCall)
 {
     //Mutex needs to be acquired exactly ones; will be released inbetween
     //mutex is requiered due to constructor of LifeTimeGuard
 
     OSL_ENSURE( !m_bCallRegistered, "this method is only allowed ones" );
     if(m_bCallRegistered)
-        return sal_False;
+        return false;
 
     //Mutex needs to be acquired exactly ones; will be released inbetween
     if( !m_rManager.impl_canStartApiCall() )
-        return sal_False;
+        return false;
     //mutex is acquired
 
-    m_bCallRegistered = sal_True;
+    m_bCallRegistered = true;
     m_bLongLastingCallRegistered = bLongLastingCall;
     m_rManager.impl_registerApiCall(bLongLastingCall);
-    return sal_True;
+    return true;
 }
 
 LifeTimeGuard::~LifeTimeGuard()
diff --git a/chart2/source/tools/MediaDescriptorHelper.cxx b/chart2/source/tools/MediaDescriptorHelper.cxx
index 7061185517b0..9279b9d9fe7b 100644
--- a/chart2/source/tools/MediaDescriptorHelper.cxx
+++ b/chart2/source/tools/MediaDescriptorHelper.cxx
@@ -31,7 +31,7 @@ const short FLAG_MODEL      =2;
 if(rProp.Name.equals(#MediaName)) \
 {                                                       \
     if( rProp.Value >>= MediaName )                     \
-        ISSET_##MediaName = sal_True;                   \
+        ISSET_##MediaName = true;                       \
     if((nFlags & FLAG_DEPRECATED) != 0)                 \
     {                                                   \
         m_aDeprecatedProperties[nDeprecatedCount]=rProp;\
@@ -130,70 +130,70 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
 
 void MediaDescriptorHelper::impl_init()
 {
-    AsTemplate = sal_False;
-    ISSET_AsTemplate = sal_False;
+    AsTemplate = false;
+    ISSET_AsTemplate = false;
 
-    ISSET_Author = sal_False;
-    ISSET_CharacterSet = sal_False;
-    ISSET_Comment = sal_False;
+    ISSET_Author = false;
+    ISSET_CharacterSet = false;
+    ISSET_Comment = false;
 
 //  ::com::sun::star::uno::Any  ComponentData;
-    ISSET_ComponentData = sal_False;
-    ISSET_FileName = sal_False;
+    ISSET_ComponentData = false;
+    ISSET_FileName = false;
 
 //  ::com::sun::star::uno::Any  FilterData;
-    ISSET_FilterData = sal_False;
-    ISSET_FilterName = sal_False;
-    ISSET_FilterFlags = sal_False;
-    ISSET_FilterOptions = sal_False;
-    ISSET_FrameName = sal_False;
-
-    Hidden = sal_False;
-    ISSET_Hidden = sal_False;
-    ISSET_HierarchicalDocumentName = sal_False;
-    ISSET_OutputStream = sal_False;
-    ISSET_InputStream = sal_False;
-    ISSET_InteractionHandler = sal_False;
-    ISSET_JumpMark = sal_False;
-    ISSET_MediaType = sal_False;
-    ISSET_OpenFlags = sal_False;
-    OpenNewView = sal_False;
-    ISSET_OpenNewView = sal_False;
-    Overwrite = sal_False;
-    ISSET_Overwrite = sal_False;
-    ISSET_Password = sal_False;
+    ISSET_FilterData = false;
+    ISSET_FilterName = false;
+    ISSET_FilterFlags = false;
+    ISSET_FilterOptions = false;
+    ISSET_FrameName = false;
+
+    Hidden = false;
+    ISSET_Hidden = false;
+    ISSET_HierarchicalDocumentName = false;
+    ISSET_OutputStream = false;
+    ISSET_InputStream = false;
+    ISSET_InteractionHandler = false;
+    ISSET_JumpMark = false;
+    ISSET_MediaType = false;
+    ISSET_OpenFlags = false;
+    OpenNewView = false;
+    ISSET_OpenNewView = false;
+    Overwrite = false;
+    ISSET_Overwrite = false;
+    ISSET_Password = false;
 
 //  ::com::sun::star::awt::Rectangle PosSize;
-    ISSET_PosSize = sal_False;
+    ISSET_PosSize = false;
 
 //  ::com::sun::star::uno::Sequence< sal_Int8 > PostData;
-    ISSET_PostData = sal_False;
-    ISSET_PostString = sal_False;
-    Preview = sal_False;
-    ISSET_Preview = sal_False;
-    ReadOnly = sal_False;
-    ISSET_ReadOnly = sal_False;
-    ISSET_Referer = sal_False;
-    ISSET_StatusIndicator = sal_False;
-    Silent = sal_False;
-    ISSET_Silent = sal_False;
-    ISSET_TemplateName = sal_False;
-    ISSET_TemplateRegionName = sal_False;
-    Unpacked = sal_False;
-    ISSET_Unpacked = sal_False;
-    ISSET_URL = sal_False;
+    ISSET_PostData = false;
+    ISSET_PostString = false;
+    Preview = false;
+    ISSET_Preview = false;
+    ReadOnly = false;
+    ISSET_ReadOnly = false;
+    ISSET_Referer = false;
+    ISSET_StatusIndicator = false;
+    Silent = false;
+    ISSET_Silent = false;
+    ISSET_TemplateName = false;
+    ISSET_TemplateRegionName = false;
+    Unpacked = false;
+    ISSET_Unpacked = false;
+    ISSET_URL = false;
     Version = 0;
-    ISSET_Version = sal_False;
+    ISSET_Version = false;
 
 //  ::com::sun::star::uno::Any ViewData;
-    ISSET_ViewData = sal_False;
+    ISSET_ViewData = false;
     ViewId = 0;
-    ISSET_ViewId = sal_False;
+    ISSET_ViewId = false;
 
-    ISSET_WinExtent = sal_False;
+    ISSET_WinExtent = false;
 
-    ISSET_Storage = sal_False;
-    ISSET_Stream = sal_False;
+    ISSET_Storage = false;
+    ISSET_Stream = false;
 }
 
     uno::Sequence< beans::PropertyValue > MediaDescriptorHelper
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index a6fd0602ebd6..fcad9f0a5e90 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -1512,7 +1512,7 @@ OUString ObjectIdentifier::getSeriesParticleFromCID( const OUString& rCID )
     return ObjectIdentifier::createParticleForSeries( nDiagramIndex, nCooSysIndex, nChartTypeIndex, nSeriesIndex );
 }
 
-OUString ObjectIdentifier::getMovedSeriesCID( const OUString& rObjectCID, sal_Bool bForward )
+OUString ObjectIdentifier::getMovedSeriesCID( const OUString& rObjectCID, bool bForward )
 {
     sal_Int32 nDiagramIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rObjectCID, "CID/D=" ) );
     sal_Int32 nCooSysIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rObjectCID, "CS=" ) );
diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx
index 81d20a1aeadf..068d3bedd004 100644
--- a/chart2/source/tools/ThreeDHelper.cxx
+++ b/chart2/source/tools/ThreeDHelper.cxx
@@ -46,7 +46,7 @@ namespace
 
 bool lcl_isRightAngledAxesSetAndSupported( const Reference< beans::XPropertySet >& xSceneProperties )
 {
-    sal_Bool bRightAngledAxes = sal_False;
+    bool bRightAngledAxes = false;
     if( xSceneProperties.is() )
     {
         xSceneProperties->getPropertyValue( "RightAngledAxes") >>= bRightAngledAxes;
@@ -70,7 +70,7 @@ void lcl_RotateLightSource( const Reference< beans::XPropertySet >& xSceneProper
 {
     if( xSceneProperties.is() )
     {
-        sal_Bool bLightOn = sal_False;
+        bool bLightOn = false;
         if( xSceneProperties->getPropertyValue( rLightSourceOn ) >>= bLightOn )
         {
             if( bLightOn )
@@ -145,7 +145,7 @@ bool lcl_isLightScheme( const uno::Reference< beans::XPropertySet >& xDiagramPro
     if(!xDiagramProps.is())
         return false;
 
-    sal_Bool bIsOn = sal_False;
+    bool bIsOn = false;
     xDiagramProps->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_2 ) >>= bIsOn;
     if(!bIsOn)
         return false;
@@ -172,7 +172,7 @@ bool lcl_isLightScheme( const uno::Reference< beans::XPropertySet >& xDiagramPro
 
     //rotate default light direction when right angled axes are off but supported
     {
-        sal_Bool bRightAngledAxes = sal_False;
+        bool bRightAngledAxes = false;
         xDiagramProps->getPropertyValue( "RightAngledAxes") >>= bRightAngledAxes;
         if(!bRightAngledAxes)
         {
@@ -217,7 +217,7 @@ void lcl_setLightsForScheme( const uno::Reference< beans::XPropertySet >& xDiagr
     xDiagramProps->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_2, aADirection );
     //rotate light direction when right angled axes are off but supported
     {
-        sal_Bool bRightAngledAxes = sal_False;
+        bool bRightAngledAxes = false;
         xDiagramProps->getPropertyValue( "RightAngledAxes") >>= bRightAngledAxes;
         if(!bRightAngledAxes)
         {
@@ -958,13 +958,13 @@ void ThreeDHelper::getRotationAngleFromDiagram(
     }
 }
 
-void ThreeDHelper::switchRightAngledAxes( const Reference< beans::XPropertySet >& xSceneProperties, sal_Bool bRightAngledAxes, bool bRotateLights )
+void ThreeDHelper::switchRightAngledAxes( const Reference< beans::XPropertySet >& xSceneProperties, bool bRightAngledAxes, bool bRotateLights )
 {
     try
     {
         if( xSceneProperties.is() )
         {
-            sal_Bool bOldRightAngledAxes = sal_False;
+            bool bOldRightAngledAxes = false;
             xSceneProperties->getPropertyValue( "RightAngledAxes") >>= bOldRightAngledAxes;
             if( bOldRightAngledAxes!=bRightAngledAxes)
             {
@@ -1029,7 +1029,7 @@ void ThreeDHelper::setRotationAngleToDiagram(
             "D3DTransformMatrix", uno::makeAny( BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aSceneRotation )));
 
         //rotate lights if RightAngledAxes are not set or not supported
-        sal_Bool bRightAngledAxes = sal_False;
+        bool bRightAngledAxes = false;
         xSceneProperties->getPropertyValue( "RightAngledAxes") >>= bRightAngledAxes;
         uno::Reference< chart2::XDiagram > xDiagram( xSceneProperties, uno::UNO_QUERY );
         if(!bRightAngledAxes || !ChartTypeHelper::isSupportingRightAngledAxes(
diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx
index f01a70692323..19f31c4be9c3 100644
--- a/chart2/source/tools/WrappedIgnoreProperty.cxx
+++ b/chart2/source/tools/WrappedIgnoreProperty.cxx
@@ -104,7 +104,7 @@ void WrappedIgnoreProperties::addIgnoreFillProperties_without_BitmapProperties(
 //    rList.push_back( new WrappedIgnoreProperty( "FillGradient", uno::makeAny( awt::Gradient() ) ) );
     rList.push_back( new WrappedIgnoreProperty( "FillHatchName", uno::makeAny( OUString() ) ) );
 //    rList.push_back( new WrappedIgnoreProperty( "FillHatch", uno::makeAny( drawing::Hatch() ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillBackground", uno::makeAny( sal_Bool(sal_False) ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillBackground", uno::makeAny( false ) ) );
 }
 
 void WrappedIgnoreProperties::addIgnoreFillProperties_only_BitmapProperties( ::std::vector< WrappedProperty* >& rList )
@@ -117,7 +117,7 @@ void WrappedIgnoreProperties::addIgnoreFillProperties_only_BitmapProperties( ::s
     rList.push_back( new WrappedIgnoreProperty( "FillBitmapPositionOffsetX", uno::makeAny( sal_Int16(0) ) ) );
     rList.push_back( new WrappedIgnoreProperty( "FillBitmapPositionOffsetY", uno::makeAny( sal_Int16(0) ) ) );
     rList.push_back( new WrappedIgnoreProperty( "FillBitmapRectanglePoint", uno::makeAny( drawing::RectanglePoint_LEFT_TOP ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillBitmapLogicalSize", uno::makeAny( sal_Bool(sal_False) ) ) );//todo correct default?
+    rList.push_back( new WrappedIgnoreProperty( "FillBitmapLogicalSize", uno::makeAny( false ) ) );//todo correct default?
     rList.push_back( new WrappedIgnoreProperty( "FillBitmapSizeX", uno::makeAny( sal_Int32(10) ) ) );//todo which default?
     rList.push_back( new WrappedIgnoreProperty( "FillBitmapSizeY", uno::makeAny( sal_Int32(10) ) ) );//todo which default?
     rList.push_back( new WrappedIgnoreProperty( "FillBitmapMode", uno::makeAny( drawing::BitmapMode_REPEAT ) ) );
diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx
index 2fc862569484..a7c6e8dc0877 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -123,7 +123,7 @@ void VAxisBase::setExrtaLinePositionAtOtherAxis( const double& fCrossingAt )
     m_aAxisProperties.m_pfExrtaLinePositionAtOtherAxis = new double(fCrossingAt);
 }
 
-sal_Bool VAxisBase::isAnythingToDraw()
+bool VAxisBase::isAnythingToDraw()
 {
     if( !m_aAxisProperties.m_xAxisModel.is() )
         return false;
@@ -135,7 +135,7 @@ sal_Bool VAxisBase::isAnythingToDraw()
     uno::Reference< beans::XPropertySet > xProps( m_aAxisProperties.m_xAxisModel, uno::UNO_QUERY );
     if( xProps.is() )
     {
-        sal_Bool bShow = sal_False;
+        bool bShow = false;
         xProps->getPropertyValue( "Show" ) >>= bShow;
         if( !bShow )
             return false;
diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx
index ed1efd86313b..7494430a206e 100644
--- a/chart2/source/view/axes/VAxisBase.hxx
+++ b/chart2/source/view/axes/VAxisBase.hxx
@@ -45,7 +45,7 @@ public:
     virtual void createLabels()=0;
     virtual void updatePositions()=0;
 
-    virtual sal_Bool isAnythingToDraw();
+    virtual bool isAnythingToDraw();
     virtual void initAxisLabelProperties(
                     const ::com::sun::star::awt::Size& rFontReferenceSize
                   , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels );
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index 3124f0c9209e..205fd77edd49 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -556,7 +556,7 @@ void VCoordinateSystem::clearMinimumAndMaximumSupplierList()
 bool VCoordinateSystem::getPropertySwapXAndYAxis() const
 {
     Reference<beans::XPropertySet> xProp(m_xCooSysModel, uno::UNO_QUERY );
-    sal_Bool bSwapXAndY = false;
+    bool bSwapXAndY = false;
     if( xProp.is()) try
     {
         xProp->getPropertyValue( "SwapXAndYAxis" ) >>= bSwapXAndY;
diff --git a/chart2/source/view/axes/VPolarAxis.cxx b/chart2/source/view/axes/VPolarAxis.cxx
index f6256931ef83..1e342b08d82f 100644
--- a/chart2/source/view/axes/VPolarAxis.cxx
+++ b/chart2/source/view/axes/VPolarAxis.cxx
@@ -61,7 +61,7 @@ void VPolarAxis::setIncrements( const std::vector< ExplicitIncrementData >& rInc
     m_aIncrements = rIncrements;
 }
 
-sal_Bool VPolarAxis::isAnythingToDraw()
+bool VPolarAxis::isAnythingToDraw()
 {
     return ( 2==m_nDimension && VAxisBase::isAnythingToDraw() );
 }
diff --git a/chart2/source/view/axes/VPolarAxis.hxx b/chart2/source/view/axes/VPolarAxis.hxx
index 09f6052bef59..e0c63e3f745a 100644
--- a/chart2/source/view/axes/VPolarAxis.hxx
+++ b/chart2/source/view/axes/VPolarAxis.hxx
@@ -38,7 +38,7 @@ public:
 
     void setIncrements( const std::vector< ExplicitIncrementData >& rIncrements );
 
-    virtual sal_Bool isAnythingToDraw() SAL_OVERRIDE;
+    virtual bool isAnythingToDraw() SAL_OVERRIDE;
 
     virtual ~VPolarAxis();
 
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 7433eb8bc1b9..0aaf1999c836 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -791,8 +791,8 @@ void VSeriesPlotter::createErrorBar(
 
     try
     {
-        sal_Bool bShowPositive = sal_False;
-        sal_Bool bShowNegative = sal_False;
+        bool bShowPositive = false;
+        bool bShowNegative = false;
         sal_Int32 nErrorBarStyle = ::com::sun::star::chart::ErrorBarStyle::VARIANCE;
 
         xErrorBarProperties->getPropertyValue( "ShowPositiveError") >>= bShowPositive;
@@ -991,7 +991,7 @@ void VSeriesPlotter::createRegressionCurvesShapes( VDataSeries& rVDataSeries,
         sal_Int32 aPeriod = 2;
         double aExtrapolateForward = 0.0;
         double aExtrapolateBackward = 0.0;
-        sal_Bool aForceIntercept = false;
+        bool aForceIntercept = false;
         double aInterceptValue = 0.0;
 
         if ( xProperties.is() && !bAverageLine )
diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx
index c6e775f0645e..14c2bb3bc631 100644
--- a/chart2/source/view/inc/VDataSeries.hxx
+++ b/chart2/source/view/inc/VDataSeries.hxx
@@ -110,7 +110,7 @@ public:
     bool        shouldLabelNumberFormatKeyBeDetectedFromYAxis() const;
 
     sal_Int32   getLabelPlacement( sal_Int32 nPointIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType
-                        , sal_Int32 nDimensionCount, sal_Bool bSwapXAndY ) const;
+                        , sal_Int32 nDimensionCount, bool bSwapXAndY ) const;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
                         getPropertiesOfPoint( sal_Int32 index ) const;
@@ -135,11 +135,11 @@ public:
 
     void doSortByXValues();
 
-    void setConnectBars( sal_Bool bConnectBars );
-    sal_Bool getConnectBars() const;
+    void setConnectBars( bool bConnectBars );
+    bool getConnectBars() const;
 
-    void setGroupBarsPerAxis( sal_Bool bGroupBarsPerAxis );
-    sal_Bool getGroupBarsPerAxis() const;
+    void setGroupBarsPerAxis( bool bGroupBarsPerAxis );
+    bool getGroupBarsPerAxis() const;
 
     void setStartingAngle( sal_Int32 nStartingAngle );
     sal_Int32 getStartingAngle() const;
@@ -230,9 +230,9 @@ private: //member
 
     sal_Int32               m_nAxisIndex;//indicates whether this is attached to a main or secondary axis
 
-    sal_Bool                m_bConnectBars;
+    bool                m_bConnectBars;
 
-    sal_Bool                m_bGroupBarsPerAxis;
+    bool                m_bGroupBarsPerAxis;
 
     sal_Int32               m_nStartingAngle;
 
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index a94b53c956be..978ecefc2a7d 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -194,7 +194,7 @@ ChartView::ChartView(
     , m_nScaleXDenominator(1)
     , m_nScaleYNumerator(1)
     , m_nScaleYDenominator(1)
-    , m_bSdrViewIsInEditMode(sal_False)
+    , m_bSdrViewIsInEditMode(false)
     , m_aResultingDiagramRectangleExcludingAxes(0,0,0,0)
 {
     init();
@@ -622,10 +622,10 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
         nDimensionCount = 2;
     }
 
-    sal_Bool bSortByXValues = sal_False;
-    sal_Bool bConnectBars = sal_False;
-    sal_Bool bGroupBarsPerAxis = sal_True;
-    sal_Bool bIncludeHiddenCells = sal_True;
+    bool bSortByXValues = false;
+    bool bConnectBars = false;
+    bool bGroupBarsPerAxis = true;
+    bool bIncludeHiddenCells = true;
     sal_Int32 nStartingAngle = 90;
     sal_Int32 n3DRelativeHeight = 100;
     try
@@ -1626,7 +1626,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
     return aUsedOuterRect;
 }
 
-sal_Bool ChartView::getExplicitValuesForAxis(
+bool ChartView::getExplicitValuesForAxis(
                      uno::Reference< XAxis > xAxis
                      , ExplicitScaleData&  rExplicitScale
                      , ExplicitIncrementData& rExplicitIncrement )
@@ -1634,12 +1634,12 @@ sal_Bool ChartView::getExplicitValuesForAxis(
     impl_updateView();
 
     if(!xAxis.is())
-        return sal_False;
+        return false;
 
     uno::Reference< XCoordinateSystem > xCooSys( AxisHelper::getCoordinateSystemOfAxis(xAxis, mrChartModel.getFirstDiagram() ) );
     const VCoordinateSystem* pVCooSys = findInCooSysList(m_aVCooSysList,xCooSys);
     if(!pVCooSys)
-        return sal_False;
+        return false;
 
     sal_Int32 nDimensionIndex=-1;
     sal_Int32 nAxisIndex=-1;
@@ -1672,9 +1672,9 @@ sal_Bool ChartView::getExplicitValuesForAxis(
             else if( rExplicitScale.AxisType == ::com::sun::star::chart2::AxisType::SERIES )
                 rExplicitScale.Maximum -= 1.0;
         }
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 SdrPage* ChartView::getSdrPage()
@@ -2388,7 +2388,7 @@ void ChartView::impl_refreshAddIn()
         xProp->getPropertyValue( "AddIn" ) >>= xAddIn;
         if( xAddIn.is() )
         {
-            sal_Bool bRefreshAddInAllowed = sal_True;
+            bool bRefreshAddInAllowed = true;
             xProp->getPropertyValue( "RefreshAddInAllowed" ) >>= bRefreshAddInAllowed;
             if( bRefreshAddInAllowed )
                 xAddIn->refresh();
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index d9032bc9e723..b51f1970a849 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -448,7 +448,7 @@ uno::Reference<drawing::XShape>
 
     Reference< drawing::XShapes > xGroup( ShapeFactory::createGroup3D( xTarget, OUString() ) );
 
-    sal_Bool bDoubleSided = false;
+    bool bDoubleSided = false;
     short nRotatedTexture = 0;
 
     const double fWidth = rSize.DirectionX;
@@ -665,7 +665,7 @@ uno::Reference<drawing::XShape>
 
             //Reduced lines
             xProp->setPropertyValue( UNO_NAME_3D_REDUCED_LINE_GEOMETRY
-                , uno::makeAny((sal_Bool)sal_True) );
+                , uno::makeAny(true) );
         }
         catch( const uno::Exception& e )
         {
@@ -675,7 +675,7 @@ uno::Reference<drawing::XShape>
     return xShape;
 }
 
-void appendAndCloseBezierCoords( drawing::PolyPolygonBezierCoords& rReturn, const drawing::PolyPolygonBezierCoords& rAdd, sal_Bool bAppendInverse )
+void appendAndCloseBezierCoords( drawing::PolyPolygonBezierCoords& rReturn, const drawing::PolyPolygonBezierCoords& rAdd, bool bAppendInverse )
 {
     if(!rAdd.Coordinates.getLength())
         return;
@@ -830,7 +830,7 @@ drawing::PolyPolygonBezierCoords getRingBezierCoords(
 
     drawing::PolyPolygonBezierCoords aInnerArc = getCircularArcBezierCoords(
         fStartAngleRadian, fWidthAngleRadian, fUnitCircleInnerRadius, aTransformationFromUnitCircle, fAngleSubdivisionRadian );
-    appendAndCloseBezierCoords( aReturn, aInnerArc, sal_True );
+    appendAndCloseBezierCoords( aReturn, aInnerArc, true );
 
     return aReturn;
 }
@@ -942,11 +942,11 @@ uno::Reference< drawing::XShape >
 
             //DoubleSided
             xProp->setPropertyValue( UNO_NAME_3D_DOUBLE_SIDED
-                , uno::makeAny( (sal_Bool)true) );
+                , uno::makeAny( true ) );
 
             //Reduced lines
             xProp->setPropertyValue( UNO_NAME_3D_REDUCED_LINE_GEOMETRY
-                , uno::makeAny((sal_Bool)sal_True) );
+                , uno::makeAny( true ) );
 
             //TextureProjectionMode
             xProp->setPropertyValue( UNO_NAME_3D_TEXTURE_PROJ_Y
@@ -1009,7 +1009,7 @@ uno::Reference< drawing::XShape >
 
             //LineOnly
             xProp->setPropertyValue( UNO_NAME_3D_LINEONLY
-                , uno::makeAny( (sal_Bool)false) );
+                , uno::makeAny( false) );
 
             //DoubleSided
             xProp->setPropertyValue( UNO_NAME_3D_DOUBLE_SIDED
@@ -1065,7 +1065,7 @@ uno::Reference< drawing::XShape >
 
             //DoubleSided
             xProp->setPropertyValue( UNO_NAME_3D_DOUBLE_SIDED
-                , uno::makeAny( (sal_Bool)true) );
+                , uno::makeAny( true) );
 
             //the z component of the polygon is now ignored by the drawing layer,
             //so we nned to translate the object via transformation matrix
@@ -1908,7 +1908,7 @@ uno::Reference< drawing::XShape >
 
             //LineOnly
             xProp->setPropertyValue( UNO_NAME_3D_LINEONLY
-                , uno::makeAny( (sal_Bool)true ) );
+                , uno::makeAny( true ) );
 
             //Transparency
             if(rLineProperties.Transparence.hasValue())
@@ -2187,7 +2187,7 @@ uno::Reference< drawing::XShape >
             PropertyMapper::setMultiProperties( aPropNames, aPropValues, xShapeProp );
         }
 
-        sal_Bool bStackCharacters(sal_False);
+        bool bStackCharacters(false);
         try
         {
             xTextProperties->getPropertyValue( "StackCharacters" ) >>= bStackCharacters;
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index 624e14310bbb..e581b71c63d2 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -163,8 +163,8 @@ VDataSeries::VDataSeries( const uno::Reference< XDataSeries >& xDataSeries )
 
     , m_eStackingDirection(StackingDirection_NO_STACKING)
     , m_nAxisIndex(0)
-    , m_bConnectBars(sal_False)
-    , m_bGroupBarsPerAxis(sal_True)
+    , m_bConnectBars(false)
+    , m_bGroupBarsPerAxis(true)
     , m_nStartingAngle(90)
 
     , m_nGlobalSeriesIndex(0)
@@ -429,19 +429,19 @@ sal_Int32 VDataSeries::getAttachedAxisIndex() const
 {
     return m_nAxisIndex;
 }
-void VDataSeries::setConnectBars( sal_Bool bConnectBars )
+void VDataSeries::setConnectBars( bool bConnectBars )
 {
     m_bConnectBars = bConnectBars;
 }
-sal_Bool VDataSeries::getConnectBars() const
+bool VDataSeries::getConnectBars() const
 {
     return m_bConnectBars;
 }
-void VDataSeries::setGroupBarsPerAxis( sal_Bool bGroupBarsPerAxis )
+void VDataSeries::setGroupBarsPerAxis( bool bGroupBarsPerAxis )
 {
     m_bGroupBarsPerAxis = bGroupBarsPerAxis;
 }
-sal_Bool VDataSeries::getGroupBarsPerAxis() const
+bool VDataSeries::getGroupBarsPerAxis() const
 {
     return m_bGroupBarsPerAxis;
 }
@@ -632,7 +632,7 @@ sal_Int32 VDataSeries::detectNumberFormatKey( sal_Int32 index ) const
     return nRet;
 }
 
-sal_Int32 VDataSeries::getLabelPlacement( sal_Int32 nPointIndex, const uno::Reference< chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Bool bSwapXAndY ) const
+sal_Int32 VDataSeries::getLabelPlacement( sal_Int32 nPointIndex, const uno::Reference< chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, bool bSwapXAndY ) const
 {
     sal_Int32 nLabelPlacement=0;
     try
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index 6370a08efd7f..1df4e748e462 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -803,7 +803,7 @@ bool VLegend::isVisible( const Reference< XLegend > & xLegend )
     if( ! xLegend.is())
         return false;
 
-    sal_Bool bShow = sal_False;
+    bool bShow = false;
     try
     {
         Reference< beans::XPropertySet > xLegendProp( xLegend, uno::UNO_QUERY_THROW );