native bool support in SvXMLUnitConverter

42 files changed, 71 insertions, 70 deletions

diff --git a/xmloff/inc/XMLChartPropertySetMapper.hxx b/xmloff/inc/XMLChartPropertySetMapper.hxx
index a08e7fb45949..02d58bf3268b 100644
--- a/xmloff/inc/XMLChartPropertySetMapper.hxx
+++ b/xmloff/inc/XMLChartPropertySetMapper.hxx
@@ -112,7 +112,7 @@ public:
                                   const SvXMLImport& rImport );
     virtual ~XMLChartImportPropertyMapper();
 
-    virtual sal_Bool handleSpecialItem(
+    virtual bool handleSpecialItem(
         XMLPropertyState& rProperty,
         ::std::vector< XMLPropertyState >& rProperties,
         const ::rtl::OUString& rValue,
diff --git a/xmloff/inc/txtimppr.hxx b/xmloff/inc/txtimppr.hxx
index ca2446a01352..d4020c4e3a32 100644
--- a/xmloff/inc/txtimppr.hxx
+++ b/xmloff/inc/txtimppr.hxx
@@ -57,7 +57,7 @@ class XMLOFF_DLLPUBLIC XMLTextImportPropertyMapper : public SvXMLImportPropertyM
                 XMLPropertyState** ppNewFontCharSet ) const;
 
 protected:
-    virtual sal_Bool handleSpecialItem(
+    virtual bool handleSpecialItem(
             XMLPropertyState& rProperty,
             ::std::vector< XMLPropertyState >& rProperties,
             const ::rtl::OUString& rValue,
diff --git a/xmloff/inc/xmloff/shapeimport.hxx b/xmloff/inc/xmloff/shapeimport.hxx
index f51f46a95e4d..08c1afb1a212 100644
--- a/xmloff/inc/xmloff/shapeimport.hxx
+++ b/xmloff/inc/xmloff/shapeimport.hxx
@@ -189,8 +189,8 @@ class SdXML3DLightContext: public SvXMLImportContext
     // local parameters which need to be read
     Color                       maDiffuseColor;
     ::basegfx::B3DVector        maDirection;
-    BOOL                        mbEnabled;
-    BOOL                        mbSpecular;
+    bool                        mbEnabled;
+    bool                        mbSpecular;
 
 public:
     SdXML3DLightContext(
@@ -228,7 +228,7 @@ protected:
     sal_Int32                   mnShadowSlant;
     com::sun::star::drawing::ShadeMode mxShadeMode;
     Color                       maAmbientColor;
-    BOOL                        mbLightingMode;
+    bool                        mbLightingMode;
 
     ::basegfx::B3DVector        maVRP;
     ::basegfx::B3DVector        maVPN;
diff --git a/xmloff/inc/xmloff/xmlimppr.hxx b/xmloff/inc/xmloff/xmlimppr.hxx
index e29e53e4e1c6..91b9b19c1401 100644
--- a/xmloff/inc/xmloff/xmlimppr.hxx
+++ b/xmloff/inc/xmloff/xmlimppr.hxx
@@ -114,7 +114,7 @@ public:
             sal_Int32 nStartIdx, sal_Int32 nEndIdx ) const;
 
     /** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_IMPORT flag set */
-    virtual sal_Bool handleSpecialItem(
+    virtual bool handleSpecialItem(
             XMLPropertyState& rProperty,
             ::std::vector< XMLPropertyState >& rProperties,
             const ::rtl::OUString& rValue,
diff --git a/xmloff/inc/xmloff/xmlstyle.hxx b/xmloff/inc/xmloff/xmlstyle.hxx
index c26912c72870..c1dc584d040b 100644
--- a/xmloff/inc/xmloff/xmlstyle.hxx
+++ b/xmloff/inc/xmloff/xmlstyle.hxx
@@ -243,7 +243,7 @@ public:
     const SvXMLStyleContext *FindStyleChildContext(
                                       sal_uInt16 nFamily,
                                       const ::rtl::OUString& rName,
-                                      BOOL bCreateIndex=sal_False ) const;
+                                      sal_Bool bCreateIndex=sal_False ) const;
     virtual sal_uInt16 GetFamily( const ::rtl::OUString& rFamily ) const;
     virtual UniReference < SvXMLImportPropertyMapper > GetImportPropertyMapper(
                         sal_uInt16 nFamily ) const;
diff --git a/xmloff/inc/xmloff/xmluconv.hxx b/xmloff/inc/xmloff/xmluconv.hxx
index 580a20b76a5c..8ecfa30e30ba 100644
--- a/xmloff/inc/xmloff/xmluconv.hxx
+++ b/xmloff/inc/xmloff/xmluconv.hxx
@@ -173,7 +173,7 @@ public:
                                 MapUnit eDstUnit );
 
     /** convert string to boolean */
-    static sal_Bool convertBool( sal_Bool& rBool,
+    static sal_Bool convertBool( bool& rBool,
                              const ::rtl::OUString& rString );
 
     /** convert boolean to string */
diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx
index d2be11a0013e..3cba7cf5f9e0 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -496,7 +496,7 @@ XMLChartImportPropertyMapper::~XMLChartImportPropertyMapper()
 {
 }
 
-sal_Bool XMLChartImportPropertyMapper::handleSpecialItem(
+bool XMLChartImportPropertyMapper::handleSpecialItem(
     XMLPropertyState& rProperty,
     ::std::vector< XMLPropertyState >& rProperties,
     const ::rtl::OUString& rValue,
@@ -510,7 +510,7 @@ sal_Bool XMLChartImportPropertyMapper::handleSpecialItem(
     if( nContextId )
     {
         sal_Int32 nValue = 0;
-        sal_Bool bValue = sal_False;
+        bool bValue = false;
 
         switch( nContextId )
         {
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 9b6731f78da3..fbfbfa630193 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -2053,8 +2053,8 @@ void SchXMLEquationContext::StartElement( const uno::Reference< xml::sax::XAttri
     const SvXMLTokenMap& rAttrTokenMap = mrImportHelper.GetRegEquationAttrTokenMap();
     OUString sAutoStyleName;
 
-    sal_Bool bShowEquation = sal_True;
-    sal_Bool bShowRSquare = sal_False;
+    bool bShowEquation = true;
+    bool bShowRSquare = false;
     awt::Point aPosition;
     bool bHasXPos = false;
     bool bHasYPos = false;
diff --git a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
index 6dbb39926c6c..13169e34d892 100644
--- a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
+++ b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
@@ -40,7 +40,7 @@ XMLErrorIndicatorPropertyHdl::~XMLErrorIndicatorPropertyHdl()
 sal_Bool XMLErrorIndicatorPropertyHdl::importXML( const ::rtl::OUString& rStrImpValue,
                                                   uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
 {
-    sal_Bool bValue;
+    bool bValue;
     SvXMLUnitConverter::convertBool( bValue, rStrImpValue );
 
     // modify existing value
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index 28abf2edbcbd..fd03e3fb5b37 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -441,7 +441,7 @@ void SvXMLUnitConverter::convertMeasure( OUStringBuffer& rBuffer,
 }
 
 /** convert string to boolean */
-sal_Bool SvXMLUnitConverter::convertBool( sal_Bool& rBool,
+sal_Bool SvXMLUnitConverter::convertBool( bool& rBool,
                                       const OUString& rString )
 {
     rBool = IsXMLToken(rString, XML_TRUE);
@@ -2253,7 +2253,7 @@ sal_Bool SvXMLUnitConverter::convertAny(      com::sun::star::uno::Any& aValue,
 
     if (sType.equalsAscii("boolean"))
     {
-        sal_Bool bTempValue = sal_False;
+        bool bTempValue = false;
         SvXMLUnitConverter::convertBool(bTempValue, sValue);
         aValue <<= bTempValue;
         bConverted = sal_True;
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 17bba5170c79..146448ccba32 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -873,7 +873,7 @@ void AnimationNodeContext::init_node(  const ::com::sun::star::uno::Reference< :
             break;
             case ANA_AutoReverse:
             {
-                sal_Bool bTemp;
+                bool bTemp;
                 if( SvXMLUnitConverter::convertBool( bTemp, rValue ) )
                     mxNode->setAutoReverse( bTemp  );
             }
@@ -918,7 +918,7 @@ void AnimationNodeContext::init_node(  const ::com::sun::star::uno::Reference< :
             break;
             case ANA_After_Effect:
             {
-                sal_Bool bTemp;
+                bool bTemp;
                 if( SvXMLUnitConverter::convertBool( bTemp, rValue ) )
                     aUserData.push_back( NamedValue( GetXMLToken( XML_AFTER_EFFECT ), makeAny( bTemp ) ) );
             }
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
index 2f3c90278b6f..929e4e83717b 100644
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -54,8 +54,8 @@ SdXML3DLightContext::SdXML3DLightContext(
 :   SvXMLImportContext( rImport, nPrfx, rLName),
     maDiffuseColor(0x00000000),
     maDirection(0.0, 0.0, 1.0),
-    mbEnabled(FALSE),
-    mbSpecular(FALSE)
+    mbEnabled(false),
+    mbSpecular(false)
 {
     // read attributes for the 3DScene
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -231,7 +231,7 @@ SdXML3DSceneAttributesHelper::SdXML3DSceneAttributesHelper( SvXMLImport& rImport
     mnShadowSlant(0),
     mxShadeMode(drawing::ShadeMode_SMOOTH),
     maAmbientColor(0x00666666),
-    mbLightingMode(FALSE),
+    mbLightingMode(false),
     maVRP(0.0, 0.0, 1.0),
     maVPN(0.0, 0.0, 1.0),
     maVUP(0.0, 1.0, 0.0),
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index 98255edf68d0..1a029eadcc23 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -86,7 +86,7 @@ const SvXMLEnumMapEntry aXML_GluePointEnumMap[] =
 void GetBool( std::vector< com::sun::star::beans::PropertyValue >& rDest,
                         const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp )
 {
-    sal_Bool bAttrBool;
+    bool bAttrBool;
     if ( SvXMLUnitConverter::convertBool( bAttrBool, rValue ) )
     {
         beans::PropertyValue aProp;
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index b946c4a20941..0e108902afbe 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -1693,13 +1693,13 @@ namespace xmloff
             GetPrefix(), ::rtl::OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_SELECTED)));
 
         // propagate the selected flag
-        sal_Bool bSelected;
+        bool bSelected;
         GetImport().GetMM100UnitConverter().convertBool(bSelected, _rxAttrList->getValueByName(sSelectedAttribute));
         if (bSelected)
             m_xListBoxImport->implSelectCurrentItem();
 
         // same for the default selected
-        sal_Bool bDefaultSelected;
+        bool bDefaultSelected;
         GetImport().GetMM100UnitConverter().convertBool(bDefaultSelected, _rxAttrList->getValueByName(sDefaultSelectedAttribute));
         if (bDefaultSelected)
             m_xListBoxImport->implDefaultSelectCurrentItem();
diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx
index d434d7a9addf..d2fe79a5c192 100644
--- a/xmloff/source/forms/officeforms.cxx
+++ b/xmloff/source/forms/officeforms.cxx
@@ -83,7 +83,7 @@ namespace xmloff
 
         // get and convert the value
         ::rtl::OUString sAttributeValue = _rxAttributes->getValueByName(sCompleteAttributeName);
-        sal_Bool bValue = _bDefault;
+        bool bValue = _bDefault;
         GetImport().GetMM100UnitConverter().convertBool(bValue, sAttributeValue);
 
         // set the property
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx
index 45fa2f5b4744..850e3dba0786 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -109,7 +109,7 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun
     {
         case TypeClass_BOOLEAN:     // sal_Bool
         {
-            sal_Bool bValue;
+            bool bValue;
         #if OSL_DEBUG_LEVEL > 0
             sal_Bool bSuccess =
         #endif
diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx b/xmloff/source/style/PageMasterImportPropMapper.cxx
index 59cff11d65cc..01b27576ec19 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.cxx
@@ -62,7 +62,7 @@ PageMasterImportPropertyMapper::~PageMasterImportPropertyMapper()
 {
 }
 
-sal_Bool PageMasterImportPropertyMapper::handleSpecialItem(
+bool PageMasterImportPropertyMapper::handleSpecialItem(
         XMLPropertyState& rProperty,
         ::std::vector< XMLPropertyState >& rProperties,
         const ::rtl::OUString& rValue,
diff --git a/xmloff/source/style/PageMasterImportPropMapper.hxx b/xmloff/source/style/PageMasterImportPropMapper.hxx
index 56a5014e8ef6..a12048a3c184 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.hxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.hxx
@@ -46,7 +46,7 @@ public:
     virtual ~PageMasterImportPropertyMapper();
 
     /** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_IMPORT flag set */
-    virtual sal_Bool handleSpecialItem(
+    virtual bool handleSpecialItem(
             XMLPropertyState& rProperty,
             ::std::vector< XMLPropertyState >& rProperties,
             const ::rtl::OUString& rValue,
diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx
index 4cc76c3f3ff5..87eccc22a11e 100644
--- a/xmloff/source/style/xmlbahdl.cxx
+++ b/xmloff/source/style/xmlbahdl.cxx
@@ -247,7 +247,7 @@ sal_Bool XMLBoolPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, c
 {
     sal_Bool bRet = sal_False;
 
-    sal_Bool bValue;
+    bool bValue;
     bRet = SvXMLUnitConverter::convertBool( bValue, rStrImpValue );
     rValue <<= sal_Bool(bValue);
 
@@ -285,7 +285,7 @@ sal_Bool XMLNBoolPropHdl::importXML( const OUString& rStrImpValue, Any& rValue,
 {
     sal_Bool bRet = sal_False;
 
-    sal_Bool bValue;
+    bool bValue;
     bRet = SvXMLUnitConverter::convertBool( bValue, rStrImpValue );
     rValue <<= sal_Bool(!bValue);
 
@@ -808,7 +808,7 @@ XMLIsAutoColorPropHdl::~XMLIsAutoColorPropHdl()
 
 sal_Bool XMLIsAutoColorPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const
 {
-    sal_Bool bValue;
+    bool bValue;
 
     // An auto color overrides any other color set!
     sal_Bool bRet = SvXMLUnitConverter::convertBool( bValue, rStrImpValue );
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index 812071ff1b03..c470184c94d6 100644
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -354,7 +354,7 @@ void SvXMLImportPropertyMapper::importXML(
 }
 
 /** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_IMPORT flag set */
-BOOL SvXMLImportPropertyMapper::handleSpecialItem(
+bool SvXMLImportPropertyMapper::handleSpecialItem(
         XMLPropertyState& rProperty,
         vector< XMLPropertyState >& rProperties,
         const OUString& rValue,
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index 5bc581c7af0b..f6503655962a 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -115,7 +115,7 @@ void SvxXMLNumRuleExport::exportLevelStyles( const uno::Reference< ::com::sun::s
 
 void SvxXMLNumRuleExport::exportLevelStyle( INT32 nLevel,
                                     const uno::Sequence<beans::PropertyValue>& rProps,
-                                    BOOL bOutline )
+                                    sal_Bool bOutline )
 {
     sal_Int16 eType = NumberingType::CHAR_SPECIAL;
 
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index a192baa2216b..9ae835ac0ebb 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -950,7 +950,7 @@ SvXMLNumFmtElementContext::SvXMLNumFmtElementContext( SvXMLImport& rImport,
 {
     OUString sLanguage, sCountry;
     sal_Int32 nAttrVal;
-    sal_Bool bAttrBool;
+    bool bAttrBool;
     sal_uInt16 nAttrEnum;
     double fAttrDouble;
 
@@ -1399,7 +1399,7 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport,
 {
     OUString sLanguage, sCountry;
     ::com::sun::star::i18n::NativeNumberXmlAttributes aNatNumAttr;
-    sal_Bool bAttrBool;
+    bool bAttrBool;
     sal_uInt16 nAttrEnum;
 
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
diff --git a/xmloff/source/text/XMLChangedRegionImportContext.cxx b/xmloff/source/text/XMLChangedRegionImportContext.cxx
index 52e4ccc8e048..3fbdcf418842 100644
--- a/xmloff/source/text/XMLChangedRegionImportContext.cxx
+++ b/xmloff/source/text/XMLChangedRegionImportContext.cxx
@@ -94,7 +94,7 @@ void XMLChangedRegionImportContext::StartElement(
             }
             else if( IsXMLToken( sLocalName, XML_MERGE_LAST_PARAGRAPH ) )
             {
-                sal_Bool bTmp;
+                bool bTmp;
                 if( SvXMLUnitConverter::convertBool(bTmp, sValue) )
                 {
                     bMergeLastPara = bTmp;
diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
index aaebd7a27dca..425dfd753921 100644
--- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
@@ -108,7 +108,7 @@ void XMLIndexAlphabeticalSourceContext::ProcessAttribute(
     enum IndexSourceParamEnum eParam,
     const OUString& rValue)
 {
-    sal_Bool bTmp;
+    bool bTmp;
 
     switch (eParam)
     {
diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
index cbd959b65084..a3c9dfafc762 100644
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
@@ -131,7 +131,7 @@ void XMLIndexBibliographyConfigurationContext::ProcessAttribute(
         }
         else if( IsXMLToken(sLocalName, XML_SORT_BY_POSITION) )
         {
-            sal_Bool bTmp;
+            bool bTmp;
             if (SvXMLUnitConverter::convertBool(bTmp, sValue))
             {
                 bSortByPosition = bTmp;
@@ -184,7 +184,7 @@ SvXMLImportContext *XMLIndexBibliographyConfigurationContext::CreateChildContext
                 }
                 else if ( IsXMLToken( sLocalName, XML_SORT_ASCENDING ) )
                 {
-                    sal_Bool bTmp;
+                    bool bTmp;
                     if (SvXMLUnitConverter::convertBool(
                         bTmp, xAttrList->getValueByIndex(nAttr)))
                     {
diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.cxx b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
index f44154193e33..6878699c49bf 100644
--- a/xmloff/source/text/XMLIndexObjectSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
@@ -100,7 +100,7 @@ void XMLIndexObjectSourceContext::ProcessAttribute(
 {
     switch (eParam)
     {
-        sal_Bool bTmp;
+        bool bTmp;
 
         case XML_TOK_INDEXSOURCE_USE_OTHER_OBJECTS:
             if (SvXMLUnitConverter::convertBool(bTmp, rValue))
diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
index 3ee80500d21f..2b460a6fd8b6 100644
--- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx
+++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
@@ -215,7 +215,7 @@ void XMLIndexSourceBaseContext::ProcessAttribute(
 
         case XML_TOK_INDEXSOURCE_RELATIVE_TABS:
         {
-            sal_Bool bTmp;
+            bool bTmp;
             if (SvXMLUnitConverter::convertBool(bTmp, rValue))
             {
                 bRelativeTabs = bTmp;
diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx
index ad9f7ce10d7a..b06374046242 100644
--- a/xmloff/source/text/XMLIndexTOCContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCContext.cxx
@@ -165,7 +165,7 @@ void XMLIndexTOCContext::StartElement(
                 }
                 else if ( IsXMLToken( sLocalName, XML_PROTECTED ) )
                 {
-                    sal_Bool bTmp;
+                    bool bTmp;
                     if ( SvXMLUnitConverter::convertBool(
                          bTmp, xAttrList->getValueByIndex(nAttr) ) )
                     {
diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.cxx b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
index c52a3f1ee2ab..50880d04285b 100644
--- a/xmloff/source/text/XMLIndexTOCSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
@@ -115,7 +115,7 @@ void XMLIndexTOCSourceContext::ProcessAttribute(
 
         case XML_TOK_INDEXSOURCE_USE_OUTLINE_LEVEL:
         {
-            sal_Bool bTmp;
+            bool bTmp;
             if (SvXMLUnitConverter::convertBool(bTmp, rValue))
             {
                 bUseOutline = bTmp;
@@ -126,7 +126,7 @@ void XMLIndexTOCSourceContext::ProcessAttribute(
 
         case XML_TOK_INDEXSOURCE_USE_INDEX_MARKS:
         {
-            sal_Bool bTmp;
+            bool bTmp;
             if (SvXMLUnitConverter::convertBool(bTmp, rValue))
             {
                 bUseMarks = bTmp;
@@ -136,7 +136,7 @@ void XMLIndexTOCSourceContext::ProcessAttribute(
 
         case XML_TOK_INDEXSOURCE_USE_INDEX_SOURCE_STYLES:
         {
-            sal_Bool bTmp;
+            bool bTmp;
             if (SvXMLUnitConverter::convertBool(bTmp, rValue))
             {
                 bUseParagraphStyles = bTmp;
diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
index f2702a81ed20..82a5e9011228 100644
--- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
@@ -113,7 +113,7 @@ void XMLIndexTabStopEntryContext::StartElement(
             // #i21237#
             else if ( IsXMLToken( sLocalName, XML_WITH_TAB ) )
             {
-                sal_Bool bTmp;
+                bool bTmp;
                 if (SvXMLUnitConverter::convertBool(bTmp, sAttr))
                     bWithTab = bTmp;
             }
diff --git a/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx
index 240e702d2b2a..4942fd8d1beb 100644
--- a/xmloff/source/text/XMLIndexTableSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx
@@ -105,7 +105,7 @@ void XMLIndexTableSourceContext::ProcessAttribute(
     enum IndexSourceParamEnum eParam,
     const OUString& rValue)
 {
-    sal_Bool bTmp;
+    bool bTmp;
 
     switch (eParam)
     {
diff --git a/xmloff/source/text/XMLIndexUserSourceContext.cxx b/xmloff/source/text/XMLIndexUserSourceContext.cxx
index 2554229781b0..688d6d74797e 100644
--- a/xmloff/source/text/XMLIndexUserSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexUserSourceContext.cxx
@@ -107,7 +107,7 @@ void XMLIndexUserSourceContext::ProcessAttribute(
     enum IndexSourceParamEnum eParam,
     const OUString& rValue)
 {
-    sal_Bool bTmp;
+    bool bTmp;
 
     switch (eParam)
     {
diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx
index 55dc9db9b254..b301a987fe77 100644
--- a/xmloff/source/text/XMLLineNumberingImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx
@@ -138,7 +138,7 @@ void XMLLineNumberingImportContext::ProcessAttribute(
     enum LineNumberingToken eToken,
     OUString sValue)
 {
-    sal_Bool bTmp;
+    bool bTmp;
     sal_Int32 nTmp;
 
     switch (eToken)
diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx
index 4b9b94b1ced7..1e244f19713d 100644
--- a/xmloff/source/text/XMLSectionImportContext.cxx
+++ b/xmloff/source/text/XMLSectionImportContext.cxx
@@ -312,7 +312,7 @@ void XMLSectionImportContext::ProcessAttributes(
                 break;
             case XML_TOK_SECTION_IS_HIDDEN:
                 {
-                    sal_Bool bTmp;
+                    bool bTmp;
                     if (SvXMLUnitConverter::convertBool(bTmp, sAttr))
                     {
                         bIsCurrentlyVisible = !bTmp;
@@ -326,7 +326,7 @@ void XMLSectionImportContext::ProcessAttributes(
                 break;
             case XML_TOK_SECTION_PROTECT:
             {
-                sal_Bool bTmp;
+                bool bTmp;
                 if (SvXMLUnitConverter::convertBool(bTmp, sAttr))
                 {
                     bProtect = bTmp;
diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
index de61e78e564b..1e17b2554e06 100644
--- a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
@@ -128,7 +128,7 @@ void XMLSectionSourceDDEImportContext::StartElement(
                 break;
             case XML_TOK_SECTION_IS_AUTOMATIC_UPDATE:
             {
-                sal_Bool bTmp;
+                bool bTmp;
                 if (SvXMLUnitConverter::convertBool(
                     bTmp, xAttrList->getValueByIndex(nAttr)))
                 {
diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
index 6ded2b4d5cbd..3dc297de8a98 100644
--- a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
+++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
@@ -88,7 +88,7 @@ XMLTextFrameHyperlinkContext::XMLTextFrameHyperlinkContext(
             break;
         case XML_TOK_TEXT_HYPERLINK_SERVER_MAP:
             {
-                sal_Bool bTmp;
+                bool bTmp;
                 if( rImport.GetMM100UnitConverter().convertBool( bTmp,
                                                                   rValue ) )
                 {
diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.cxx b/xmloff/source/text/XMLTrackedChangesImportContext.cxx
index ed207fed6c37..ed297464e9e8 100644
--- a/xmloff/source/text/XMLTrackedChangesImportContext.cxx
+++ b/xmloff/source/text/XMLTrackedChangesImportContext.cxx
@@ -77,7 +77,7 @@ void XMLTrackedChangesImportContext::StartElement(
         {
             if ( IsXMLToken( sLocalName, XML_TRACK_CHANGES ) )
             {
-                sal_Bool bTmp;
+                bool bTmp;
                 if( SvXMLUnitConverter::convertBool(
                     bTmp, xAttrList->getValueByIndex(i)) )
                 {
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 579ad91ddfe9..b975dd976aff 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -713,8 +713,8 @@ void XMLSenderFieldImportContext::ProcessAttribute(
     if (XML_TOK_TEXTFIELD_FIXED == nAttrToken) {
 
         // set bVal
-        sal_Bool bVal;
-        sal_Bool bRet = GetImport().GetMM100UnitConverter().
+        bool bVal;
+        bool bRet = GetImport().GetMM100UnitConverter().
             convertBool(bVal, sAttrValue);
 
         // set bFixed if successfull
@@ -1132,7 +1132,7 @@ void XMLTimeFieldImportContext::ProcessAttribute(
         }
         case XML_TOK_TEXTFIELD_FIXED:
         {
-            sal_Bool bTmp;
+            bool bTmp;
             if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue))
             {
                 bFixed = bTmp;
@@ -1683,7 +1683,7 @@ void XMLSimpleDocInfoImportContext::ProcessAttribute(
 {
     if (XML_TOK_TEXTFIELD_FIXED == nAttrToken)
     {
-        sal_Bool bTmp;
+        bool bTmp;
         if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue))
         {
             bFixed = bTmp;
@@ -2076,7 +2076,7 @@ void XMLHiddenParagraphImportContext::ProcessAttribute(
     }
     else if (XML_TOK_TEXTFIELD_IS_HIDDEN == nAttrToken)
     {
-        sal_Bool bTmp;
+        bool bTmp;
         if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue))
         {
             bIsHidden = bTmp;
@@ -2150,7 +2150,7 @@ void XMLConditionalTextImportContext::ProcessAttribute(
             break;
         case XML_TOK_TEXTFIELD_CURRENT_VALUE:
         {
-            sal_Bool bTmp;
+            bool bTmp;
             if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue))
             {
                 bCurrentValue = bTmp;
@@ -2231,7 +2231,7 @@ void XMLHiddenTextImportContext::ProcessAttribute(
             break;
         case XML_TOK_TEXTFIELD_IS_HIDDEN:
         {
-            sal_Bool bTmp;
+            bool bTmp;
             if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue))
             {
                 bIsHidden = bTmp;
@@ -2298,7 +2298,7 @@ void XMLFileNameImportContext::ProcessAttribute(
     {
         case XML_TOK_TEXTFIELD_FIXED:
         {
-            sal_Bool bTmp;
+            bool bTmp;
             if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue))
             {
                 bFixed = bTmp;
@@ -2680,7 +2680,7 @@ void XMLPageVarSetFieldImportContext::ProcessAttribute(
     {
         case XML_TOK_TEXTFIELD_ACTIVE:
         {
-            sal_Bool bTmp;
+            bool bTmp;
             if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue))
             {
                 bActive = bTmp;
@@ -3113,7 +3113,7 @@ void XMLDdeFieldDeclImportContext::StartElement(
                 break;
             case XML_TOK_DDEFIELD_UPDATE:
             {
-                sal_Bool bTmp;
+                bool bTmp;
                 if ( SvXMLUnitConverter::convertBool(
                     bTmp, xAttrList->getValueByIndex(i)) )
                 {
@@ -3959,7 +3959,7 @@ bool lcl_ProcessLabel( const SvXMLImport& rImport,
             }
             else if( IsXMLToken( sLocalName, XML_CURRENT_SELECTED ) )
             {
-                sal_Bool bTmp;
+                bool bTmp;
                 if( SvXMLUnitConverter::convertBool( bTmp, sValue ) )
                     rIsSelected = bTmp;
             }
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index 4a338c6cf832..fa2f4cc08273 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -52,7 +52,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::table;
 using namespace ::com::sun::star::text;
 
-sal_Bool XMLTextImportPropertyMapper::handleSpecialItem(
+bool XMLTextImportPropertyMapper::handleSpecialItem(
             XMLPropertyState& rProperty,
             ::std::vector< XMLPropertyState >& rProperties,
             const ::rtl::OUString& rValue,
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 566c94ed166a..d0fca2f5745a 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -1540,7 +1540,8 @@ void XMLAlphaIndexMarkImportContext_Impl::ProcessAttribute(
         }
         else if ( IsXMLToken( sLocalName, XML_MAIN_ENTRY ) )
         {
-            sal_Bool bMainEntry = sal_False, bTmp;
+            sal_Bool bMainEntry = sal_False;
+            bool bTmp;
 
             if (SvXMLUnitConverter::convertBool(bTmp, sValue))
                 bMainEntry = bTmp;
@@ -1977,7 +1978,7 @@ XMLParaContext::XMLParaContext(
             break;
         case XML_TOK_TEXT_P_IS_LIST_HEADER:
             {
-                sal_Bool bBool;
+                bool bBool;
                 if( SvXMLUnitConverter::convertBool( bBool, rValue ) )
                 {
                     bIsListHeader = bBool;
@@ -1986,7 +1987,7 @@ XMLParaContext::XMLParaContext(
             break;
         case XML_TOK_TEXT_P_RESTART_NUMBERING:
             {
-                sal_Bool bBool;
+                bool bBool;
                 if (SvXMLUnitConverter::convertBool(bBool, rValue))
                 {
                     bIsRestart = bBool;
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index fb0a957f6c86..a9b550675aad 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -1373,7 +1373,7 @@ void XMLValueImportHelper::ProcessAttribute(
 
         case XML_TOK_TEXTFIELD_BOOL_VALUE:
         {
-            sal_Bool bTmp;
+            bool bTmp;
             sal_Bool bRet = SvXMLUnitConverter::convertBool(bTmp,sAttrValue);
             if (bRet) {
                 bFloatValueOK = sal_True;
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx
index 594b3a871fe6..1afdc33aa46a 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.cxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx
@@ -105,7 +105,7 @@ XFormsSubmissionContext::~XFormsSubmissionContext()
 Any toBool( const OUString& rValue )
 {
     Any aValue;
-    sal_Bool bValue;
+    bool bValue;
     if( SvXMLUnitConverter::convertBool( bValue, rValue ) )
     {
         aValue <<= ( bValue ? true : false );