loplugin:salbool: Automatic rewrite of sal_False/True

Change-Id: Ieee84933a3067cada2e8105ac61db994f282c383

20 files changed, 91 insertions, 91 deletions

diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx
index e79decb3a943..839c6a41952f 100644
--- a/reportdesign/source/core/api/Function.cxx
+++ b/reportdesign/source/core/api/Function.cxx
@@ -43,7 +43,7 @@ OFunction::OFunction(uno::Reference< uno::XComponentContext > const & _xContext)
 ,m_bPreEvaluated(false)
 ,m_bDeepTraversing(false)
 {
-    m_sInitialFormula.IsPresent = sal_False;
+    m_sInitialFormula.IsPresent = false;
 }
 
 OFunction::~OFunction()
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 3b151981fe14..006265f6f1da 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -287,8 +287,8 @@ OStyle::OStyle()
     m_aSize.Width = aDefaultSize.Width();
 
     const style::GraphicLocation eGraphicLocation = style::GraphicLocation_NONE;
-    const sal_Bool bFalse = sal_False;
-    const sal_Bool bTrue = sal_True;
+    const sal_Bool bFalse = false;
+    const sal_Bool bTrue = true;
     const sal_Int32 nMargin = 2000;
     //const sal_Int32 nColor = COL_WHITE;
     const sal_Int32 nTransparent = COL_TRANSPARENT;
@@ -418,12 +418,12 @@ void OStyle::getPropertyDefaultByHandle( sal_Int32 /*_nHandle*/, uno::Any& /*_rD
 // XStyle
 sal_Bool SAL_CALL OStyle::isUserDefined(  ) throw (uno::RuntimeException, std::exception)
 {
-    return sal_False;
+    return false;
 }
 
 sal_Bool SAL_CALL OStyle::isInUse(  ) throw (uno::RuntimeException, std::exception)
 {
-    return sal_True;
+    return true;
 }
 
 OUString SAL_CALL OStyle::getParentStyle(  ) throw (uno::RuntimeException, std::exception)
@@ -1145,7 +1145,7 @@ sal_Bool SAL_CALL OReportDefinition::attachResource( const OUString& /*_rURL*/,
         throw;
     }
     m_pImpl->m_pUndoManager->GetSfxUndoManager().EnableUndo( true );
-    return sal_True;
+    return true;
 }
 
 void OReportDefinition::fillArgs(utl::MediaDescriptor& _aDescriptor)
@@ -1471,7 +1471,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
         }
 
         if ( _xStorageToSaveTo == m_pImpl->m_xStorage )
-            setModified(sal_False);
+            setModified(false);
     }
     if ( xStatusIndicator.is() )
         xStatusIndicator->end();
@@ -1616,8 +1616,8 @@ bool OReportDefinition::WriteThroughComponent(
 // XLoadable
 void SAL_CALL OReportDefinition::initNew(  ) throw (frame::DoubleInitializationException, io::IOException, uno::Exception, uno::RuntimeException, std::exception)
 {
-     setPageHeaderOn( sal_True );
-     setPageFooterOn( sal_True );
+     setPageHeaderOn( true );
+     setPageFooterOn( true );
 }
 
 void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue >& _rArguments ) throw (frame::DoubleInitializationException, io::IOException, uno::Exception, uno::RuntimeException, std::exception)
@@ -1727,7 +1727,7 @@ void SAL_CALL OReportDefinition::setVisualAreaSize( ::sal_Int64 _nAspect, const
              m_pImpl->m_aVisualAreaSize.Height != _aSize.Height);
         m_pImpl->m_aVisualAreaSize = _aSize;
         if( bChanged )
-            setModified( sal_True );
+            setModified( true );
     m_pImpl->m_nAspect = _nAspect;
 }
 
diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx
index cdff2e247366..27f86d7a8e75 100644
--- a/reportdesign/source/core/api/ReportEngineJFree.cxx
+++ b/reportdesign/source/core/api/ReportEngineJFree.cxx
@@ -299,15 +299,15 @@ uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive
             uno::Sequence < beans::PropertyValue > aArgs( _bHidden ? 3 : 2 );
             sal_Int32 nLen = 0;
             aArgs[nLen].Name = "AsTemplate";
-            aArgs[nLen++].Value <<= sal_False;
+            aArgs[nLen++].Value <<= false;
 
             aArgs[nLen].Name = "ReadOnly";
-            aArgs[nLen++].Value <<= sal_True;
+            aArgs[nLen++].Value <<= true;
 
             if ( _bHidden )
             {
                 aArgs[nLen].Name = "Hidden";
-                aArgs[nLen++].Value <<= sal_True;
+                aArgs[nLen++].Value <<= true;
             }
 
             uno::Reference< lang::XMultiServiceFactory > xFac(m_xContext->getServiceManager(),uno::UNO_QUERY);
diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx
index 1ce18f7c5fb9..a88c940c46f8 100644
--- a/reportdesign/source/core/sdr/ReportDrawPage.cxx
+++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx
@@ -81,7 +81,7 @@ uno::Reference< drawing::XShape >  OReportDrawPage::CreateShape( SdrObject *pObj
             {
                 uno::Reference<beans::XPropertySet> xControlModel(rUnoObj.GetUnoControlModel(),uno::UNO_QUERY);
                 if ( xControlModel.is() )
-                    xControlModel->setPropertyValue( PROPERTY_MULTILINE,uno::makeAny(sal_True));
+                    xControlModel->setPropertyValue( PROPERTY_MULTILINE,uno::makeAny(true));
             }
             else
                 bChangeOrientation = rUnoObj.GetObjIdentifier() == OBJ_DLG_HFIXEDLINE;
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 00c6d9898c28..d099b5c1cdc1 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -126,7 +126,7 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon
 
                 uno::Reference<beans::XPropertySet> xControlModel(pUnoObj->GetUnoControlModel(),uno::UNO_QUERY);
                 if ( xControlModel.is() )
-                    xControlModel->setPropertyValue( PROPERTY_MULTILINE,uno::makeAny(sal_True));
+                    xControlModel->setPropertyValue( PROPERTY_MULTILINE,uno::makeAny(true));
             }
             break;
         case OBJ_DLG_IMAGECONTROL:
@@ -614,7 +614,7 @@ void OUnoObject::impl_initializeModel_nothrow()
         {
             const Reference< XPropertySet > xModelProps( GetUnoControlModel(), UNO_QUERY_THROW );
             const OUString sTreatAsNumberProperty = "TreatAsNumber";
-            xModelProps->setPropertyValue( sTreatAsNumberProperty, makeAny( sal_False ) );
+            xModelProps->setPropertyValue( sTreatAsNumberProperty, makeAny( false ) );
             xModelProps->setPropertyValue( PROPERTY_VERTICALALIGN,m_xReportComponent->getPropertyValue(PROPERTY_VERTICALALIGN));
         }
     }
@@ -1168,8 +1168,8 @@ void OOle2Obj::initializeChart( const uno::Reference< frame::XModel>& _xModel)
 
         ::comphelper::NamedValueCollection aArgs;
         aArgs.put( "CellRangeRepresentation", uno::makeAny( OUString( "all" ) ) );
-        aArgs.put( "HasCategories", uno::makeAny( sal_True ) );
-        aArgs.put( "FirstCellAsLabel", uno::makeAny( sal_True ) );
+        aArgs.put( "HasCategories", uno::makeAny( true ) );
+        aArgs.put( "FirstCellAsLabel", uno::makeAny( true ) );
         aArgs.put( "DataRowSource", uno::makeAny( chart::ChartDataRowSource_COLUMNS ) );
         xReceiver->setArguments( aArgs.getPropertyValues() );
 
diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx
index ee5a7f89c8f8..c738ca1e5b93 100644
--- a/reportdesign/source/filter/xml/xmlFunction.cxx
+++ b/reportdesign/source/filter/xml/xmlFunction.cxx
@@ -78,7 +78,7 @@ OXMLFunction::OXMLFunction( ORptFilter& _rImport
                     break;
                 case XML_TOK_INITIAL_FORMULA:
                     if ( !sValue.isEmpty() )
-                        m_xFunction->setInitialFormula(beans::Optional< OUString>(sal_True,ORptFilter::convertFormula(sValue)));
+                        m_xFunction->setInitialFormula(beans::Optional< OUString>(true,ORptFilter::convertFormula(sValue)));
                     break;
                 case XML_TOK_DEEP_TRAVERSING:
                     m_xFunction->setDeepTraversing(sValue == s_sTRUE);
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx
index c1d2d79a2036..eb99c842ae56 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -63,7 +63,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport
 
     const SvXMLNamespaceMap& rMap = _rImport.GetNamespaceMap();
     const SvXMLTokenMap& rTokenMap = _rImport.GetGroupElemTokenMap();
-    m_xGroup->setSortAscending(sal_False);// the default value has to be set
+    m_xGroup->setSortAscending(false);// the default value has to be set
     const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
     static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE);
     for(sal_Int16 i = 0; i < nLength; ++i)
