chart2: sal_Bool->bool

Change-Id: I85751b4e636596ef88ef02bc958abdc6abf98427

23 files changed, 51 insertions, 51 deletions

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