loplugin:salbool: Automatic rewrite of sal_False/True

Change-Id: I1230a1785c61b8ef5dab97176e7c06600ac95a5b

41 files changed, 120 insertions, 120 deletions

diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index 874948bd9e4f..843bf3756eff 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -504,7 +504,7 @@ sal_Int32 getNumberFormat( const Reference<chart2::XChartDocument>& xChartDoc, c
     Reference<util::XNumberFormats> xNumberFormats = xNFS->getNumberFormats();
     CPPUNIT_ASSERT(xNumberFormats.is());
 
-    return xNumberFormats->queryKey(sFormat, css::lang::Locale(), sal_False);
+    return xNumberFormats->queryKey(sFormat, css::lang::Locale(), false);
 }
 
 sal_Int32 getNumberFormatFromAxis( const Reference<chart2::XAxis>& xAxis )
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 94491caa5d50..ae1bc5b03071 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -633,7 +633,7 @@ Reference< chart2::XAxis > AxisWrapper::getAxis()
             xAxis = AxisHelper::createAxis( nDimensionIndex, bMainAxis, xDiagram, m_spChart2ModelContact->m_xContext );
             Reference< beans::XPropertySet > xProp( xAxis, uno::UNO_QUERY );
             if( xProp.is() )
-                xProp->setPropertyValue("Show", uno::makeAny( sal_False ) );
+                xProp->setPropertyValue("Show", uno::makeAny( false ) );
         }
     }
     catch( const uno::Exception & ex )
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 7379ad17059d..82b6c9caac90 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -365,7 +365,7 @@ Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyDefault( const Referen
                         throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
-    aRet <<= sal_True;
+    aRet <<= true;
     return aRet;
 }
 
@@ -463,7 +463,7 @@ Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyDefault( const Refe
                         throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
-    aRet <<= sal_True;
+    aRet <<= true;
     return aRet;
 }
 
@@ -534,7 +534,7 @@ Any WrappedHasLegendProperty::getPropertyValue( const Reference< beans::XPropert
         if( xLegendProp.is())
             aRet = xLegendProp->getPropertyValue("Show");
         else
-            aRet <<= sal_False;
+            aRet <<= false;
     }
     catch (const uno::Exception& ex)
     {
@@ -547,7 +547,7 @@ Any WrappedHasLegendProperty::getPropertyDefault( const Reference< beans::XPrope
                         throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
-    aRet <<= sal_False;
+    aRet <<= false;
     return aRet;
 }
 
@@ -620,7 +620,7 @@ Any WrappedHasMainTitleProperty::getPropertyDefault( const Reference< beans::XPr
                         throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
-    aRet <<= sal_False;
+    aRet <<= false;
     return aRet;
 }
 
@@ -693,7 +693,7 @@ Any WrappedHasSubTitleProperty::getPropertyDefault( const Reference< beans::XPro
                         throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
-    aRet <<= sal_False;
+    aRet <<= false;
     return aRet;
 }
 
@@ -850,7 +850,7 @@ sal_Bool SAL_CALL ChartDocumentWrapper::attachResource(
     Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
     if( xModel.is() )
         return xModel->attachResource( URL, Arguments );
-    return sal_False;
+    return false;
 }
 
 OUString SAL_CALL ChartDocumentWrapper::getURL()
@@ -910,7 +910,7 @@ sal_Bool SAL_CALL ChartDocumentWrapper::hasControllersLocked()
     Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
     if( xModel.is() )
         return xModel->hasControllersLocked();
-    return sal_False;
+    return false;
 }
 
 Reference< frame::XController > SAL_CALL ChartDocumentWrapper::getCurrentController()
@@ -1538,8 +1538,8 @@ const std::vector< WrappedProperty* > ChartDocumentWrapper::createWrappedPropert
     aWrappedProperties.push_back( new WrappedAdditionalShapesProperty( *this ) );
     aWrappedProperties.push_back( new WrappedRefreshAddInAllowedProperty( *this ) );
     aWrappedProperties.push_back( new WrappedIgnoreProperty("NullDate",Any() ) ); // i99104
-    aWrappedProperties.push_back( new WrappedIgnoreProperty("EnableComplexChartTypes", uno::makeAny(sal_True) ) );
-    aWrappedProperties.push_back( new WrappedIgnoreProperty("EnableDataTableDialog", uno::makeAny(sal_True) ) );
+    aWrappedProperties.push_back( new WrappedIgnoreProperty("EnableComplexChartTypes", uno::makeAny(true) ) );
+    aWrappedProperties.push_back( new WrappedIgnoreProperty("EnableDataTableDialog", uno::makeAny(true) ) );
 
     return aWrappedProperties;
 }
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index 0b1bd662a4e9..e1a75c626f78 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -391,7 +391,7 @@ void WrappedAxisLabelExistenceProperty::setPropertyValue( const Any& rOuterValue
         //create axis if needed
         xProp.set( AxisHelper::createAxis( m_nDimensionIndex, m_bMain, xDiagram, m_spChart2ModelContact->m_xContext ), uno::UNO_QUERY );
         if( xProp.is() )
-            xProp->setPropertyValue( "Show", uno::makeAny( sal_False ) );
+            xProp->setPropertyValue( "Show", uno::makeAny( false ) );
     }
     if( xProp.is() )
         xProp->setPropertyValue( "DisplayLabels", rOuterValue );
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index 729b91ab778b..f1c8f12589a8 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -323,7 +323,7 @@ public:
 WrappedMeanValueProperty::WrappedMeanValueProperty(
     ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
-        : WrappedStatisticProperty< sal_Bool >( "MeanValue", uno::makeAny( sal_False ), spChart2ModelContact, ePropertyType  )
+        : WrappedStatisticProperty< sal_Bool >( "MeanValue", uno::makeAny( false ), spChart2ModelContact, ePropertyType  )
 {
 }
 WrappedMeanValueProperty::~WrappedMeanValueProperty()
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index 124c862b364b..c04dc360b320 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -126,7 +126,7 @@ public:
 };
 
 WrappedVolumeProperty::WrappedVolumeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