@@ -212,7 +212,7 @@ SvXMLImportContext* OXMLGroup::CreateChildContext(
         case XML_TOK_GROUP_HEADER:
             {
                 rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
-                m_xGroup->setHeaderOn(sal_True);
+                m_xGroup->setHeaderOn(true);
                 pContext = new OXMLSection( rImport, nPrefix, rLocalName,xAttrList,m_xGroup->getHeader());
             }
             break;
@@ -231,7 +231,7 @@ SvXMLImportContext* OXMLGroup::CreateChildContext(
         case XML_TOK_GROUP_FOOTER:
             {
                 rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
-                m_xGroup->setFooterOn(sal_True);
+                m_xGroup->setFooterOn(true);
                 pContext = new OXMLSection( rImport, nPrefix, rLocalName,xAttrList,m_xGroup->getFooter());
             }
             break;
diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx
index abd74a66bd57..5d1410ce3e7f 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -280,7 +280,7 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const OUString& _sStyleName,
         {
             pAutoStyle->FillPropertySet(_xProp);
             if ( _bOld && _xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_CHARHIDDEN) )
-                _xProp->setPropertyValue(PROPERTY_CHARHIDDEN,uno::makeAny(sal_False));
+                _xProp->setPropertyValue(PROPERTY_CHARHIDDEN,uno::makeAny(false));
 
             uno::Reference<beans::XPropertySet> xProp = comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(pMap));
             pAutoStyle->FillPropertySet(xProp);
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index b173f7056067..bb2da0c9a6ed 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -113,7 +113,7 @@ void SAL_CALL ImportDocumentHandler::endDocument() throw (uno::RuntimeException,
         // this fills the chart again
         ::comphelper::NamedValueCollection aArgs;
         aArgs.put( "CellRangeRepresentation", OUString("all") );
-        aArgs.put( "FirstCellAsLabel", uno::makeAny( sal_True ) );
+        aArgs.put( "FirstCellAsLabel", uno::makeAny( true ) );
         aArgs.put( "DataRowSource", uno::makeAny( chart::ChartDataRowSource_COLUMNS ) );
 
         bool bHasCategories = false;
diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx
index abd6fbbf03b6..aaef945dde4f 100644
--- a/reportdesign/source/filter/xml/xmlReport.cxx
+++ b/reportdesign/source/filter/xml/xmlReport.cxx
@@ -151,14 +151,14 @@ SvXMLImportContext* OXMLReport::CreateChildContext(
         case XML_TOK_REPORT_HEADER:
             {
                 m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
-                m_xComponent->setReportHeaderOn(sal_True);
+                m_xComponent->setReportHeaderOn(true);
                 pContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList ,m_xComponent->getReportHeader());
             }
             break;
         case XML_TOK_PAGE_HEADER:
             {
                 m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
-                m_xComponent->setPageHeaderOn(sal_True);
+                m_xComponent->setPageHeaderOn(true);
                 pContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList ,m_xComponent->getPageHeader());
             }
             break;
@@ -175,14 +175,14 @@ SvXMLImportContext* OXMLReport::CreateChildContext(
         case XML_TOK_PAGE_FOOTER:
             {
                 m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
-                m_xComponent->setPageFooterOn(sal_True);
+                m_xComponent->setPageFooterOn(true);
                 pContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList ,m_xComponent->getPageFooter(),false);
             }
             break;
         case XML_TOK_REPORT_FOOTER:
             {
                 m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
-                m_xComponent->setReportFooterOn(sal_True);
+                m_xComponent->setReportFooterOn(true);
                 pContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList ,m_xComponent->getReportFooter());
             }
             break;
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 4ab047c39304..553dcb778024 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -537,7 +537,7 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
         }
         catch (const uno::Exception&)
         {
-            xProp->setPropertyValue(s_sOld,uno::makeAny(sal_True));
+            xProp->setPropertyValue(s_sOld,uno::makeAny(true));
         }
 
         if ( nRet == 0 )
