loplugin:salbool: Automatic rewrite of sal_False/True

Change-Id: I5896c6b8bf2aa9c7c66ca5f7c50cee1b0738ea0a

43 files changed, 166 insertions, 166 deletions

diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx
index 03a07458e56e..9feded25e6e1 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -168,7 +168,7 @@ Reference< drawing::XShape > SchXMLAxisContext::getTitleShape()
             SAL_INFO("xmloff.chart", "Invalid axis" );
             break;
     }
-    xDiaProp->setPropertyValue( aPropName, uno::makeAny(sal_True) );
+    xDiaProp->setPropertyValue( aPropName, uno::makeAny(true) );
     xResult.set( xAxis->getAxisTitle(), uno::UNO_QUERY );
     return xResult;
 }
@@ -205,7 +205,7 @@ void SchXMLAxisContext::CreateGrid( const OUString& sAutoStyleName, bool bIsMajo
             SAL_INFO("xmloff.chart", "Invalid axis" );
             break;
     }
-    xDiaProp->setPropertyValue( aPropName, uno::makeAny(sal_True) );
+    xDiaProp->setPropertyValue( aPropName, uno::makeAny(true) );
 
     Reference< beans::XPropertySet > xGridProp;
     if( bIsMajor )
@@ -412,7 +412,7 @@ void SchXMLAxisContext::CreateAxis()
     }
     try
     {
-        xDiaProp->setPropertyValue( aPropName, uno::makeAny(sal_True) );
+        xDiaProp->setPropertyValue( aPropName, uno::makeAny(true) );
     }
     catch( beans::UnknownPropertyException & )
     {
@@ -439,7 +439,7 @@ void SchXMLAxisContext::CreateAxis()
     {
         try
         {
-            xDiaProp->setPropertyValue("HasXAxis", uno::makeAny(sal_True) );
+            xDiaProp->setPropertyValue("HasXAxis", uno::makeAny(true) );
         }
         catch( beans::UnknownPropertyException & )
         {
@@ -450,8 +450,8 @@ void SchXMLAxisContext::CreateAxis()
     // set properties
     if( m_xAxisProps.is())
     {
-        uno::Any aTrueBool( uno::makeAny( sal_True ));
-        uno::Any aFalseBool( uno::makeAny( sal_False ));
+        uno::Any aTrueBool( uno::makeAny( true ));
+        uno::Any aFalseBool( uno::makeAny( false ));
 
         // #i109879# the line color is black as default, in the model it is a light gray
         m_xAxisProps->setPropertyValue("LineColor",
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index abc91100c06d..2c6c6bd7823c 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -354,7 +354,7 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut
             {
                 xDocProp->getPropertyValue("BaseDiagram") >>= aOldChartTypeName;
                 maChartTypeServiceName =  SchXMLTools::GetNewChartTypeName( aOldChartTypeName );
-                xDocProp->setPropertyValue("RefreshAddInAllowed", uno::makeAny( sal_False) );
+                xDocProp->setPropertyValue("RefreshAddInAllowed", uno::makeAny( false) );
             }
             catch(const uno::Exception&)
             {
@@ -663,7 +663,7 @@ static void lcl_ApplyDataFromRectangularRangeToDiagram(
         beans::PropertyState_DIRECT_VALUE );
     aArgs[ sal::static_int_cast<sal_uInt32>(aArgs.getLength()) - 1 ] = beans::PropertyValue(
         OUString("UseCategoriesAsX"),
-        -1, uno::makeAny( sal_False ),//categories in ODF files are not to be used as x values (independent from what is offered in our ui)
+        -1, uno::makeAny( false ),//categories in ODF files are not to be used as x values (independent from what is offered in our ui)
         beans::PropertyState_DIRECT_VALUE );
 
     xNewDia->setDiagramData( xDataSource, aArgs );
@@ -762,7 +762,7 @@ void SchXMLChartContext::EndElement()
     }
     else if( bHasOwnData )
     {
-        xNewDoc->createInternalDataProvider( sal_False /* bCloneExistingData */ );
+        xNewDoc->createInternalDataProvider( false /* bCloneExistingData */ );
     }
     if( bHasOwnData )
         msChartAddress = "all";
@@ -815,7 +815,7 @@ void SchXMLChartContext::EndElement()
                     msChartAddress = "all";
                     if( !xNewDoc->hasInternalDataProvider() )
                     {
-                        xNewDoc->createInternalDataProvider( sal_False /* bCloneExistingData */ );
+                        xNewDoc->createInternalDataProvider( false /* bCloneExistingData */ );
                         SchXMLTableHelper::applyTableToInternalDataProvider( maTable, xNewDoc );
                         try
                         {
@@ -904,7 +904,7 @@ void SchXMLChartContext::EndElement()
     }
 
     if( xProp.is())
-        xProp->setPropertyValue("RefreshAddInAllowed", uno::makeAny( sal_True) );
+        xProp->setPropertyValue("RefreshAddInAllowed", uno::makeAny( true) );
 }
 
 void SchXMLChartContext::MergeSeriesForStockChart()
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 443425d087e8..3b903be7c28b 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -642,7 +642,7 @@ void SAL_CALL SchXMLImport::setTargetDocument( const uno::Reference< lang::XComp
 //             else we have no parent => we have our own data
 
             if( bHasOwnData && ! xChartDoc->hasInternalDataProvider() )
-                xChartDoc->createInternalDataProvider( sal_False );
+                xChartDoc->createInternalDataProvider( false );
         }
     }
     catch( const uno::Exception & rEx )
diff --git a/xmloff/source/chart/SchXMLLegendContext.cxx b/xmloff/source/chart/SchXMLLegendContext.cxx
index 1e84331aea97..04d06c067c53 100644
--- a/xmloff/source/chart/SchXMLLegendContext.cxx
+++ b/xmloff/source/chart/SchXMLLegendContext.cxx
@@ -95,7 +95,7 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu
     {
         try
         {
-            xDocProp->setPropertyValue("HasLegend", uno::makeAny( sal_True ) );
+            xDocProp->setPropertyValue("HasLegend", uno::makeAny( true ) );
         }
         catch(const beans::UnknownPropertyException&)
         {
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index af2e117564db..c77d0f778540 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -1152,8 +1152,8 @@ void SchXMLStatisticsObjectContext::StartElement( const uno::Reference< xml::sax
                     xBarProp->setPropertyValue("PositiveError",uno::makeAny(static_cast<double>(0.0)));
                     xBarProp->setPropertyValue("NegativeError",uno::makeAny(static_cast<double>(0.0)));
                     xBarProp->setPropertyValue("Weight",uno::makeAny(static_cast<double>(1.0)));
-                    xBarProp->setPropertyValue("ShowPositiveError",uno::makeAny(sal_True));
-                    xBarProp->setPropertyValue("ShowNegativeError",uno::makeAny(sal_True));
+                    xBarProp->setPropertyValue("ShowPositiveError",uno::makeAny(true));
+                    xBarProp->setPropertyValue("ShowNegativeError",uno::makeAny(true));
 
                     // first import defaults from parent style
                     SetErrorBarStyleProperties( maSeriesStyleName, xBarProp, mrImportHelper );
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 3be3a2218117..5c1c9f18d41e 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -1065,7 +1065,7 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri
                 {
                     //need to set this explicitly here for old files as the new api does not support this property fully anymore
                     if( bSwitchOffLinesForScatter )
-                        xPointProp->setPropertyValue("Lines",uno::makeAny(sal_False));
+                        xPointProp->setPropertyValue("Lines",uno::makeAny(false));
                 }
                 catch( const uno::Exception & )
                 {
@@ -1114,7 +1114,7 @@ void SchXMLSeries2Context::switchSeriesLinesOff( ::std::list< DataRowPointStyle
             if( !xSeries.is() )
                 continue;
 
-            xSeries->setPropertyValue("Lines",uno::makeAny(sal_False));
+            xSeries->setPropertyValue("Lines",uno::makeAny(false));
         }
         catch( uno::Exception &  )
         {
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index d3403d35a7ee..1d07bfe19ba6 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -823,8 +823,8 @@ void SchXMLTableHelper::applyTableToInternalDataProvider(
         try
         {
             Reference< beans::XPropertySet > xProps( xChartDoc, uno::UNO_QUERY_THROW );
-            xProps->setPropertyValue( "DisableDataTableDialog", uno::makeAny( sal_True ) );
-            xProps->setPropertyValue( "DisableComplexChartTypes", uno::makeAny( sal_True ) );
+            xProps->setPropertyValue( "DisableDataTableDialog", uno::makeAny( true ) );
+            xProps->setPropertyValue( "DisableComplexChartTypes", uno::makeAny( true ) );
         }
         catch ( uno::Exception& )
         {
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index 619758ff5d11..2618566014d1 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -407,7 +407,7 @@ Reference< chart2::data::XDataSequence > CreateDataSequence(
     if( !xRet.is() && !xChartDoc->hasInternalDataProvider() && !rRange.isEmpty() )
     {
         //#i103911# switch to internal data in case the parent cannot provide the requested data
-        xChartDoc->createInternalDataProvider( sal_True /* bCloneExistingData */ );
+        xChartDoc->createInternalDataProvider( true /* bCloneExistingData */ );
         xDataProvider = xChartDoc->getDataProvider();
         try
         {
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index 59917ab77a06..38f8e4f3c611 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -644,7 +644,7 @@ void XMLConfigItemContext::ManipulateConfigItem()
 
             OUString aURL;
             mrAny >>= aURL;
-            aURL = xStringSubsitution->substituteVariables( aURL, sal_False );
+            aURL = xStringSubsitution->substituteVariables( aURL, false );
             mrAny <<= aURL;
         }
         catch( uno::Exception& )
diff --git a/xmloff/source/core/PropertySetMerger.cxx b/xmloff/source/core/PropertySetMerger.cxx
index 62a6cd50ff8c..dd32897722c9 100644
--- a/xmloff/source/core/PropertySetMerger.cxx
+++ b/xmloff/source/core/PropertySetMerger.cxx
@@ -238,7 +238,7 @@ Property SAL_CALL PropertySetMergerImpl::getPropertyByName( const OUString& aNam
 sal_Bool SAL_CALL PropertySetMergerImpl::hasPropertyByName( const OUString& Name ) throw(RuntimeException, std::exception)
 {
     if(mxPropSet1Info->hasPropertyByName( Name ) )
-        return sal_True;
+        return true;
 
     return mxPropSet2Info->hasPropertyByName( Name );
 }
diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
index edd01eecd0af..d853006362aa 100644
--- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
@@ -308,7 +308,7 @@ void XMLEmbeddedObjectImportContext::EndElement()
     {
         Reference < XModifiable2 > xModifiable2( xComp, UNO_QUERY_THROW );
         xModifiable2->enableSetModified();
-        xModifiable2->setModified( sal_True ); // trigger new replacement image generation
+        xModifiable2->setModified( true ); // trigger new replacement image generation
     }
     catch( Exception& )
     {
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 44cfd31a4048..807e55a4de33 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -792,7 +792,7 @@ sal_Bool SAL_CALL SvXMLExport::filter( const uno::Sequence< beans::PropertyValue
 {
     // check for xHandler first... should have been supplied in initialize
     if( !mxHandler.is() )
-        return sal_False;
+        return false;
 
     try
     {
@@ -814,12 +814,12 @@ sal_Bool SAL_CALL SvXMLExport::filter( const uno::Sequence< beans::PropertyValue
                 if ( rPropName == "FileName" )
                 {
                     if( !(rValue >>= msOrigFileName ) )
-                        return sal_False;
+                        return false;
                 }
                 else if ( rPropName == "FilterName" )
                 {
                     if( !(rValue >>= msFilterName ) )
-                        return sal_False;
+                        return false;
                 }
             }
         }
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index d8358a7bf1a5..7034d75850cf 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -956,7 +956,7 @@ void SAL_CALL SvXMLImport::setTargetDocument( const uno::Reference< lang::XCompo
 sal_Bool SAL_CALL SvXMLImport::filter( const uno::Sequence< beans::PropertyValue >& )
     throw (uno::RuntimeException, std::exception)
 {
-    return sal_False;
+    return false;
 }
 
 void SAL_CALL SvXMLImport::cancel(  )
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index a5951129936d..f6cb2e759919 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -1385,7 +1385,7 @@ void AnimationNodeContext::postProcessRootNode( SvXMLImport& /*rImport*/, const
                             Reference< XCommand > xCommand( xChildNode, UNO_QUERY_THROW );
                             if( xCommand->getCommand() == EffectCommands::STOPAUDIO )
                             {
-                                xPageProps->setPropertyValue("Sound", Any(sal_True) );
+                                xPageProps->setPropertyValue("Sound", Any(true) );
                             }
                         }
                         break;
@@ -1400,7 +1400,7 @@ void AnimationNodeContext::postProcessRootNode( SvXMLImport& /*rImport*/, const
 
                                 Timing eTiming;
                                 if( (xAudio->getRepeatCount() >>= eTiming) && (eTiming == Timing_INDEFINITE) )
-                                    xPageProps->setPropertyValue("LoopSound", Any( sal_True ) );
+                                    xPageProps->setPropertyValue("LoopSound", Any( true ) );
                             }
                         }
                         break;
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 392dcf0d656b..4577f7256e56 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -3126,7 +3126,7 @@ static void lcl_CopyStream(
             uno::makeAny(rMimeType));
         xStreamProps->setPropertyValue( // turn off compression
             "Compressed",
-            uno::makeAny(sal_False));
+            uno::makeAny(false));
     }
     ::comphelper::OStorageHelper::CopyInputToOutput(xInStream, xOutStream);
     xOutStream->closeOutput();
diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx
index 586539f92505..418ba8919f1a 100644
--- a/xmloff/source/draw/ximpbody.cxx
+++ b/xmloff/source/draw/ximpbody.cxx
@@ -294,7 +294,7 @@ void SdXMLDrawPageContext::EndElement()
         {
             const OUString sFlushCustomShapeUnoApiObjects("FlushCustomShapeUnoApiObjects");
             uno::Any aAny;
-            aAny <<= sal_True;
+            aAny <<= true;
             xPropSet->setPropertyValue(sFlushCustomShapeUnoApiObjects, aAny);
         }
     }
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index 15758d6ec517..742b764a2e1c 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -183,8 +183,8 @@ void DrawAnnotationContext::EndElement()
     {
         // delete addition newline
         const OUString aEmpty;
-        mxCursor->gotoEnd( sal_False );
-        mxCursor->goLeft( 1, sal_True );
+        mxCursor->gotoEnd( false );
+        mxCursor->goLeft( 1, true );
         mxCursor->setString( aEmpty );
 
         // reset cursor
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 45f1e5cff4fb..fd684a60326a 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -264,12 +264,12 @@ void SdXMLShapeContext::addGluePoint( const uno::Reference< xml::sax::XAttribute
     }
 
     drawing::GluePoint2 aGluePoint;
-    aGluePoint.IsUserDefined = sal_True;
+    aGluePoint.IsUserDefined = true;
     aGluePoint.Position.X = 0;
     aGluePoint.Position.Y = 0;
     aGluePoint.Escape = drawing::EscapeDirection_SMART;
     aGluePoint.PositionAlignment = drawing::Alignment_CENTER;
-    aGluePoint.IsRelative = sal_True;
+    aGluePoint.IsRelative = true;
 
     sal_Int32 nId = -1;
 
@@ -307,7 +307,7 @@ void SdXMLShapeContext::addGluePoint( const uno::Reference< xml::sax::XAttribute
                 if( SvXMLUnitConverter::convertEnum( eKind, sValue, aXML_GlueAlignment_EnumMap ) )
                 {
                     aGluePoint.PositionAlignment = (drawing::Alignment)eKind;
-                    aGluePoint.IsRelative = sal_False;
+                    aGluePoint.IsRelative = false;
                 }
             }
             else if( IsXMLToken( aLocalName, XML_ESCAPE_DIRECTION ) )
@@ -346,8 +346,8 @@ void SdXMLShapeContext::EndElement()
     {
         // delete addition newline
         const OUString aEmpty;
-        mxCursor->gotoEnd( sal_False );
-        mxCursor->goLeft( 1, sal_True );
+        mxCursor->gotoEnd( false );
+        mxCursor->goLeft( 1, true );
         mxCursor->setString( aEmpty );
 
         // reset cursor
@@ -437,10 +437,10 @@ void SdXMLShapeContext::AddShape(uno::Reference< drawing::XShape >& xShape)
         {
             uno::Reference< beans::XPropertySet > xSet( xShape, uno::UNO_QUERY_THROW );
             if( !mbVisible )
-                xSet->setPropertyValue("Visible", uno::Any( sal_False ) );
+                xSet->setPropertyValue("Visible", uno::Any( false ) );
 
             if( !mbPrintable )
-                xSet->setPropertyValue("Printable", uno::Any( sal_False ) );
+                xSet->setPropertyValue("Printable", uno::Any( false ) );
         }
         catch(const Exception&)
         {
@@ -2201,7 +2201,7 @@ void SdXMLMeasureShapeContext::EndElement()
 
         const OUString aEmpty;
         xCursor->collapseToStart();
-        xCursor->goRight( 1, sal_True );
+        xCursor->goRight( 1, true );
         xCursor->setString( aEmpty );
     }
     while(false);
@@ -2338,7 +2338,7 @@ void SdXMLCaptionShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
             aAny >>= bIsAutoGrowWidth;
 
             if ( bIsAutoGrowWidth )
-                xProps->setPropertyValue("TextAutoGrowWidth", uno::makeAny( sal_False ) );
+                xProps->setPropertyValue("TextAutoGrowWidth", uno::makeAny( false ) );
         }
 
         // set pos, size, shear and rotate
@@ -2347,7 +2347,7 @@ void SdXMLCaptionShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
             xProps->setPropertyValue("CaptionPoint", uno::makeAny( maCaptionPoint ) );
 
         if ( bIsAutoGrowWidth )
-            xProps->setPropertyValue("TextAutoGrowWidth", uno::makeAny( sal_True ) );
+            xProps->setPropertyValue("TextAutoGrowWidth", uno::makeAny( true ) );
 
         if(mnRadius)
         {
@@ -3847,7 +3847,7 @@ void SdXMLCustomShapeContext::EndElement()
 
             pItem->Name = sName;
             pItem->Handle = -1;
-            pItem->Value <<= sal_True;
+            pItem->Value <<= true;
             pItem->State = beans::PropertyState_DIRECT_VALUE;
         }
     }
@@ -4044,7 +4044,7 @@ void SdXMLTableShapeContext::processAttribute( sal_uInt16 nPrefix, const OUStrin
                 if( IsXMLToken( rLocalName, pEntry->meXMLName ) )
                 {
                     if( IsXMLToken( rValue, XML_TRUE ) )
-                        maTemplateStylesUsed[i] = sal_True;
+                        maTemplateStylesUsed[i] = true;
                     break;
                 }
                 pEntry++;
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index d6ecb786a74d..81eed72ec73b 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -2182,7 +2182,7 @@ namespace xmloff
             };
             static const sal_Bool nEnumPropertyAttrDefaultFlags[] =
             {
-                sal_False, sal_False, sal_False, sal_False, sal_True
+                false, false, false, false, true
             };
             static const sal_Int32 nIdCount = SAL_N_ELEMENTS(eEnumPropertyIds);
         #if OSL_DEBUG_LEVEL > 0
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index acf5c3ea5cc3..85b0b97eeb4b 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -1522,8 +1522,8 @@ namespace xmloff
         {
             // delete the newline which has been imported erroneously
             // TODO (fs): stole this code somewhere - why don't we fix the text import??
-            m_xCursor->gotoEnd( sal_False );
-            m_xCursor->goLeft( 1, sal_True );
+            m_xCursor->gotoEnd( false );
+            m_xCursor->goLeft( 1, true );
             m_xCursor->setString( OUString() );
 
             // reset cursor
diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx
index c5b1c7d8c5d9..601aec111066 100644
--- a/xmloff/source/forms/gridcolumnproptranslator.cxx
+++ b/xmloff/source/forms/gridcolumnproptranslator.cxx
@@ -171,10 +171,10 @@ namespace xmloff
         sal_Bool SAL_CALL OMergedPropertySetInfo::hasPropertyByName( const OUString& Name ) throw (RuntimeException, std::exception)
         {
             if ( Name == getParaAlignProperty() )
-                return sal_True;
+                return true;
 
             if ( !m_xMasterInfo.is() )
-                return sal_False;
+                return false;
 
             return m_xMasterInfo->hasPropertyByName( Name );
         }
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index bd689f750712..3a27f9da6c0f 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -689,7 +689,7 @@ namespace xmloff
             }
 
             // check if our own formats collection already knows the format
-            nOwnFormatKey = m_xControlNumberFormats->queryKey(sFormatDescription, aFormatLocale, sal_False);
+            nOwnFormatKey = m_xControlNumberFormats->queryKey(sFormatDescription, aFormatLocale, false);
             if (-1 == nOwnFormatKey)
             {   // no, we don't
                 // -> create a new format
diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx b/xmloff/source/style/PageMasterImportPropMapper.cxx
index c6078c0b4d78..ebab21f51624 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.cxx
@@ -313,28 +313,28 @@ void PageMasterImportPropertyMapper::finished(std::vector< XMLPropertyState >& r
 
     if (pHeaderHeight)
     {
-        sal_Bool bValue(sal_False);
+        sal_Bool bValue(false);
         uno::Any aAny;
         aAny.setValue( &bValue, cppu::UnoType<bool>::get() );
         xHeaderDynamic.reset(new XMLPropertyState(pHeaderHeight->mnIndex + 2, aAny));
     }
     if (pHeaderMinHeight)
     {
-        sal_Bool bValue(sal_True);
+        sal_Bool bValue(true);
         uno::Any aAny;
         aAny.setValue( &bValue, cppu::UnoType<bool>::get() );
         xHeaderDynamic.reset(new XMLPropertyState(pHeaderMinHeight->mnIndex + 1, aAny));
     }
     if (pFooterHeight)
     {
-        sal_Bool bValue(sal_False);
+        sal_Bool bValue(false);
         uno::Any aAny;
         aAny.setValue( &bValue, cppu::UnoType<bool>::get() );
         xFooterDynamic.reset(new XMLPropertyState(pFooterHeight->mnIndex + 2, aAny));
     }
     if (pFooterMinHeight)
     {
-        sal_Bool bValue(sal_True);
+        sal_Bool bValue(true);
         uno::Any aAny;
         aAny.setValue( &bValue, cppu::UnoType<bool>::get() );
         xFooterDynamic.reset(new XMLPropertyState(pFooterMinHeight->mnIndex + 1, aAny));
diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx
index c7ead92ee288..6020dcdce3b2 100644
--- a/xmloff/source/style/xmlbahdl.cxx
+++ b/xmloff/source/style/xmlbahdl.cxx
@@ -223,7 +223,7 @@ bool XMLBoolFalsePropHdl::importXML( const OUString&, Any&, const SvXMLUnitConve
 
 bool XMLBoolFalsePropHdl::exportXML( OUString& rStrExpValue, const Any& /*rValue*/, const SvXMLUnitConverter& rCnv) const
 {
-    return XMLBoolPropHdl::exportXML( rStrExpValue, makeAny( sal_False ), rCnv );
+    return XMLBoolPropHdl::exportXML( rStrExpValue, makeAny( false ), rCnv );
 }
 
 // class XMLBoolPropHdl
diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx
index f1f1c4b29669..69899159862b 100644
--- a/xmloff/source/table/XMLTableImport.cxx
+++ b/xmloff/source/table/XMLTableImport.cxx
@@ -661,8 +661,8 @@ void XMLCellImportContext::EndElement()
     {
         // delete addition newline
         const OUString aEmpty;
-        mxCursor->gotoEnd( sal_False );
-        mxCursor->goLeft( 1, sal_True );
+        mxCursor->gotoEnd( false );
+        mxCursor->goLeft( 1, true );
         mxCursor->setString( aEmpty );
 
         // reset cursor
diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
index 19e15810f37c..5adef3de47ee 100644
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
@@ -158,7 +158,7 @@ SvXMLImportContext *XMLIndexBibliographyConfigurationContext::CreateChildContext
     const Reference<XAttributeList> & xAttrList )
 {
     OUString sKey;
-    sal_Bool bSort(sal_True);
+    sal_Bool bSort(true);
 
     // process children here and use default context!
     if ( ( nPrefix == XML_NAMESPACE_TEXT ) &&
diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx
index 9ed5e223c363..6dbe66af19fe 100644
--- a/xmloff/source/text/XMLIndexTOCContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCContext.cxx
@@ -131,7 +131,7 @@ void XMLIndexTOCContext::StartElement(
         // find text:protected and set value
         // find text:name and set value (if not empty)
         sal_Int16 nCount = xAttrList->getLength();
-        sal_Bool bProtected = sal_False;
+        sal_Bool bProtected = false;
         OUString sIndexName;
         OUString sXmlId;
         XMLPropStyleContext* pStyle(nullptr);
@@ -226,7 +226,7 @@ void XMLIndexTOCContext::StartElement(
 
                 // b) insert marker and move cursor
                 rImport->InsertString(sMarker);
-                rImport->GetCursor()->goLeft(2, sal_False);
+                rImport->GetCursor()->goLeft(2, false);
             }
         }
 
@@ -262,19 +262,19 @@ void XMLIndexTOCContext::EndElement()
         rtl::Reference<XMLTextImportHelper> rHelper= GetImport().GetTextImport();
 
         // get rid of last paragraph (unless it's the only paragraph)
-        rHelper->GetCursor()->goRight(1, sal_False);
+        rHelper->GetCursor()->goRight(1, false);
         if( xBodyContextRef.Is() &&
             static_cast<XMLIndexBodyContext*>(&xBodyContextRef)->HasContent() )
         {
-            rHelper->GetCursor()->goLeft(1, sal_True);
+            rHelper->GetCursor()->goLeft(1, true);
             rHelper->GetText()->insertString(rHelper->GetCursorAsRange(),
-                                             "", sal_True);
+                                             "", true);
         }
 
         // and delete second marker
-        rHelper->GetCursor()->goRight(1, sal_True);
+        rHelper->GetCursor()->goRight(1, true);
         rHelper->GetText()->insertString(rHelper->GetCursorAsRange(),
-                                         "", sal_True);
+                                         "", true);
 
         // check for Redlines on our end node
         GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(false);
diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx
index e52d562cce6c..d34f4035ddcd 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.cxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.cxx
@@ -354,26 +354,26 @@ const sal_Char* aLevelStylePropNameTOCMap[] =
 
 const sal_Bool aAllowedTokenTypesTOC[] =
 {
-    sal_True,       // XML_TOK_INDEX_TYPE_ENTRY_TEXT =
-    sal_True,       // XML_TOK_INDEX_TYPE_TAB_STOP,
-    sal_True,       // XML_TOK_INDEX_TYPE_TEXT,
-    sal_True,       // XML_TOK_INDEX_TYPE_PAGE_NUMBER,
-    sal_True,       // XML_TOK_INDEX_TYPE_CHAPTER,
-    sal_True,       // XML_TOK_INDEX_TYPE_LINK_START,
-    sal_True,       // XML_TOK_INDEX_TYPE_LINK_END,
-    sal_False       // XML_TOK_INDEX_TYPE_BIBLIOGRAPHY
+    true,       // XML_TOK_INDEX_TYPE_ENTRY_TEXT =
+    true,       // XML_TOK_INDEX_TYPE_TAB_STOP,
+    true,       // XML_TOK_INDEX_TYPE_TEXT,
+    true,       // XML_TOK_INDEX_TYPE_PAGE_NUMBER,
+    true,       // XML_TOK_INDEX_TYPE_CHAPTER,
+    true,       // XML_TOK_INDEX_TYPE_LINK_START,
+    true,       // XML_TOK_INDEX_TYPE_LINK_END,
+    false       // XML_TOK_INDEX_TYPE_BIBLIOGRAPHY
 };
 
 const sal_Bool aAllowedTokenTypesUser[] =
 {
-    sal_True,       // XML_TOK_INDEX_TYPE_ENTRY_TEXT =
-    sal_True,       // XML_TOK_INDEX_TYPE_TAB_STOP,
-    sal_True,       // XML_TOK_INDEX_TYPE_TEXT,
-    sal_True,       // XML_TOK_INDEX_TYPE_PAGE_NUMBER,
-    sal_True,       // XML_TOK_INDEX_TYPE_CHAPTER,
-    sal_False,      // XML_TOK_INDEX_TYPE_LINK_START,
-    sal_False,      // XML_TOK_INDEX_TYPE_LINK_END,
-    sal_False       // XML_TOK_INDEX_TYPE_BIBLIOGRAPHY
+    true,       // XML_TOK_INDEX_TYPE_ENTRY_TEXT =
+    true,       // XML_TOK_INDEX_TYPE_TAB_STOP,
+    true,       // XML_TOK_INDEX_TYPE_TEXT,
+    true,       // XML_TOK_INDEX_TYPE_PAGE_NUMBER,
+    true,       // XML_TOK_INDEX_TYPE_CHAPTER,
+    false,      // XML_TOK_INDEX_TYPE_LINK_START,
+    false,      // XML_TOK_INDEX_TYPE_LINK_END,
+    false       // XML_TOK_INDEX_TYPE_BIBLIOGRAPHY
 };
 
 
@@ -394,14 +394,14 @@ const sal_Char* aLevelStylePropNameAlphaMap[] =
 
 const sal_Bool aAllowedTokenTypesAlpha[] =
 {
-    sal_True,       // XML_TOK_INDEX_TYPE_ENTRY_TEXT =
-    sal_True,       // XML_TOK_INDEX_TYPE_TAB_STOP,
-    sal_True,       // XML_TOK_INDEX_TYPE_TEXT,
-    sal_True,       // XML_TOK_INDEX_TYPE_PAGE_NUMBER,
-    sal_True,       // XML_TOK_INDEX_TYPE_CHAPTER,
-    sal_False,      // XML_TOK_INDEX_TYPE_LINK_START,
-    sal_False,      // XML_TOK_INDEX_TYPE_LINK_END,
-    sal_False       // XML_TOK_INDEX_TYPE_BIBLIOGRAPHY
+    true,       // XML_TOK_INDEX_TYPE_ENTRY_TEXT =
+    true,       // XML_TOK_INDEX_TYPE_TAB_STOP,
+    true,       // XML_TOK_INDEX_TYPE_TEXT,
+    true,       // XML_TOK_INDEX_TYPE_PAGE_NUMBER,
+    true,       // XML_TOK_INDEX_TYPE_CHAPTER,
+    false,      // XML_TOK_INDEX_TYPE_LINK_START,
+    false,      // XML_TOK_INDEX_TYPE_LINK_END,
+    false       // XML_TOK_INDEX_TYPE_BIBLIOGRAPHY
 };
 
 
@@ -448,14 +448,14 @@ const sal_Char* aLevelStylePropNameBibliographyMap[] =
 
 const sal_Bool aAllowedTokenTypesBibliography[] =
 {
-    sal_True,       // XML_TOK_INDEX_TYPE_ENTRY_TEXT =
-    sal_True,       // XML_TOK_INDEX_TYPE_TAB_STOP,
-    sal_True,       // XML_TOK_INDEX_TYPE_TEXT,
-    sal_True,       // XML_TOK_INDEX_TYPE_PAGE_NUMBER,
-    sal_False,      // XML_TOK_INDEX_TYPE_CHAPTER,
-    sal_False,      // XML_TOK_INDEX_TYPE_LINK_START,
-    sal_False,      // XML_TOK_INDEX_TYPE_LINK_END,
-    sal_True        // XML_TOK_INDEX_TYPE_BIBLIOGRAPHY
+    true,       // XML_TOK_INDEX_TYPE_ENTRY_TEXT =
+    true,       // XML_TOK_INDEX_TYPE_TAB_STOP,
+    true,       // XML_TOK_INDEX_TYPE_TEXT,
+    true,       // XML_TOK_INDEX_TYPE_PAGE_NUMBER,
+    false,      // XML_TOK_INDEX_TYPE_CHAPTER,
+    false,      // XML_TOK_INDEX_TYPE_LINK_START,
+    false,      // XML_TOK_INDEX_TYPE_LINK_END,
+    true        // XML_TOK_INDEX_TYPE_BIBLIOGRAPHY
 };
 
 
@@ -469,14 +469,14 @@ const sal_Char* aLevelStylePropNameTableMap[] =
 
 const sal_Bool aAllowedTokenTypesTable[] =
 {
-    sal_True,       // XML_TOK_INDEX_TYPE_ENTRY_TEXT =
-    sal_True,       // XML_TOK_INDEX_TYPE_TAB_STOP,
-    sal_True,       // XML_TOK_INDEX_TYPE_TEXT,
-    sal_True,       // XML_TOK_INDEX_TYPE_PAGE_NUMBER,
-    sal_True,       // XML_TOK_INDEX_TYPE_CHAPTER,
-    sal_False,      // XML_TOK_INDEX_TYPE_LINK_START,
-    sal_False,      // XML_TOK_INDEX_TYPE_LINK_END,
-    sal_False       // XML_TOK_INDEX_TYPE_BIBLIOGRAPHY
+    true,       // XML_TOK_INDEX_TYPE_ENTRY_TEXT =
+    true,       // XML_TOK_INDEX_TYPE_TAB_STOP,
+    true,       // XML_TOK_INDEX_TYPE_TEXT,
+    true,       // XML_TOK_INDEX_TYPE_PAGE_NUMBER,
+    true,       // XML_TOK_INDEX_TYPE_CHAPTER,
+    false,      // XML_TOK_INDEX_TYPE_LINK_START,
+    false,      // XML_TOK_INDEX_TYPE_LINK_END,
+    false       // XML_TOK_INDEX_TYPE_BIBLIOGRAPHY
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
index 8f3571220797..b13bf411e0d8 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
@@ -65,9 +65,9 @@ XMLSectionFootnoteConfigImport::~XMLSectionFootnoteConfigImport()
 void XMLSectionFootnoteConfigImport::StartElement(
     const Reference<XAttributeList> & xAttrList)
 {
-    sal_Bool bEnd = sal_True;   // we're inside the element, so this is true
-    sal_Bool bNumOwn = sal_False;
-    sal_Bool bNumRestart = sal_False;
+    sal_Bool bEnd = true;   // we're inside the element, so this is true
+    sal_Bool bNumOwn = false;
+    sal_Bool bNumRestart = false;
     bool bEndnote = false;
     sal_Int16 nNumRestartAt = 0;
     OUString sNumPrefix;
@@ -93,7 +93,7 @@ void XMLSectionFootnoteConfigImport::StartElement(
                 if (::sax::Converter::convertNumber(nTmp, sAttrValue))
                 {
                     nNumRestartAt = static_cast< sal_Int16 >( nTmp ) - 1;
-                    bNumRestart = sal_True;
+                    bNumRestart = true;
                 }
             }
             else if( IsXMLToken( sLocalName, XML_NOTE_CLASS ) )
@@ -107,22 +107,22 @@ void XMLSectionFootnoteConfigImport::StartElement(
             if (IsXMLToken(sLocalName, XML_NUM_PREFIX))
             {
                 sNumPrefix = sAttrValue;
-                bNumOwn = sal_True;
+                bNumOwn = true;
             }
             else if (IsXMLToken(sLocalName, XML_NUM_SUFFIX))
             {
                 sNumSuffix = sAttrValue;
-                bNumOwn = sal_True;
+                bNumOwn = true;
             }
             else if (IsXMLToken(sLocalName, XML_NUM_FORMAT))
             {
                 sNumFormat = sAttrValue;
-                bNumOwn = sal_True;
+                bNumOwn = true;
             }
             else if (IsXMLToken(sLocalName, XML_NUM_LETTER_SYNC))
             {
                 sNumLetterSync = sAttrValue;
-                bNumOwn = sal_True;
+                bNumOwn = true;
             }
         }
     }
diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx
index 059259ec1e66..440bfab11cf9 100644
--- a/xmloff/source/text/XMLSectionImportContext.cxx
+++ b/xmloff/source/text/XMLSectionImportContext.cxx
@@ -219,8 +219,8 @@ void XMLSectionImportContext::StartElement(
                 rHelper->InsertString(sMarkerString);
 
                 // select first marker
-                rHelper->GetCursor()->gotoRange(xStart, sal_False);
-                rHelper->GetCursor()->goRight(1, sal_True);
+                rHelper->GetCursor()->gotoRange(xStart, false);
+                rHelper->GetCursor()->goRight(1, true);
 
                 // convert section to XTextContent
                 Reference<XTextContent> xTextContent(xSectionPropertySet,
@@ -228,11 +228,11 @@ void XMLSectionImportContext::StartElement(
 
                 // and insert (over marker)
                 rHelper->GetText()->insertTextContent(
-                    rHelper->GetCursorAsRange(), xTextContent, sal_True );
+                    rHelper->GetCursorAsRange(), xTextContent, true );
 
                 // and delete first marker (in section)
                 rHelper->GetText()->insertString(
-                    rHelper->GetCursorAsRange(), "", sal_True);
+                    rHelper->GetCursorAsRange(), "", true);
 
                 // finally, check for redlines that should start at
                 // the section start node
@@ -332,18 +332,18 @@ void XMLSectionImportContext::EndElement()
     // get rid of last paragraph
     // (unless it's the only paragraph in the section)
     rtl::Reference<XMLTextImportHelper> rHelper = GetImport().GetTextImport();
-    rHelper->GetCursor()->goRight(1, sal_False);
+    rHelper->GetCursor()->goRight(1, false);
     if (bHasContent)
     {
-        rHelper->GetCursor()->goLeft(1, sal_True);
+        rHelper->GetCursor()->goLeft(1, true);
         rHelper->GetText()->insertString(rHelper->GetCursorAsRange(),
-                                         "", sal_True);
+                                         "", true);
     }
 
     // and delete second marker
-    rHelper->GetCursor()->goRight(1, sal_True);
+    rHelper->GetCursor()->goRight(1, true);
     rHelper->GetText()->insertString(rHelper->GetCursorAsRange(),
-                                     "", sal_True);
+                                     "", true);
 
     // check for redlines to our endnode
     rHelper->RedlineAdjustStartNodeCursor(false);
diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
index f65e922732f4..b2bc4be9a291 100644
--- a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
@@ -92,7 +92,7 @@ void XMLSectionSourceDDEImportContext::StartElement(
     OUString sApplication;
     OUString sTopic;
     OUString sItem;
-    sal_Bool bAutomaticUpdate = sal_False;
+    sal_Bool bAutomaticUpdate = false;
 
     sal_Int16 nLength = xAttrList->getLength();
     for(sal_Int16 nAttr = 0; nAttr < nLength; nAttr++)
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 0e6704220f24..7de81faf5ce1 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -225,7 +225,7 @@ XMLTextFrameContourContext_Impl::XMLTextFrameContourContext_Impl(
 {
     OUString sD, sPoints, sViewBox;
     bool bPixelWidth = false, bPixelHeight = false;
-    sal_Bool bAuto = sal_False;
+    sal_Bool bAuto = false;
     sal_Int32 nWidth = 0;
     sal_Int32 nHeight = 0;
 
diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
index a1423a75e1df..90f22089147d 100644
--- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx
+++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
@@ -133,7 +133,7 @@ SvXMLImportContext *XMLTextHeaderFooterContext::CreateChildContext(
                 if( !bOn )
                 {
                     // Switch header on
-                    bOn = sal_True;
+                    bOn = true;
                     aAny.setValue( &bOn, cppu::UnoType<bool>::get() );
                     xPropSet->setPropertyValue( sOn, aAny );
 
@@ -147,7 +147,7 @@ SvXMLImportContext *XMLTextHeaderFooterContext::CreateChildContext(
                 sal_Bool bShared = *static_cast<sal_Bool const *>(aAny.getValue());
                 if( !bShared )
                 {
-                    bShared = sal_True;
+                    bShared = true;
                     aAny.setValue( &bShared, cppu::UnoType<bool>::get() );
                     xPropSet->setPropertyValue( sShareContent, aAny );
                 }
@@ -201,7 +201,7 @@ void XMLTextHeaderFooterContext::EndElement()
     {
         // If no content has been inserted into the header or footer,
         // switch it off.
-        sal_Bool bOn = sal_False;
+        sal_Bool bOn = false;
         Any aAny;
         aAny.setValue( &bOn, cppu::UnoType<bool>::get() );
         xPropSet->setPropertyValue( sOn, aAny );
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 8774c47f6aa7..2cb098aba481 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -303,7 +303,7 @@ void XMLTextMarkImportContext::EndElement()
                                 m_rHelper.GetText()->createTextCursorByRange(
                                     xEndRange);
                             try {
-                            xInsertionCursor->gotoRange(xStartRange, sal_True);
+                            xInsertionCursor->gotoRange(xStartRange, true);
                             } catch (uno::Exception&) {
                                 OSL_ENSURE(false,
                                     "cannot go to end position of bookmark");
@@ -446,7 +446,7 @@ Reference<XTextContent> XMLTextMarkImportContext::CreateAndInsertMark(
                 // if inserting marks, bAbsorb==sal_False will cause
                 // collapsing of the given XTextRange.
                 rImport.GetTextImport()->GetText()->insertTextContent(rRange,
-                    xTextContent, sal_True);
+                    xTextContent, true);
 
                 // xml:id for RDF metadata -- after insertion!
                 rImport.SetXmlId(xIfc, i_rXmlId);
diff --git a/xmloff/source/text/txtdropi.cxx b/xmloff/source/text/txtdropi.cxx
index 0694977441d4..85622bea7a6d 100644
--- a/xmloff/source/text/txtdropi.cxx
+++ b/xmloff/source/text/txtdropi.cxx
@@ -62,7 +62,7 @@ void XMLTextDropCapImportContext::ProcessAttrs(
     SvXMLTokenMap aTokenMap( aDropAttrTokenMap );
 
     DropCapFormat aFormat;
-    sal_Bool bWholeWord = sal_False;
+    sal_Bool bWholeWord = false;
 
     sal_Int32 nTmp;
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -87,11 +87,11 @@ void XMLTextDropCapImportContext::ProcessAttrs(
         case XML_TOK_DROP_LENGTH:
             if( IsXMLToken( rValue, XML_WORD ) )
             {
-                bWholeWord = sal_True;
+                bWholeWord = true;
             }
             else if (::sax::Converter::convertNumber( nTmp, rValue, 1, 255 ))
             {
-                bWholeWord = sal_False;
+                bWholeWord = false;
                 aFormat.Count = (sal_Int8)nTmp;
             }
             break;
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 2e3d293517e0..7353bcd33ad5 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -1063,7 +1063,7 @@ void XMLTextFieldExport::ExportFieldHelper(
     // in all implementations)
     Reference<XPropertySetInfo> xPropSetInfo(rPropSet->getPropertySetInfo());
 
-    OUString sPresentation = rTextField->getPresentation(sal_False);
+    OUString sPresentation = rTextField->getPresentation(false);
 
     // process each field type
     switch (nToken) {
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index ac943f62f8fd..3e592895e2bc 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -2933,7 +2933,7 @@ void XMLDdeFieldDeclImportContext::StartElement(
     OUString sCommandTopic;
     OUString sCommandItem;
 
-    sal_Bool bUpdate = sal_False;
+    sal_Bool bUpdate = false;
     bool bNameOK = false;
     bool bCommandApplicationOK = false;
     bool bCommandTopicOK = false;
@@ -3597,8 +3597,8 @@ void XMLAnnotationImportContext::EndElement()
     {
         // delete addition newline
         const OUString aEmpty;
-        mxCursor->gotoEnd( sal_False );
-        mxCursor->goLeft( 1, sal_True );
+        mxCursor->gotoEnd( false );
+        mxCursor->goLeft( 1, true );
         mxCursor->setString( aEmpty );
 
         // reset cursor
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 6ad3333280f6..768ae88c2753 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1093,7 +1093,7 @@ void XMLTextImportHelper::InsertString( const OUString& rChars )
     if (m_xImpl->m_xText.is())
     {
         m_xImpl->m_xText->insertString(m_xImpl->m_xCursorAsRange,
-            rChars, sal_False);
+            rChars, false);
     }
 }
 
@@ -1127,7 +1127,7 @@ void XMLTextImportHelper::InsertString( const OUString& rChars,
             }
         }
         m_xImpl->m_xText->insertString(m_xImpl->m_xCursorAsRange,
-                                       sChars.makeStringAndClear(), sal_False);
+                                       sChars.makeStringAndClear(), false);
     }
 }
 
@@ -1138,7 +1138,7 @@ void XMLTextImportHelper::InsertControlCharacter( sal_Int16 nControl )
     if (m_xImpl->m_xText.is())
     {
         m_xImpl->m_xText->insertControlCharacter(
-            m_xImpl->m_xCursorAsRange, nControl, sal_False);
+            m_xImpl->m_xCursorAsRange, nControl, false);
     }
 }
 
@@ -1150,7 +1150,7 @@ void XMLTextImportHelper::InsertTextContent(
     if (m_xImpl->m_xText.is())
     {
         // note: this may throw IllegalArgumentException and callers handle it
-        m_xImpl->m_xText->insertTextContent( m_xImpl->m_xCursorAsRange, xContent, sal_False);
+        m_xImpl->m_xText->insertTextContent( m_xImpl->m_xCursorAsRange, xContent, false);
     }
 }
 
@@ -1181,10 +1181,10 @@ void XMLTextImportHelper::DeleteParagraph()
     }
     if( bDelete )
     {
-        if (m_xImpl->m_xCursor->goLeft( 1, sal_True ))
+        if (m_xImpl->m_xCursor->goLeft( 1, true ))
         {
             m_xImpl->m_xText->insertString(m_xImpl->m_xCursorAsRange,
-                                           "", sal_True);
+                                           "", true);
         }
     }
 }
@@ -1558,7 +1558,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
             if (!bNumberingIsNumber &&
                 xPropSetInfo->hasPropertyByName(s_NumberingIsNumber))
             {
-                xPropSet->setPropertyValue(s_NumberingIsNumber, Any(sal_False));
+                xPropSet->setPropertyValue(s_NumberingIsNumber, Any(false));
             }
 
             xPropSet->setPropertyValue( s_NumberingLevel, Any(nLevel) );
@@ -1685,8 +1685,8 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
                     if (rCursor->getString().getLength() >
                             MAX_COMBINED_CHARACTERS)
                     {
-                        rCursor->gotoRange(rCursor->getStart(), sal_False);
-                        rCursor->goRight(MAX_COMBINED_CHARACTERS, sal_True);
+                        rCursor->gotoRange(rCursor->getStart(), false);
+                        rCursor->goRight(MAX_COMBINED_CHARACTERS, true);
                     }
 
                     // set field value (the combined character string)
@@ -1699,7 +1699,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
                     {
                         // #i107225# the combined characters need to be inserted first
                         // the selected text has to be removed afterwards
-                        m_xImpl->m_xText->insertTextContent( rCursor->getStart(), xTextContent, sal_True );
+                        m_xImpl->m_xText->insertTextContent( rCursor->getStart(), xTextContent, true );
 
                         if( !rCursor->getString().isEmpty() )
                         {
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 9b4ff7354ae3..62be56ba8e93 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -1305,7 +1305,7 @@ XMLTextParagraphExport::XMLTextParagraphExport(
     sal_Int32 nIndex = xTextPropMapper->getPropertySetMapper()->FindEntryIndex(
                                 "", XML_NAMESPACE_STYLE,
                                 GetXMLToken(XML_TEXT_COMBINE));
-    pFieldExport = new XMLTextFieldExport( rExp, new XMLPropertyState( nIndex, uno::makeAny(sal_True) ) );
+    pFieldExport = new XMLTextFieldExport( rExp, new XMLPropertyState( nIndex, uno::makeAny(true) ) );
     PushNewTextListsHelper();
 }
 
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index f2ac9f27bb14..06c3c5301315 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -651,7 +651,7 @@ XMLImpRubyContext_Impl::~XMLImpRubyContext_Impl()
     const Reference < XTextCursor > xAttrCursor(
         xTextImport->GetText()->createTextCursorByRange( m_xStart ));
     xAttrCursor->gotoRange(xTextImport->GetCursorAsRange()->getStart(),
-            sal_True);
+            true);
     xTextImport->SetRuby( GetImport(), xAttrCursor,
          m_sStyleName, m_sTextStyleName, m_sText );
 }
@@ -775,7 +775,7 @@ void XMLMetaImportContextBase::EndElement()
     const Reference<XTextCursor> xInsertionCursor(
         GetImport().GetTextImport()->GetText()->createTextCursorByRange(
             xEndRange) );
-    xInsertionCursor->gotoRange(m_xStart, sal_True);
+    xInsertionCursor->gotoRange(m_xStart, true);
 
     InsertMeta(xInsertionCursor);
 }
@@ -1952,7 +1952,7 @@ XMLParaContext::~XMLParaContext()
         Reference < XTextCursor > xIdCursor( xTxtImport->GetText()->createTextCursorByRange( xStart ) );
         if( xIdCursor.is() )
         {
-            xIdCursor->gotoRange( xEnd, sal_True );
+            xIdCursor->gotoRange( xEnd, true );
             GetImport().getInterfaceToIdentifierMapper().registerReference(
                 m_sXmlId, Reference<XInterface>( xIdCursor, UNO_QUERY ));
         }
@@ -1972,7 +1972,7 @@ XMLParaContext::~XMLParaContext()
         // though it just means 'we were unable to create the cursor'
         return;
     }
-    xAttrCursor->gotoRange( xEnd, sal_True );
+    xAttrCursor->gotoRange( xEnd, true );
 
     // xml:id for RDF metadata
     if (!m_sXmlId.isEmpty() || m_bHaveAbout || !m_sProperty.isEmpty())
@@ -2072,8 +2072,8 @@ XMLParaContext::~XMLParaContext()
         for (size_t i = 0; i < pHints->GetHints().size(); ++i)
         {
             XMLHint_Impl *const pHint = pHints->GetHints()[i].get();
-            xAttrCursor->gotoRange( pHint->GetStart(), sal_False );
-            xAttrCursor->gotoRange( pHint->GetEnd(), sal_True );
+            xAttrCursor->gotoRange( pHint->GetStart(), false );
+            xAttrCursor->gotoRange( pHint->GetEnd(), true );
             switch( pHint->GetType() )
             {
             case XML_HINT_STYLE:
@@ -2125,7 +2125,7 @@ XMLParaContext::~XMLParaContext()
                         static_cast<const XMLIndexMarkHint_Impl *>(pHint)->GetMark());
                     Reference<XTextContent> xContent(xMark, UNO_QUERY);
                     xTxtImport->GetText()->insertTextContent(
-                        xAttrCursor, xContent, sal_True );
+                        xAttrCursor, xContent, true );
                 }
                 break;
             case XML_HINT_TEXT_FRAME:
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx
index 51a2ebdf597a..d2c5779659fd 100644
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/xmloff/source/text/txtprhdl.cxx
@@ -334,9 +334,9 @@ bool XMLOpaquePropHdl_Impl::importXML(
         const SvXMLUnitConverter& ) const
 {
     bool bRet = true;
-    sal_Bool bVal = sal_False;
+    sal_Bool bVal = false;
     if( IsXMLToken( rStrImpValue, XML_FOREGROUND ) )
-        bVal = sal_True;
+        bVal = true;
     else if( !IsXMLToken( rStrImpValue, XML_BACKGROUND ) )
         bRet = false;
 
@@ -384,9 +384,9 @@ bool XMLContourModePropHdl_Impl::importXML(
         const SvXMLUnitConverter& ) const
 {
     bool bRet = true;
-    sal_Bool bVal = sal_False;
+    sal_Bool bVal = false;
     if( IsXMLToken( rStrImpValue, XML_OUTSIDE ) )
-        bVal = sal_True;
+        bVal = true;
     else if( ! IsXMLToken( rStrImpValue, XML_FULL ) )
         bRet = false;
 
@@ -434,7 +434,7 @@ bool XMLParagraphOnlyPropHdl_Impl::importXML(
         const SvXMLUnitConverter& ) const
 {
     bool bRet = true;
-    sal_Bool bVal = sal_False;
+    sal_Bool bVal = false;
 
     if( ! IsXMLToken( rStrImpValue, XML_NO_LIMIT ) )
     {
@@ -552,7 +552,7 @@ bool XMLFrameProtectPropHdl_Impl::importXML(
         const SvXMLUnitConverter& ) const
 {
     bool bRet = true;
-    sal_Bool bVal = sal_False;
+    sal_Bool bVal = false;
     if( ! IsXMLToken( rStrImpValue, XML_NONE ) )
     {
         bRet = false;
@@ -563,7 +563,7 @@ bool XMLFrameProtectPropHdl_Impl::importXML(
             bRet = true;
             if( aToken == sVal )
             {
-                bVal = sal_True;
+                bVal = true;
                 break;
             }
         }
@@ -794,7 +794,7 @@ bool XMLGrfMirrorPropHdl_Impl::importXML(
         const SvXMLUnitConverter& ) const
 {
     bool bRet = true;
-    sal_Bool bVal = sal_False;
+    sal_Bool bVal = false;
     if( ! IsXMLToken( rStrImpValue, XML_NONE ) )
     {
         bRet = false;
@@ -806,7 +806,7 @@ bool XMLGrfMirrorPropHdl_Impl::importXML(
             if( aToken == sVal ||
                  (bHori && IsXMLToken( aToken, XML_HORIZONTAL ) ) )
             {
-                bVal = sal_True;
+                bVal = true;
                 break;
             }
         }
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index 72e3252b545c..5ca8d33450f6 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -489,7 +489,7 @@ void XMLVariableInputFieldImportContext::PrepareField(
 {
     // set type (input field)
     Any aAny;
-    sal_Bool bTrue = sal_True;
+    sal_Bool bTrue = true;
     aAny.setValue( &bTrue, cppu::UnoType<bool>::get() );
     xPropertySet->setPropertyValue(sPropertyIsInput, aAny);
 
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index ed4ff6db9cc9..c8ff4c696222 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -1893,7 +1893,7 @@ sal_Bool SAL_CALL OOo2OasisTransformer::filter(
     if( xFilter.is() )
         return xFilter->filter( aDescriptor );
 
-    return sal_False;
+    return false;
 }
 
 void SAL_CALL OOo2OasisTransformer::cancel(  )