-        : WrappedStockProperty( "Volume", uno::makeAny(sal_False) , spChart2ModelContact )
+        : WrappedStockProperty( "Volume", uno::makeAny(false) , spChart2ModelContact )
 {
 }
 WrappedVolumeProperty::~WrappedVolumeProperty()
@@ -196,7 +196,7 @@ public:
     uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const override;
 };
 WrappedUpDownProperty::WrappedUpDownProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact )
-        : WrappedStockProperty( "UpDown", uno::makeAny(sal_False) , spChart2ModelContact )
+        : WrappedStockProperty( "UpDown", uno::makeAny(false) , spChart2ModelContact )
 {
 }
 WrappedUpDownProperty::~WrappedUpDownProperty()
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index 40f68cebc86e..37ac4873bfaf 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -493,7 +493,7 @@ WrappedSymbolAndLinesProperty::WrappedSymbolAndLinesProperty(
     std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
     tSeriesOrDiagramPropertyType ePropertyType )
         : WrappedSeriesOrDiagramProperty< sal_Bool >( "Lines"
-            , uno::makeAny( sal_True ), spChart2ModelContact, ePropertyType  )
+            , uno::makeAny( true ), spChart2ModelContact, ePropertyType  )
 {
 }
 
@@ -504,7 +504,7 @@ WrappedSymbolAndLinesProperty::~WrappedSymbolAndLinesProperty()
 sal_Bool WrappedSymbolAndLinesProperty::getValueFromSeries( const Reference< beans::XPropertySet >& /*xSeriesPropertySet*/ ) const
 {
     //do not export this property anymore, instead use a linestyle none for no lines
-    return sal_True;
+    return true;
 }
 
 void WrappedSymbolAndLinesProperty::setValueToSeries(
diff --git a/chart2/source/controller/dialogs/TitleDialogData.cxx b/chart2/source/controller/dialogs/TitleDialogData.cxx
index 30191eb95b95..8ab0a3623f97 100644
--- a/chart2/source/controller/dialogs/TitleDialogData.cxx
+++ b/chart2/source/controller/dialogs/TitleDialogData.cxx
@@ -35,9 +35,9 @@ TitleDialogData::TitleDialogData( ReferenceSizeProvider* pRefSizeProvider )
 {
     sal_Int32 nN = 0;
     for(nN=7;nN--;)
-        aPossibilityList[nN]=sal_True;
+        aPossibilityList[nN]=true;
     for(nN=7;nN--;)
-        aExistenceList[nN]=sal_False;
+        aExistenceList[nN]=false;
 }
 
 void TitleDialogData::readFromModel( const uno::Reference< frame::XModel>& xChartModel )
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 65db15671668..c8808e1d41ae 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -983,7 +983,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
         {
             Reference< util::XModifiable > xModifiable( m_rDialogModel.getChartModel(), uno::UNO_QUERY );
             if( xModifiable.is() )
-                xModifiable->setModified( sal_True );
+                xModifiable->setModified( true );
             const DialogModelTimeBasedInfo& rInfo = m_rDialogModel.getTimeBasedInfo();
             if(rInfo.bTimeBased)
             {
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index b2fd6771779c..51ce1119f569 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -193,7 +193,7 @@ void ChartController::TheModel::tryTermination()
                 //I think yes, because there might be other closelistners later in the list which might be interested still
                 //but make sure that we do not throw the CloseVetoException here ourselves
                 //so stop listening before trying to terminate or check the source of queryclosing event
-                m_xCloseable->close(sal_True);
+                m_xCloseable->close(true);
 
                 m_bOwnership                = false;
             }
@@ -466,7 +466,7 @@ void SAL_CALL ChartController::attachFrame(
         VCLXWindow* pParentComponent = VCLXWindow::GetImplementation(xContainerWindow);
         assert(pParentComponent);
         if (pParentComponent)
-            pParentComponent->setVisible(sal_True);
+            pParentComponent->setVisible(true);
 
         pParent = VCLUnoHelper::GetWindow( xContainerWindow );
     }
@@ -607,7 +607,7 @@ sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XMo
 
     SolarMutexResettableGuard aGuard;
     if( impl_isDisposedOrSuspended() ) //@todo? allow attaching a new model while suspended?
-        return sal_False; //behave passive if already disposed or suspended
+        return false; //behave passive if already disposed or suspended
     aGuard.clear();
 
     TheModelRef aNewModelRef( new TheModel( xModel), m_aModelMutex);
@@ -683,7 +683,7 @@ sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XMo
     uno::Reference< document::XUndoManagerSupplier > xSuppUndo( getModel(), uno::UNO_QUERY_THROW );
     m_xUndoManager.set( xSuppUndo->getUndoManager(), uno::UNO_QUERY_THROW );
 
-    return sal_True;
+    return true;
 }
 
 uno::Reference< frame::XFrame > SAL_CALL ChartController::getFrame()
@@ -752,25 +752,25 @@ sal_Bool SAL_CALL ChartController::suspend( sal_Bool bSuspend )
 
     SolarMutexGuard aGuard;
     if( m_aLifeTimeManager.impl_isDisposed() )
-        return sal_False; //behave passive if already disposed, return false because request was not accepted //@todo? correct
+        return false; //behave passive if already disposed, return false because request was not accepted //@todo? correct
 
     if(bool(bSuspend) == m_bSuspended)
     {
         OSL_FAIL( "new suspend mode equals old suspend mode" );
-        return sal_True;
+        return true;
     }
 
     //change suspend mode
     if(bSuspend)
     {
         m_bSuspended = bSuspend;
-        return sal_True;
+        return true;
     }
     else
     {
         m_bSuspended = bSuspend;
     }
-    return sal_True;
+    return true;
 }
 
 void ChartController::impl_createDrawViewController()