@@ -588,7 +588,7 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
 
         if ( bRet )
         {
-            m_xReportDefinition->setModified(sal_False);
+            m_xReportDefinition->setModified(false);
         }
         else
         {
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx
index dc1300a3a626..3e2e1b7866f6 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -101,7 +101,7 @@ ODateTimeDialog::ODateTimeDialog( vcl::Window* _pParent
 
         const uno::Reference< util::XNumberFormatter> xNumberFormatter = m_pController->getReportNumberFormatter();
         const uno::Reference< util::XNumberFormats> xFormats = xNumberFormatter->getNumberFormatsSupplier()->getNumberFormats();
-        const uno::Sequence<sal_Int32> aFormatKeys = xFormats->queryKeys(_nNumberFormatId,m_nLocale,sal_True);
+        const uno::Sequence<sal_Int32> aFormatKeys = xFormats->queryKeys(_nNumberFormatId,m_nLocale,true);
         const sal_Int32* pIter = aFormatKeys.getConstArray();
         const sal_Int32* pEnd  = pIter + aFormatKeys.getLength();
         for(;pIter != pEnd;++pIter)
@@ -202,7 +202,7 @@ OUString ODateTimeDialog::getFormatStringByKey(::sal_Int32 _nNumberFormatKey,con
 
     uno::Reference< util::XNumberFormatPreviewer> xPreviewer(m_pController->getReportNumberFormatter(),uno::UNO_QUERY);
     OSL_ENSURE(xPreviewer.is(),"XNumberFormatPreviewer is null!");
-    return xPreviewer->convertNumberToPreviewString(sFormat,nValue,m_nLocale,sal_True);
+    return xPreviewer->convertNumberToPreviewString(sFormat,nValue,m_nLocale,true);
 }
 
 IMPL_LINK_TYPED( ODateTimeDialog, CBClickHdl, Button*, _pBox, void )
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 05babba1eae3..a659c3de334c 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -446,7 +446,7 @@ bool OFieldExpressionControl::SaveModified(bool _bAppendRow)
                 OUString sUndoAction(ModuleRes(RID_STR_UNDO_APPEND_GROUP));
                 m_pParent->m_pController->getUndoManager().EnterListAction( sUndoAction, OUString() );
                 xGroup = m_pParent->getGroups()->createGroup();
-                xGroup->setHeaderOn(sal_True);
+                xGroup->setHeaderOn(true);
 
                 uno::Sequence< beans::PropertyValue > aArgs(2);
                 aArgs[0].Name = PROPERTY_GROUP;
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index 9b00832ab396..054f249dc871 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -263,17 +263,17 @@ inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(co
     {
         case PROPERTY_ID_CHARTTYPE:
             aOut.PrimaryButtonId = UID_RPT_PROP_CHARTTYPE_DLG;
-            aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::TextField , sal_True);
-            aOut.HasPrimaryButton = sal_True;
+            aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::TextField , true);
+            aOut.HasPrimaryButton = true;
             break;
         case PROPERTY_ID_PREVIEW_COUNT:
-            aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::NumericField , sal_False);
+            aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::NumericField , false);
             break;
         case PROPERTY_ID_MASTERFIELDS:
         case PROPERTY_ID_DETAILFIELDS:
-            aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::StringListField , sal_False);
+            aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::StringListField , false);
             aOut.PrimaryButtonId = UID_RPT_PROP_DLG_LINKFIELDS;
-            aOut.HasPrimaryButton = sal_True;
+            aOut.HasPrimaryButton = true;
             break;
         default:
             aOut = m_xFormComponentHandler->describePropertyLine(PropertyName, _xControlFactory);
@@ -446,13 +446,13 @@ void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const OUString & Act
             // this fills the chart again
             ::comphelper::NamedValueCollection aArgs;
             aArgs.put( "CellRangeRepresentation", uno::makeAny( OUString( "all" ) ) );
-            aArgs.put( "HasCategories", uno::makeAny( sal_True ) );
-            aArgs.put( "FirstCellAsLabel", uno::makeAny( sal_True ) );
+            aArgs.put( "HasCategories", uno::makeAny( true ) );
+            aArgs.put( "FirstCellAsLabel", uno::makeAny( true ) );
             aArgs.put( "DataRowSource", uno::makeAny( chart::ChartDataRowSource_COLUMNS ) );
             uno::Reference< chart2::data::XDataReceiver > xReceiver(m_xChartModel,uno::UNO_QUERY_THROW);
             xReceiver->setArguments( aArgs.getPropertyValues() );
             if ( !bModified )
-                xReport->setModified(sal_False);
+                xReport->setModified(false);
         }
         m_xFormComponentHandler->actuatingPropertyChanged(ActuatingPropertyName, NewValue, OldValue, InspectorUI, FirstTimeInit);
     }
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index fd9830629360..3f6eda8e2975 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -777,19 +777,19 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
         case PROPERTY_ID_INITIALFORMULA:
         case PROPERTY_ID_FORMULA:
             aOut.PrimaryButtonId = UID_RPT_PROP_FORMULA;
-            aOut.HasPrimaryButton = sal_True;
-            aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::MultiLineTextField , sal_False);
+            aOut.HasPrimaryButton = true;
+            aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::MultiLineTextField , false);
             break;
         case PROPERTY_ID_CONDITIONALPRINTEXPRESSION:
             aOut.PrimaryButtonId = UID_RPT_PROP_FORMULA;