@@ -993,7 +993,7 @@ void SAL_CALL ChartController::notifyClosing(
         {
             try
             {
-                xFrameCloseable->close( sal_False /* DeliverOwnership */ );
+                xFrameCloseable->close( false /* DeliverOwnership */ );
                 m_xFrame.clear();
             }
             catch( const util::CloseVetoException & )
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index 798efedaa3ce..37b57ddeecc9 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -69,7 +69,7 @@ void ChartController::StartTextEdit( const Point* pMousePixel )
     //#i77362 change notification for changes on additional shapes are missing
     uno::Reference< beans::XPropertySet > xChartViewProps( m_xChartView, uno::UNO_QUERY );
     if( xChartViewProps.is() )
-        xChartViewProps->setPropertyValue( "SdrViewIsInEditMode", uno::makeAny(sal_True) );
+        xChartViewProps->setPropertyValue( "SdrViewIsInEditMode", uno::makeAny(true) );
 
     bool bEdit = m_pDrawViewWrapper->SdrBeginTextEdit( pTextObj
                     , m_pDrawViewWrapper->GetPageView()
@@ -109,7 +109,7 @@ bool ChartController::EndTextEdit()
     //#i77362 change notification for changes on additional shapes are missing
     uno::Reference< beans::XPropertySet > xChartViewProps( m_xChartView, uno::UNO_QUERY );
     if( xChartViewProps.is() )
-        xChartViewProps->setPropertyValue( "SdrViewIsInEditMode", uno::makeAny(sal_False) );
+        xChartViewProps->setPropertyValue( "SdrViewIsInEditMode", uno::makeAny(false) );
 
     SdrObject* pTextObject = m_pDrawViewWrapper->getTextEditObject();
     if(!pTextObject)
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index a9f98d97112c..f1082da56e92 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1610,10 +1610,10 @@ sal_Bool SAL_CALL ChartController::select( const uno::Any& rSelection )
         {
             m_pChartWindow->Invalidate();
         }
-        return sal_True;
+        return true;
     }
 
-    return sal_False;
+    return false;
 }
 
 uno::Any SAL_CALL ChartController::getSelection()
diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx
index fb12dfed5e2e..67244fc6345b 100644
--- a/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/chart2/source/controller/main/ChartFrameloader.cxx
@@ -115,7 +115,7 @@ sal_Bool SAL_CALL ChartFrameLoader::load( const uno::Sequence< beans::PropertyVa
                 , uno::UNO_QUERY );
 
         if( impl_checkCancel() )
-            return sal_False;
+            return false;
     }
 
     //create the controller(+XWindow)
@@ -133,7 +133,7 @@ sal_Bool SAL_CALL ChartFrameLoader::load( const uno::Sequence< beans::PropertyVa
                       uno::Reference< awt::XWindow >( xController, uno::UNO_QUERY );
 
         if( impl_checkCancel() )
-            return sal_False;
+            return false;
     }
 
     //connect frame, controller and model one to each other:
@@ -195,7 +195,7 @@ sal_Bool SAL_CALL ChartFrameLoader::load( const uno::Sequence< beans::PropertyVa
             ASSERT_EXCEPTION( ex );
         }
 
-    return sal_True;
+    return true;
 }
 
 void SAL_CALL ChartFrameLoader::cancel()
diff --git a/chart2/source/controller/main/ChartModelClone.cxx b/chart2/source/controller/main/ChartModelClone.cxx
index c4f4755f4d66..4f87b7bd3baa 100644
--- a/chart2/source/controller/main/ChartModelClone.cxx
+++ b/chart2/source/controller/main/ChartModelClone.cxx
@@ -232,7 +232,7 @@ namespace chart
             Reference< XModifiable > xDestMod( xDestination, UNO_QUERY );
             if ( xSourceMod.is() && xDestMod.is() && !xSourceMod->isModified() )
             {
-                xDestMod->setModified( sal_False );
+                xDestMod->setModified( false );
             }
             // \-- loccked controllers of destination
         }
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index db3a0d970b0c..8cac9e21c29d 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -710,8 +710,8 @@ sal_Int32 XMLFilter::impl_ExportStream(
         if(xStreamProp.is()) try
         {
             xStreamProp->setPropertyValue( "MediaType", uno::makeAny( OUString("text/xml") ) );
-            xStreamProp->setPropertyValue( "Compressed", uno::makeAny( sal_True ) );//@todo?
-            xStreamProp->setPropertyValue( "UseCommonStoragePasswordEncryption", uno::makeAny( sal_True ) );
+            xStreamProp->setPropertyValue( "Compressed", uno::makeAny( true ) );//@todo?
+            xStreamProp->setPropertyValue( "UseCommonStoragePasswordEncryption", uno::makeAny( true ) );
         }
         catch (const uno::Exception& rEx)
         {
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 6e2c06ed288d..f57da883577b 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -362,11 +362,11 @@ sal_Bool SAL_CALL ChartModel::attachResource( const OUString& rURL
 
     LifeTimeGuard aGuard(m_aLifeTimeManager);
     if(!aGuard.startApiCall())
-        return sal_False; //behave passive if already disposed or closed or throw exception @todo?
+        return false; //behave passive if already disposed or closed or throw exception @todo?
     //mutex is acquired
 
     if(!m_aResource.isEmpty())//we have a resource already //@todo? or is setting a new resource allowed?
-        return sal_False;
+        return false;
     m_aResource = rURL;
     m_aMediaDescriptor = rMediaDescriptor;
 
@@ -374,7 +374,7 @@ sal_Bool SAL_CALL ChartModel::attachResource( const OUString& rURL
     //@todo ? evaluate m_aMediaDescriptor;
     //@todo ? ... ??? --> nothing, this method is only for setting information
 
-    return sal_True;
+    return true;
 }
 
 OUString SAL_CALL ChartModel::getURL() throw(uno::RuntimeException, std::exception)
@@ -481,7 +481,7 @@ sal_Bool SAL_CALL ChartModel::hasControllersLocked() throw(uno::RuntimeException
 {
     LifeTimeGuard aGuard(m_aLifeTimeManager);
     if(!aGuard.startApiCall())
-        return sal_False; //behave passive if already disposed or closed or throw exception @todo?
+        return false; //behave passive if already disposed or closed or throw exception @todo?
     return ( m_nControllerLockCount != 0 ) ;
 }
 
@@ -752,7 +752,7 @@ void SAL_CALL ChartModel::setFirstDiagram( const uno::Reference< chart2::XDiagra
     //don't keep the mutex locked while calling out
     ModifyListenerHelper::removeListener( xOldDiagram, xListener );
     ModifyListenerHelper::addListener( xDiagram, xListener );
-    setModified( sal_True );
+    setModified( true );
 }
 
 Reference< chart2::data::XDataSource > ChartModel::impl_createDefaultData()
@@ -766,7 +766,7 @@ Reference< chart2::data::XDataSource > ChartModel::impl_createDefaultData()
             //init internal dataprovider
             {
                 uno::Sequence< uno::Any > aArgs(1);
-                beans::NamedValue aParam( "CreateDefaultData" ,uno::makeAny(sal_True) );
+                beans::NamedValue aParam( "CreateDefaultData" ,uno::makeAny(true) );
                 aArgs[0] <<= aParam;
                 xIni->initialize(aArgs);
             }
@@ -811,7 +811,7 @@ void SAL_CALL ChartModel::createInternalDataProvider( sal_Bool bCloneExistingDat
             m_xInternalDataProvider = ChartModelHelper::createInternalDataProvider( Reference<XChartDocument>(), true );
         m_xDataProvider.set( m_xInternalDataProvider );
     }
-    setModified( sal_True );
+    setModified( true );
 }
 
 sal_Bool SAL_CALL ChartModel::hasInternalDataProvider()
@@ -852,7 +852,7 @@ void SAL_CALL ChartModel::attachDataProvider( const uno::Reference< chart2::data
 
         //the numberformatter is kept independent of the data provider!
     }
-    setModified( sal_True );
+    setModified( true );
 }
 
 void SAL_CALL ChartModel::attachNumberFormatsSupplier( const uno::Reference< util::XNumberFormatsSupplier >& xNewSupplier )
@@ -882,7 +882,7 @@ void SAL_CALL ChartModel::attachNumberFormatsSupplier( const uno::Reference< uti
         m_xNumberFormatsSupplier.set( xNewSupplier );
         m_xOwnNumberFormatsSupplier.clear();
     }
-    setModified( sal_True );
+    setModified( true );
 }
 
 void SAL_CALL ChartModel::setArguments( const Sequence< beans::PropertyValue >& aArguments )
@@ -921,7 +921,7 @@ void SAL_CALL ChartModel::setArguments( const Sequence< beans::PropertyValue >&
         }
         unlockControllers();
     }