-            aOut.HasPrimaryButton = sal_True;
-            aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::MultiLineTextField , sal_False);
+            aOut.HasPrimaryButton = true;
+            aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::MultiLineTextField , false);
             break;
         case PROPERTY_ID_DATAFIELD:
             {
                 uno::Reference< inspection::XStringListControl > xListControl(
                     _xControlFactory->createPropertyControl(
-                        m_nDataFieldType == DATA_OR_FORMULA ? inspection::PropertyControlType::ComboBox : inspection::PropertyControlType::ListBox, sal_False
+                        m_nDataFieldType == DATA_OR_FORMULA ? inspection::PropertyControlType::ComboBox : inspection::PropertyControlType::ListBox, false
                     ),
                     uno::UNO_QUERY_THROW
                 );
@@ -797,7 +797,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
                 if ( m_nDataFieldType == DATA_OR_FORMULA )
                 {
                     aOut.PrimaryButtonId = UID_RPT_PROP_FORMULA;
-                    aOut.HasPrimaryButton = sal_True;
+                    aOut.HasPrimaryButton = true;
                 }
 
                 aOut.Control = xListControl.get();
@@ -820,17 +820,17 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
             break;
         case PROPERTY_ID_BACKCOLOR:
         case PROPERTY_ID_CONTROLBACKGROUND:
-            aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::ColorListBox, sal_False );
+            aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::ColorListBox, false );
             break;
         case PROPERTY_ID_FONT:
             aOut.PrimaryButtonId = UID_RPT_RPT_PROP_DLG_FONT_TYPE;
-            aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::TextField, sal_True );
-            aOut.HasPrimaryButton = sal_True;
+            aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::TextField, true );
+            aOut.HasPrimaryButton = true;
             break;
         case PROPERTY_ID_AREA:
             aOut.PrimaryButtonId = UID_RPT_RPT_PROP_DLG_AREA;
-            aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::TextField, sal_True );
-            aOut.HasPrimaryButton = sal_True;
+            aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::TextField, true );
+            aOut.HasPrimaryButton = true;
             break;
         case PROPERTY_ID_VERTICALALIGN:
             implCreateListLikeControl(_xControlFactory,aOut,RID_STR_VERTICAL_ALIGN_CONST,false,true);
@@ -868,7 +868,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
         uno::Reference< drawing::XShapeDescriptor> xShapeDesc(m_xReportComponent,uno::UNO_QUERY);
         bool bSetMin = !xShapeDesc.is() || xShapeDesc->getShapeType() != "com.sun.star.drawing.CustomShape";
         if ( bSetMin )
-            xNumericControl->setMinValue(beans::Optional<double>(sal_True,0.0));
+            xNumericControl->setMinValue(beans::Optional<double>(true,0.0));
         if ( nDisplayUnit != -1 )
             xNumericControl->setDisplayUnit( nDisplayUnit );
         uno::Reference< report::XReportComponent> xComp(m_xReportComponent,uno::UNO_QUERY);
@@ -886,13 +886,13 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
                     case PROPERTY_ID_POSITIONX:
                     case PROPERTY_ID_WIDTH:
                         if ( bSetMin )
-                            xNumericControl->setMinValue(beans::Optional<double>(sal_True,0.0));
-                        xNumericControl->setMaxValue(beans::Optional<double>(sal_True,double(aSize.Width - nLeftMargin - nRightMargin)));
+                            xNumericControl->setMinValue(beans::Optional<double>(true,0.0));
+                        xNumericControl->setMaxValue(beans::Optional<double>(true,double(aSize.Width - nLeftMargin - nRightMargin)));
                         if ( PROPERTY_ID_WIDTH == nId )
                         {
                             uno::Reference<report::XFixedLine> xFixedLine(m_xReportComponent,uno::UNO_QUERY);
                             if ( xFixedLine.is() && xFixedLine->getOrientation() == 1 ) // vertical
-                                xNumericControl->setMinValue(beans::Optional<double>(sal_True,0.08 ));
+                                xNumericControl->setMinValue(beans::Optional<double>(true,0.08 ));
                         }
                         break;
                     default:
@@ -912,7 +912,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
                     uno::Reference<drawing::XShape> xShape(xSection->getByIndex(i),uno::UNO_QUERY);
                     nHeight = ::std::max<sal_Int32>(nHeight,xShape->getPosition().Y + xShape->getSize().Height);
                 }
-                xNumericControl->setMinValue(beans::Optional<double>(sal_True,nHeight ));
+                xNumericControl->setMinValue(beans::Optional<double>(true,nHeight ));
             }
         }
     }
@@ -1477,29 +1477,29 @@ void SAL_CALL GeometryHandler::actuatingPropertyChanged(const OUString & Actuati
                 {
                     case DATA_OR_FORMULA:
                         _rxInspectorUI->rebuildPropertyUI(PROPERTY_DATAFIELD);
-                        _rxInspectorUI->enablePropertyUI(PROPERTY_DATAFIELD,sal_True);
-                        _rxInspectorUI->enablePropertyUI(PROPERTY_FORMULALIST,sal_False);
-                        _rxInspectorUI->enablePropertyUI(PROPERTY_SCOPE,sal_False);
+                        _rxInspectorUI->enablePropertyUI(PROPERTY_DATAFIELD,true);
+                        _rxInspectorUI->enablePropertyUI(PROPERTY_FORMULALIST,false);
+                        _rxInspectorUI->enablePropertyUI(PROPERTY_SCOPE,false);
                         OSL_ENSURE(m_sDefaultFunction.isEmpty(),"Why is the m_sDefaultFunction set?");
                         OSL_ENSURE(m_sScope.isEmpty(),"Why is the m_sScope set?");
                         break;
                     case FUNCTION:
                         _rxInspectorUI->rebuildPropertyUI(PROPERTY_DATAFIELD);
                         _rxInspectorUI->rebuildPropertyUI(PROPERTY_FORMULALIST);
-                        _rxInspectorUI->enablePropertyUI(PROPERTY_DATAFIELD,sal_True);
+                        _rxInspectorUI->enablePropertyUI(PROPERTY_DATAFIELD,true);
                         _rxInspectorUI->enablePropertyUI(PROPERTY_FORMULALIST,!m_sDefaultFunction.isEmpty());
                         _rxInspectorUI->enablePropertyUI(PROPERTY_SCOPE,!m_sScope.isEmpty());
                         break;
                     case USER_DEF_FUNCTION:
-                        _rxInspectorUI->enablePropertyUI(PROPERTY_DATAFIELD,sal_False);
-                        _rxInspectorUI->enablePropertyUI(PROPERTY_FORMULALIST,sal_True);
+                        _rxInspectorUI->enablePropertyUI(PROPERTY_DATAFIELD,false);
+                        _rxInspectorUI->enablePropertyUI(PROPERTY_FORMULALIST,true);
                         _rxInspectorUI->rebuildPropertyUI(PROPERTY_FORMULALIST);
-                        _rxInspectorUI->enablePropertyUI(PROPERTY_SCOPE,sal_False);
+                        _rxInspectorUI->enablePropertyUI(PROPERTY_SCOPE,false);
                         break;
                     case COUNTER:
-                        _rxInspectorUI->enablePropertyUI(PROPERTY_DATAFIELD,sal_False);
-                        _rxInspectorUI->enablePropertyUI(PROPERTY_FORMULALIST,sal_False);
-                        _rxInspectorUI->enablePropertyUI(PROPERTY_SCOPE,sal_True);
+                        _rxInspectorUI->enablePropertyUI(PROPERTY_DATAFIELD,false);
+                        _rxInspectorUI->enablePropertyUI(PROPERTY_FORMULALIST,false);
+                        _rxInspectorUI->enablePropertyUI(PROPERTY_SCOPE,true);
                         break;
                 }
             }
@@ -1893,7 +1893,7 @@ void GeometryHandler::loadDefaultFunctions()
         m_aCounterFunction.m_sName = ModuleRes(RID_STR_F_COUNTER);
         m_aCounterFunction.m_sFormula = "rpt:[%FunctionName] + 1";
         m_aCounterFunction.m_sSearchString = "rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*[:digit:]*";
-        m_aCounterFunction.m_sInitialFormula.IsPresent = sal_True;
+        m_aCounterFunction.m_sInitialFormula.IsPresent = true;
         m_aCounterFunction.m_sInitialFormula.Value = "rpt:1";
 
         DefaultFunction aDefault;
@@ -1904,21 +1904,21 @@ void GeometryHandler::loadDefaultFunctions()
         aDefault.m_sName = ModuleRes(RID_STR_F_ACCUMULATION);
         aDefault.m_sFormula = "rpt:[%Column] + [%FunctionName]";
         aDefault.m_sSearchString = "rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]";
-        aDefault.m_sInitialFormula.IsPresent = sal_True;
+        aDefault.m_sInitialFormula.IsPresent = true;
         aDefault.m_sInitialFormula.Value = "rpt:[%Column]";
         m_aDefaultFunctions.push_back(aDefault);
 
         aDefault.m_sName = ModuleRes(RID_STR_F_MINIMUM);
         aDefault.m_sFormula = "rpt:IF([%Column] < [%FunctionName];[%Column];[%FunctionName])";
         aDefault.m_sSearchString = "rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*<[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)";