-    setModified( sal_True );
+    setModified( true );
 }
 
 Sequence< OUString > SAL_CALL ChartModel::getUsedRangeRepresentations()
@@ -964,7 +964,7 @@ void SAL_CALL ChartModel::setChartTypeManager( const uno::Reference< chart2::XCh
         MutexGuard aGuard( m_aModelMutex );
         m_xChartTypeManager = xNewManager;
     }
-    setModified( sal_True );
+    setModified( true );
 }
 
 uno::Reference< chart2::XChartTypeManager > SAL_CALL ChartModel::getChartTypeManager()
@@ -1011,7 +1011,7 @@ void SAL_CALL ChartModel::setTitleObject( const uno::Reference< chart2::XTitle >
         m_xTitle = xTitle;
         ModifyListenerHelper::addListener( m_xTitle, this );
     }
-    setModified( sal_True );
+    setModified( true );
 }
 
 // ____ XInterface (for old API wrapper) ____
@@ -1066,7 +1066,7 @@ void SAL_CALL ChartModel::setVisualAreaSize( ::sal_Int64 nAspect, const awt::Siz
 
         m_aVisualAreaSize = aSize;
         if( bChanged )
-            setModified( sal_True );
+            setModified( true );
     }
     else
     {
@@ -1422,7 +1422,7 @@ void ChartModel::getNextTimePoint()
         {
             if(!bSet)
                 xTimeBased->setRange(mnStart, mnEnd);
-            xTimeBased->switchToNext(sal_True);
+            xTimeBased->switchToNext(true);
         }
     }
     bSet = true;
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index e1e00477eb1c..19e3e7636c53 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -361,7 +361,7 @@ void ChartModel::impl_store(
         OSL_FAIL( "No filter" );
     }
 
-    setModified( sal_False );
+    setModified( false );
 
     //#i66865#
     //for data change notification during chart is not loaded:
@@ -386,7 +386,7 @@ void ChartModel::impl_store(
 void ChartModel::insertDefaultChart()
 {
     lockControllers();
-    createInternalDataProvider( sal_False );
+    createInternalDataProvider( false );
     try
     {
         // create default chart
@@ -437,7 +437,7 @@ void ChartModel::insertDefaultChart()
                 Reference< beans::XPropertySet > xDiagramProperties( xDiagram, uno::UNO_QUERY );
                 if( xDiagramProperties.is() )
                 {
-                    xDiagramProperties->setPropertyValue( "RightAngledAxes", uno::makeAny( sal_True ));
+                    xDiagramProperties->setPropertyValue( "RightAngledAxes", uno::makeAny( true ));
                     xDiagramProperties->setPropertyValue( "D3DScenePerspective", uno::makeAny( drawing::ProjectionMode_PARALLEL ));
                     ThreeDHelper::setScheme( xDiagram, ThreeDLookScheme_Realistic );
                 }
@@ -475,7 +475,7 @@ void ChartModel::insertDefaultChart()
     {
         ASSERT_EXCEPTION( ex );
     }
-    setModified( sal_False );
+    setModified( false );
     unlockControllers();
 }
 
@@ -588,7 +588,7 @@ void ChartModel::impl_load(
     if( xStorage.is() )
         impl_loadGraphics( xStorage );
 
-    setModified( sal_False );
+    setModified( false );
 
     // switchToStorage without notifying listeners (which shouldn't exist at
     // this time, anyway)
@@ -732,7 +732,7 @@ void SAL_CALL ChartModel::modified( const lang::EventObject& )
     throw (uno::RuntimeException, std::exception)
 {
     if( m_nInLoad == 0 )
-        setModified( sal_True );
+        setModified( true );
 }
 
 // lang::XEventListener (base of util::XModifyListener)
diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx
index 20066cd67a51..2dd85a0e78b1 100644
--- a/chart2/source/model/main/DataPointProperties.cxx
+++ b/chart2/source/model/main/DataPointProperties.cxx
@@ -530,10 +530,10 @@ void DataPointProperties::AddDefaultsToMap(
     PropertyHelper::setPropertyValueDefault(
         rOutMap, PROP_DATAPOINT_LABEL,
         chart2::DataPointLabel(
-            sal_False, // ShowNumber
-            sal_False, // ShowNumberInPercent
-            sal_False, // ShowCategoryName
-            sal_False  // ShowLegendSymbol
+            false, // ShowNumber
+            false, // ShowNumberInPercent
+            false, // ShowCategoryName
+            false  // ShowLegendSymbol
             ));
 
     PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DATAPOINT_TEXT_WORD_WRAP, false );
diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx
index 910430ad8cff..eef20b1111c8 100644
--- a/chart2/source/model/template/BubbleDataInterpreter.cxx
+++ b/chart2/source/model/template/BubbleDataInterpreter.cxx
@@ -282,7 +282,7 @@ sal_Bool SAL_CALL BubbleDataInterpreter::isDataCompatible(
             Reference< data::XDataSource > xSrc( aSeries[i], uno::UNO_QUERY_THROW );
             Sequence< Reference< data::XLabeledDataSequence > > aSeq( xSrc->getDataSequences());
             if( aSeq.getLength() != 3 )
-                return sal_False;
+                return false;
         }
         catch( const uno::Exception & ex )
         {
@@ -290,7 +290,7 @@ sal_Bool SAL_CALL BubbleDataInterpreter::isDataCompatible(
         }
     }
 
-    return sal_True;
+    return true;
 }
 
 } // namespace chart
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index 2c0a7e8ca4c1..313343e761e6 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -181,7 +181,7 @@ uno::Reference< XDiagram > SAL_CALL ChartTypeTemplate::createDiagramByDataSource
 sal_Bool SAL_CALL ChartTypeTemplate::supportsCategories()
     throw (css::uno::RuntimeException, ::std::exception)
 {
-    return sal_True;
+    return true;
 }
 
 void SAL_CALL ChartTypeTemplate::changeDiagram( const uno::Reference< XDiagram >& xDiagram )
diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx
index d8ea1c46ce85..a7c0d34bdec9 100644
--- a/chart2/source/model/template/DataInterpreter.cxx
+++ b/chart2/source/model/template/DataInterpreter.cxx
@@ -205,7 +205,7 @@ sal_Bool SAL_CALL DataInterpreter::isDataCompatible(
             Reference< data::XDataSource > xSrc( aSeries[i], uno::UNO_QUERY_THROW );
             Sequence< Reference< data::XLabeledDataSequence > > aSeq( xSrc->getDataSequences());
             if( aSeq.getLength() != 1 )
-                return sal_False;
+                return false;
         }
         catch( const uno::Exception & ex )
         {
@@ -213,7 +213,7 @@ sal_Bool SAL_CALL DataInterpreter::isDataCompatible(
         }
     }
 
-    return sal_True;
+    return true;
 }
 
 namespace
diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx
index b4a59540a19e..0b06f66c1b1f 100644
--- a/chart2/source/model/template/NetChartTypeTemplate.cxx
+++ b/chart2/source/model/template/NetChartTypeTemplate.cxx
@@ -95,7 +95,7 @@ sal_Bool SAL_CALL NetChartTypeTemplate::matchesTemplate(
     {
         //filled net chart?:
         if( m_bHasFilledArea )
-            return sal_True;
+            return true;
 
         // check symbol-style
         // for a template with symbols it is ok, if there is at least one series
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
index aefdf202a3ec..aecac2e92eec 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
@@ -228,7 +228,7 @@ void SAL_CALL ScatterChartTypeTemplate::applyStyle(
 sal_Bool SAL_CALL ScatterChartTypeTemplate::supportsCategories()
     throw (uno::RuntimeException, std::exception)
 {
-    return sal_False;
+    return false;
 }
 
 sal_Bool SAL_CALL ScatterChartTypeTemplate::matchesTemplate(
diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx
index 8f4e5587f462..e806ab1ed334 100644
--- a/chart2/source/model/template/StockDataInterpreter.cxx
+++ b/chart2/source/model/template/StockDataInterpreter.cxx
@@ -280,7 +280,7 @@ sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible(
 
     // 1. correct number of sub-types
     if( aInterpretedData.Series.getLength() < (bHasVolume ? 2 : 1 ))
-        return sal_False;
+        return false;
 
     // 2. a. volume -- use default check
     if( bHasVolume )
@@ -289,7 +289,7 @@ sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible(
                 InterpretedData( Sequence< Sequence< Reference< XDataSeries > > >(
                                      aInterpretedData.Series.getConstArray(), 1 ),
                                  aInterpretedData.Categories )))
-            return sal_False;
+            return false;
     }
 
     // 2. b. candlestick
@@ -297,7 +297,7 @@ sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible(
         OSL_ASSERT( aInterpretedData.Series.getLength() > (bHasVolume ? 1 : 0));
         Sequence< Reference< XDataSeries > > aSeries( aInterpretedData.Series[(bHasVolume ? 1 : 0)] );
         if(!aSeries.getLength())
-            return sal_False;
+            return false;
         for( sal_Int32 i=0; i<aSeries.getLength(); ++i )
         {
             try
@@ -305,7 +305,7 @@ sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible(
                 Reference< data::XDataSource > xSrc( aSeries[i], uno::UNO_QUERY_THROW );
                 Sequence< Reference< data::XLabeledDataSequence > > aSeq( xSrc->getDataSequences());
                 if( aSeq.getLength() != nNumberOfNecessarySequences )
-                    return sal_False;
+                    return false;
             }
             catch( const uno::Exception & ex )
             {
@@ -317,7 +317,7 @@ sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible(
     // 2. c. additional series
     // ignore
 
-    return sal_True;
+    return true;
 }
 
 InterpretedData SAL_CALL StockDataInterpreter::reinterpretDataSeries(
diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx
index e291eafefd16..4eaab59a3039 100644
--- a/chart2/source/model/template/XYDataInterpreter.cxx
+++ b/chart2/source/model/template/XYDataInterpreter.cxx
@@ -244,7 +244,7 @@ sal_Bool SAL_CALL XYDataInterpreter::isDataCompatible(
             Reference< data::XDataSource > xSrc( aSeries[i], uno::UNO_QUERY_THROW );
             Sequence< Reference< data::XLabeledDataSequence > > aSeq( xSrc->getDataSequences());
             if( aSeq.getLength() != 2 )
-                return sal_False;
+                return false;
         }
         catch( const uno::Exception & ex )
         {
@@ -252,7 +252,7 @@ sal_Bool SAL_CALL XYDataInterpreter::isDataCompatible(
         }
     }
 
-    return sal_True;
+    return true;
 }
 
 } // namespace chart
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index 03c1620faeba..cdc262970f3c 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -479,9 +479,9 @@ void AxisHelper::makeAxisVisible( const Reference< XAxis >& xAxis )
     Reference< beans::XPropertySet > xProps( xAxis, uno::UNO_QUERY );
     if( xProps.is() )
     {
-        xProps->setPropertyValue( "Show", uno::makeAny( sal_True ) );
+        xProps->setPropertyValue( "Show", uno::makeAny( true ) );
         LinePropertiesHelper::SetLineVisible( xProps );
-        xProps->setPropertyValue( "DisplayLabels", uno::makeAny( sal_True ) );
+        xProps->setPropertyValue( "DisplayLabels", uno::makeAny( true ) );
     }
 }
 
@@ -489,7 +489,7 @@ void AxisHelper::makeGridVisible( const Reference< beans::XPropertySet >& xGridP
 {
     if( xGridProperties.is() )
     {
-        xGridProperties->setPropertyValue( "Show", uno::makeAny( sal_True ) );
+        xGridProperties->setPropertyValue( "Show", uno::makeAny( true ) );
         LinePropertiesHelper::SetLineVisible( xGridProperties );
     }
 }
@@ -505,7 +505,7 @@ void AxisHelper::makeAxisInvisible( const Reference< XAxis >& xAxis )
     Reference< beans::XPropertySet > xProps( xAxis, uno::UNO_QUERY );
     if( xProps.is() )
     {
-        xProps->setPropertyValue( "Show", uno::makeAny( sal_False ) );
+        xProps->setPropertyValue( "Show", uno::makeAny( false ) );
     }
 }
 
@@ -556,7 +556,7 @@ void AxisHelper::makeGridInvisible( const Reference< beans::XPropertySet >& xGri
 {
     if( xGridProperties.is() )
     {
-        xGridProperties->setPropertyValue( "Show", uno::makeAny( sal_False ) );
+        xGridProperties->setPropertyValue( "Show", uno::makeAny( false ) );
     }
 }
 
diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx
index 2e1cf9367e4a..c9088702c970 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -462,7 +462,7 @@ void CharacterProperties::AddDefaultsToMap(
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_COMPLEX_FONT_PITCH, sal_Int16(aFontCTL.GetPitch()) );
 
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_WRITING_MODE, sal_Int16( css::text::WritingMode2::PAGE ) );
-    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_PARA_IS_CHARACTER_DISTANCE, sal_True );
+    ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_PARA_IS_CHARACTER_DISTANCE, true );
 }
 
 bool CharacterProperties::IsCharacterPropertyHandle( sal_Int32 nHandle )
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index 706ee385a4b2..ce0eca35b9c0 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -1709,7 +1709,7 @@ bool DiagramHelper::switchDiagramPositioningToExcludingPositioning(
             bool bModelWasModified = rModel.isModified();
             xDiagramPositioning->setDiagramPositionExcludingAxes( xDiagramPositioning->calculateDiagramPositionExcludingAxes() );
             if(bResetModifiedState && !bModelWasModified )
-                rModel.setModified(sal_False);
+                rModel.setModified(false);
             return true;
         }
     }
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index efafdbd2e653..44de6cb43e85 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -102,7 +102,7 @@ struct lcl_setModified : public ::std::unary_function< lcl_tSequenceMap, void >
         {
             Reference< util::XModifiable > xMod( xSeq, uno::UNO_QUERY );
             if( xMod.is())
-                xMod->setModified( sal_True );
+                xMod->setModified( true );
         }
     }
 };
diff --git a/chart2/source/tools/LegendHelper.cxx b/chart2/source/tools/LegendHelper.cxx
index c174e398ac40..ecfd84d8f395 100644
--- a/chart2/source/tools/LegendHelper.cxx
+++ b/chart2/source/tools/LegendHelper.cxx
@@ -39,7 +39,7 @@ Reference< chart2::XLegend > LegendHelper::showLegend( ChartModel& rModel
     uno::Reference< beans::XPropertySet > xProp( xLegend, uno::UNO_QUERY );
     if( xProp.is())
     {
-        xProp->setPropertyValue( "Show", uno::makeAny(sal_True) );
+        xProp->setPropertyValue( "Show", uno::makeAny(true) );
 
         chart2::RelativePosition aRelativePosition;
         if( !(xProp->getPropertyValue( "RelativePosition") >>=  aRelativePosition) )
@@ -69,7 +69,7 @@ void LegendHelper::hideLegend( ChartModel& rModel )
     uno::Reference< beans::XPropertySet > xProp( xLegend, uno::UNO_QUERY );
     if( xProp.is())
     {
-        xProp->setPropertyValue( "Show", uno::makeAny(sal_False) );
+        xProp->setPropertyValue( "Show", uno::makeAny(false) );
     }
 }
 
diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx
index 29d751c3469e..7ed2ce3a1428 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -242,21 +242,21 @@ sal_Bool SAL_CALL OPropertySet::convertFastPropertyValue
             if( rValue>>=n32Value )
             {
                 rConvertedValue = uno::makeAny( static_cast<sal_Int16>(n32Value) );
-                return sal_True;
+                return true;
             }
 
             sal_Int64 n64Value = 0;
             if( rValue>>=n64Value )
             {
                 rConvertedValue = uno::makeAny( static_cast<sal_Int16>(n64Value) );
-                return sal_True;
+                return true;
             }
         }
     }
     rConvertedValue = rValue;
     if( !m_bSetNewValuesExplicitlyEvenIfTheyEqualDefault && rOldValue == rConvertedValue )