-        aDefault.m_sInitialFormula.IsPresent = sal_True;
+        aDefault.m_sInitialFormula.IsPresent = true;
         aDefault.m_sInitialFormula.Value = "rpt:[%Column]";
         m_aDefaultFunctions.push_back(aDefault);
 
         aDefault.m_sName = ModuleRes(RID_STR_F_MAXIMUM);
         aDefault.m_sFormula = "rpt:IF([%Column] > [%FunctionName];[%Column];[%FunctionName])";
         aDefault.m_sSearchString = "rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*>[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)";
-        aDefault.m_sInitialFormula.IsPresent = sal_True;
+        aDefault.m_sInitialFormula.IsPresent = true;
         aDefault.m_sInitialFormula.Value = "rpt:[%Column]";
         m_aDefaultFunctions.push_back(aDefault);
     }
diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx
index 8f6157776a74..5318401923a9 100644
--- a/reportdesign/source/ui/misc/RptUndo.cxx
+++ b/reportdesign/source/ui/misc/RptUndo.cxx
@@ -295,7 +295,7 @@ void OGroupSectionUndo::implReInsert( )
     uno::Sequence< beans::PropertyValue > aArgs(2);
 
     aArgs[0].Name = SID_GROUPHEADER_WITHOUT_UNDO == m_nSlot? OUString(PROPERTY_HEADERON) : OUString(PROPERTY_FOOTERON);
-    aArgs[0].Value <<= sal_True;
+    aArgs[0].Value <<= true;
     aArgs[1].Name = PROPERTY_GROUP;
     aArgs[1].Value <<= m_aGroupHelper.getGroup();
     m_pController->executeChecked(m_nSlot,aArgs);
@@ -314,7 +314,7 @@ void OGroupSectionUndo::implReRemove( )
     uno::Sequence< beans::PropertyValue > aArgs(2);
 
     aArgs[0].Name = SID_GROUPHEADER_WITHOUT_UNDO == m_nSlot? OUString(PROPERTY_HEADERON) : OUString(PROPERTY_FOOTERON);
-    aArgs[0].Value <<= sal_False;
+    aArgs[0].Value <<= false;
     aArgs[1].Name = PROPERTY_GROUP;
     aArgs[1].Value <<= m_aGroupHelper.getGroup();
 
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index 96c3ad08cb48..c103c2056f8d 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -140,18 +140,18 @@ void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments
         }
         if ( m_aCommandURL == ".uno:CharFontName" )
         {
-            m_aStates.insert(TCommandState::value_type(OUString(".uno:CharFontName"),sal_True));
+            m_aStates.insert(TCommandState::value_type(OUString(".uno:CharFontName"),true));
             m_pToolbarController = new SvxFontNameToolBoxControl/*SvxStyleToolBoxControl*/(m_nSlotId = SID_ATTR_CHAR_FONT,m_nToolBoxId,*pToolBox);
         }
         else if ( m_aCommandURL == ".uno:FontColor" || m_aCommandURL == ".uno:Color" )
         {
-            m_aStates.insert(TCommandState::value_type(OUString(".uno:FontColor"),sal_True));
-            m_aStates.insert(TCommandState::value_type(OUString(".uno:Color"),sal_True));
+            m_aStates.insert(TCommandState::value_type(OUString(".uno:FontColor"),true));
+            m_aStates.insert(TCommandState::value_type(OUString(".uno:Color"),true));
             m_pToolbarController = new SvxColorToolBoxControl(m_nSlotId = SID_ATTR_CHAR_COLOR2,m_nToolBoxId,*pToolBox);
         }
         else
         {
-            m_aStates.insert(TCommandState::value_type(OUString(".uno:BackgroundColor"),sal_True));
+            m_aStates.insert(TCommandState::value_type(OUString(".uno:BackgroundColor"),true));
             m_pToolbarController = new SvxColorToolBoxControl(m_nSlotId = SID_BACKGROUND_COLOR,m_nToolBoxId,*pToolBox);
         }
 
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 4093850d4e5f..4da889d0d6fd 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -1598,7 +1598,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
         case SID_EDITDOC:
             if(isEditable())
             { // the state should be changed to not editable
-                setModified(sal_False);     // and we are not modified yet
+                setModified(false);     // and we are not modified yet
             }
             setEditable(!isEditable());
             InvalidateAll();
@@ -1726,7 +1726,7 @@ void OReportController::impl_initialize( )
             executeUnChecked(SID_SELECT_REPORT,aArgs);
         }
 