-        return sal_False;//no change necessary
-    return sal_True;
+        return false;//no change necessary
+    return true;
 }
 
 void SAL_CALL OPropertySet::setFastPropertyValue_NoBroadcast
diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx
index 749bf64a1e9c..31ca9da5591b 100644
--- a/chart2/source/tools/RangeHighlighter.cxx
+++ b/chart2/source/tools/RangeHighlighter.cxx
@@ -52,7 +52,7 @@ void lcl_fillRanges(
     {
         rOutRanges[i].RangeRepresentation = aRangeStrings[i];
         rOutRanges[i].PreferredColor = nPreferredColor;
-        rOutRanges[i].AllowMerginigWithOtherRanges = sal_False;
+        rOutRanges[i].AllowMerginigWithOtherRanges = false;
         rOutRanges[i].Index = nIndex;
     }
 }
@@ -200,7 +200,7 @@ void RangeHighlighter::fillRangesForDiagram( const Reference< chart2::XDiagram >
         m_aSelectedRanges[i].RangeRepresentation = aSelectedRanges[i];
         m_aSelectedRanges[i].Index = -1;
         m_aSelectedRanges[i].PreferredColor = PREFERED_DEFAULT_COLOR;
-        m_aSelectedRanges[i].AllowMerginigWithOtherRanges = sal_True;
+        m_aSelectedRanges[i].AllowMerginigWithOtherRanges = true;
     }
 }
 
@@ -282,7 +282,7 @@ void RangeHighlighter::fillRangesForDataPoint( const Reference< uno::XInterface
                             xLabel->getSourceRangeRepresentation(),
                             -1,
                             nPreferredColor,
-                            sal_False ));
+                            false ));
 
                 sal_Int32 nUnhiddenIndex = DataSeriesHelper::translateIndexFromHiddenToFullSequence( nIndex, xValues, !m_bIncludeHiddenCells );
                 if( xValues.is())
@@ -291,7 +291,7 @@ void RangeHighlighter::fillRangesForDataPoint( const Reference< uno::XInterface
                             xValues->getSourceRangeRepresentation(),
                             nUnhiddenIndex,
                             nPreferredColor,
-                            sal_False ));
+                            false ));
             }
             m_aSelectedRanges = comphelper::containerToSequence( aHilightedRanges );
         }
diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx
index a0a8acb52f12..e89d9ab3e4ea 100644
--- a/chart2/source/tools/ThreeDHelper.cxx
+++ b/chart2/source/tools/ThreeDHelper.cxx
@@ -205,7 +205,7 @@ void lcl_setLightsForScheme( const uno::Reference< beans::XPropertySet >& xDiagr
     if( rScheme == ThreeDLookScheme_Unknown)
         return;
 
-    xDiagramProps->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_2, uno::makeAny( sal_True ) );
+    xDiagramProps->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_2, uno::makeAny( true ) );
 
     uno::Reference< chart2::XDiagram > xDiagram( xDiagramProps, uno::UNO_QUERY );
     uno::Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) );
@@ -1282,13 +1282,13 @@ void ThreeDHelper::setDefaultIllumination( const uno::Reference< beans::XPropert
     try
     {
         xSceneProperties->getPropertyValue( "D3DSceneShadeMode" )>>= aShadeMode;
-        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_1, uno::makeAny( sal_False ) );
-        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_3, uno::makeAny( sal_False ) );
-        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_4, uno::makeAny( sal_False ) );
-        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_5, uno::makeAny( sal_False ) );
-        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_6, uno::makeAny( sal_False ) );
-        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_7, uno::makeAny( sal_False ) );
-        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_8, uno::makeAny( sal_False ) );
+        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_1, uno::makeAny( false ) );
+        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_3, uno::makeAny( false ) );
+        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_4, uno::makeAny( false ) );
+        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_5, uno::makeAny( false ) );
+        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_6, uno::makeAny( false ) );
+        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_7, uno::makeAny( false ) );
+        xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_8, uno::makeAny( false ) );
     }
     catch( const uno::Exception & ex )
     {
diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx
index a76f27626ca6..d2adced63854 100644
--- a/chart2/source/tools/TitleHelper.cxx
+++ b/chart2/source/tools/TitleHelper.cxx
@@ -198,7 +198,7 @@ uno::Reference< XTitle > TitleHelper::createTitle(
         uno::Reference< beans::XPropertySet > xProps( xAxis, uno::UNO_QUERY );
         if( xProps.is() )
         {
-            xProps->setPropertyValue( "Show", uno::makeAny( sal_False ) );
+            xProps->setPropertyValue( "Show", uno::makeAny( false ) );
             xTitled = lcl_getTitleParent( eTitleType, xModel );
         }
     }
diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx
index d2faab7ec841..1531ae253007 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -288,7 +288,7 @@ sal_Bool SAL_CALL UncachedDataSequence::hasElements()
     throw (uno::RuntimeException, std::exception)
 {
     if( ! m_xDataProvider.is())
-        return sal_False;
+        return false;
     return m_xDataProvider->hasDataByRangeRepresentation( m_aSourceRepresentation );
 }
 
@@ -317,7 +317,7 @@ Reference< util::XCloneable > SAL_CALL UncachedDataSequence::createClone()
 sal_Bool SAL_CALL UncachedDataSequence::isModified()
     throw (uno::RuntimeException, std::exception)
 {
-    return sal_False;
+    return false;
 }
 
 void SAL_CALL UncachedDataSequence::setModified( sal_Bool bModified )
diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx
index 2fe07d70f739..e7783e201a73 100644
--- a/chart2/source/tools/WrappedPropertySet.cxx
+++ b/chart2/source/tools/WrappedPropertySet.cxx
@@ -423,7 +423,7 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyDefaults( const Sequence
         p = m_pPropertyArrayHelper;
         if(!p)
         {
-            p = new ::cppu::OPropertyArrayHelper( getPropertySequence(), sal_True );
+            p = new ::cppu::OPropertyArrayHelper( getPropertySequence(), true );
             OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
             m_pPropertyArrayHelper = p;
         }
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 6251dadd43f5..82cf455b06c7 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1277,7 +1277,7 @@ void ChartView::getMetaFile( const uno::Reference< io::XOutputStream >& xOutStre
 
     uno::Sequence< beans::PropertyValue > aFilterData(4);
     aFilterData[0].Name = "ExportOnlyBackground";
-    aFilterData[0].Value <<= sal_False;
+    aFilterData[0].Value <<= false;
     aFilterData[1].Name = "HighContrast";
     aFilterData[1].Value <<= bUseHighContrast;
 
@@ -2845,7 +2845,7 @@ void ChartView::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
     if(!bShapeChanged)
         return;
 
-    mrChartModel.setModified(sal_True);
+    mrChartModel.setModified(true);
 }
 
 void ChartView::impl_notifyModeChangeListener( const OUString& rNewMode )
diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx b/chart2/source/view/main/OpenglShapeFactory.cxx
index 6c1e589a81de..da755025ff82 100644
--- a/chart2/source/view/main/OpenglShapeFactory.cxx
+++ b/chart2/source/view/main/OpenglShapeFactory.cxx
@@ -352,7 +352,7 @@ uno::Reference< drawing::XShape > OpenglShapeFactory::createInvisibleRectangle(
             , const awt::Size& rSize )
 {
     dummy::DummyRectangle* pRectangle = new dummy::DummyRectangle(rSize);
-    pRectangle->setPropertyValue("Invisible", uno::makeAny(sal_True));
+    pRectangle->setPropertyValue("Invisible", uno::makeAny(true));
     xTarget->add(pRectangle);
     return pRectangle;
 }
@@ -432,8 +432,8 @@ uno::Reference< drawing::XShape >
 
         aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::makeAny(eHorizontalAdjust) ) ); // drawing::TextHorizontalAdjust
         aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::makeAny(eVerticalAdjust) ) ); //drawing::TextVerticalAdjust
-        aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::makeAny(sal_True) ) ); // sal_Bool
-        aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::makeAny(sal_True) ) ); // sal_Bool
+        aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::makeAny(true) ) ); // sal_Bool
+        aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::makeAny(true) ) ); // sal_Bool
 
     }
 
diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx
index 81320e1d9966..828dbe9d3cbe 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -448,8 +448,8 @@ void PropertyMapper::getTextLabelMultiPropertyLists(
     //some more shape properties apart from character properties, position-matrix and label string
     aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::makeAny(drawing::TextHorizontalAdjust_CENTER) ) ); // drawing::TextHorizontalAdjust - needs to be overwritten
     aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::makeAny(drawing::TextVerticalAdjust_CENTER) ) ); //drawing::TextVerticalAdjust - needs to be overwritten
-    aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::makeAny(sal_True) ) ); // sal_Bool
-    aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::makeAny(sal_True) ) ); // sal_Bool
+    aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::makeAny(true) ) ); // sal_Bool
+    aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::makeAny(true) ) ); // sal_Bool
     if( bName )
         aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( OUString() ) ) ); //CID OUString - needs to be overwritten for each point
 
@@ -459,7 +459,7 @@ void PropertyMapper::getTextLabelMultiPropertyLists(
             aValueMap.insert( tPropertyNameValueMap::value_type( "TextMaximumFrameHeight", uno::makeAny(nLimitedSpace) ) ); //sal_Int32
         else
             aValueMap.insert( tPropertyNameValueMap::value_type( "TextMaximumFrameWidth", uno::makeAny(nLimitedSpace) ) ); //sal_Int32
-        aValueMap.insert( tPropertyNameValueMap::value_type( "ParaIsHyphenation", uno::makeAny(sal_True) ) );
+        aValueMap.insert( tPropertyNameValueMap::value_type( "ParaIsHyphenation", uno::makeAny(true) ) );
     }
 
     PropertyMapper::getMultiPropertyListsFromValueMap( rPropNames, rPropValues, aValueMap );
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index a590b57f4321..fe022f0613ce 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -2281,8 +2281,8 @@ uno::Reference< drawing::XShape >
 
             aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::makeAny(eHorizontalAdjust) ) ); // drawing::TextHorizontalAdjust
             aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::makeAny(eVerticalAdjust) ) ); //drawing::TextVerticalAdjust
-            aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::makeAny(sal_True) ) ); // sal_Bool
-            aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::makeAny(sal_True) ) ); // sal_Bool
+            aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::makeAny(true) ) ); // sal_Bool
+            aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::makeAny(true) ) ); // sal_Bool
 
             //set name/classified ObjectID (CID)
             if( !aName.isEmpty() )
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index 6106b658d82f..a923694cfa13 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -110,8 +110,8 @@ void lcl_getProperties(
         ::chart::PropertyMapper::getValueMap( aTextValueMap, ::chart::PropertyMapper::getPropertyNameMapForCharacterProperties(), xLegendProp );
 
         drawing::TextHorizontalAdjust eHorizAdjust( drawing::TextHorizontalAdjust_LEFT );
-        aTextValueMap[ "TextAutoGrowHeight" ] = uno::makeAny( sal_True );
-        aTextValueMap[ "TextAutoGrowWidth" ] = uno::makeAny( sal_True );
+        aTextValueMap[ "TextAutoGrowHeight" ] = uno::makeAny( true );
+        aTextValueMap[ "TextAutoGrowWidth" ] = uno::makeAny( true );
         aTextValueMap[ "TextHorizontalAdjust" ] = uno::makeAny( eHorizAdjust );
         aTextValueMap[ "TextMaximumFrameWidth" ] = uno::makeAny( rReferenceSize.Width ); //needs to be overwritten by actual available space in the legend