-        setModified(sal_False);     // and we are not modified yet
+        setModified(false);     // and we are not modified yet
 
         // open the global help agent
         // we need a Frame but at this time there is no frame, therefore we send a UserEvent
@@ -1789,16 +1789,16 @@ bool OReportController::Construct(vcl::Window* pParent)
 sal_Bool SAL_CALL OReportController::suspend(sal_Bool /*_bSuspend*/) throw( RuntimeException, std::exception )
 {
     if ( getBroadcastHelper().bInDispose || getBroadcastHelper().bDisposed )
-        return sal_True;
+        return true;
 
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getMutex() );
 
     if ( getView() && getView()->IsInModalMode() )
-        return sal_False;
+        return false;
 
     // this suspend will be handled in the DBAccess interceptor implementation
-    return sal_True;
+    return true;
 }
 
 void OReportController::describeSupportedFeatures()
@@ -2548,14 +2548,14 @@ sal_Bool SAL_CALL OReportController::attachModel(const uno::Reference< frame::XM
 
     uno::Reference< report::XReportDefinition > xReportDefinition( xModel, UNO_QUERY );
     if ( !xReportDefinition.is() )
-        return sal_False;
+        return false;
 
     uno::Reference< document::XUndoManagerSupplier > xTestSuppUndo( xModel, UNO_QUERY );
     if ( !xTestSuppUndo.is() )
-        return sal_False;
+        return false;
 
     m_xReportDefinition = xReportDefinition;
-    return sal_True;
+    return true;
 }
 
 
@@ -3005,7 +3005,7 @@ uno::Reference< sdbc::XRowSet > OReportController::getRowSet()
         uno::Reference< beans::XPropertySet> xRowSetProp( xRowSet, uno::UNO_QUERY_THROW );
 
         xRowSetProp->setPropertyValue( PROPERTY_ACTIVECONNECTION, uno::makeAny( getConnection() ) );
-        xRowSetProp->setPropertyValue( PROPERTY_APPLYFILTER, uno::makeAny( sal_True ) );
+        xRowSetProp->setPropertyValue( PROPERTY_APPLYFILTER, uno::makeAny( true ) );
 
         std::shared_ptr<AnyConverter> aNoConverter(new AnyConverter());
         TPropertyNamePair aPropertyMediation;
@@ -3037,7 +3037,7 @@ void OReportController::insertGraphic()
 
         uno::Reference< ui::dialogs::XFilePickerControlAccess > xController(aDialog.GetFilePicker(), UNO_QUERY_THROW);
         xController->setValue(ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0, css::uno::Any(true));
-        xController->enableControl(ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK, sal_False/*sal_True*/);
+        xController->enableControl(ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK, false/*sal_True*/);
         xController->setValue( ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, css::uno::Any(true) );
 
         if ( ERRCODE_NONE == aDialog.Execute() )
@@ -4274,7 +4274,7 @@ void SAL_CALL OReportController::setVisualAreaSize( ::sal_Int64 _nAspect, const
              m_aVisualAreaSize.Height != _aSize.Height);
         m_aVisualAreaSize = _aSize;
         if( bChanged )
-            setModified( sal_True );
+            setModified( true );
     m_nAspect = _nAspect;
 }
 
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index 7e78e3335698..9619f11c25e8 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -174,7 +174,7 @@ bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt )
             {
                 uno::Sequence<beans::PropertyValue> aArgs(1);
                 aArgs[0].Name = "ShowProperties";
-                aArgs[0].Value <<= sal_True;
+                aArgs[0].Value <<= true;
                 m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->getController().executeUnChecked(SID_SHOW_PROPERTYBROWSER,aArgs);
                 m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->UpdatePropertyBrowserDelayed(m_rView);
                 // TODO character in shapes
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index bd4bcf6312c4..acb161f75798 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -170,7 +170,7 @@ PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, vcl::Window* pPare
         m_xBrowserComponentWindow->setPosSize(0, 0, aPropWinSize.Width(), aPropWinSize.Height(),
             awt::PosSize::WIDTH | awt::PosSize::HEIGHT | awt::PosSize::X | awt::PosSize::Y);
         Resize();
-        m_xBrowserComponentWindow->setVisible(sal_True);
+        m_xBrowserComponentWindow->setVisible(true);
     }
     ::rptui::notifySystemWindow(pParent,this,::comphelper::mem_fun(&TaskPaneList::AddWindow));
 }
@@ -258,7 +258,7 @@ bool PropBrw::Close()
         try
         {
             Reference< XController > xController( m_xMeAsFrame->getController() );
-            if ( xController.is() && !xController->suspend( sal_True ) )
+            if ( xController.is() && !xController->suspend( true ) )
                 return false;
         }
         catch( const Exception& )