xmloff: sal_Bool->bool

Change-Id: I1deb10cb1581137ab92e73367e63339822a9a094

27 files changed, 130 insertions, 130 deletions

diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index 58a2b0c59d63..7055ec1be0cc 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -196,8 +196,8 @@ namespace dbaccess
     public:
         virtual void    AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const OUString& i_rValue ) SAL_OVERRIDE;
         virtual void    AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, enum ::xmloff::token::XMLTokenEnum i_eValue ) SAL_OVERRIDE;
-        virtual void    StartElement( enum ::xmloff::token::XMLTokenEnum i_eName, const sal_Bool i_bIgnoreWhitespace ) SAL_OVERRIDE;
-        virtual void    EndElement  ( const sal_Bool i_bIgnoreWhitespace ) SAL_OVERRIDE;
+        virtual void    StartElement( enum ::xmloff::token::XMLTokenEnum i_eName, const bool i_bIgnoreWhitespace ) SAL_OVERRIDE;
+        virtual void    EndElement  ( const bool i_bIgnoreWhitespace ) SAL_OVERRIDE;
         virtual void    Characters( const OUString& i_rCharacters ) SAL_OVERRIDE;
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
@@ -225,7 +225,7 @@ namespace dbaccess
         m_rDelegator.addAttribute( impl_prefix( i_eName ), ::xmloff::token::GetXMLToken( i_eValue ) );
     }
 
-    void SettingsExportContext::StartElement( enum ::xmloff::token::XMLTokenEnum i_eName, const sal_Bool i_bIgnoreWhitespace )
+    void SettingsExportContext::StartElement( enum ::xmloff::token::XMLTokenEnum i_eName, const bool i_bIgnoreWhitespace )
     {
         if ( i_bIgnoreWhitespace )
             m_rDelegator.ignorableWhitespace( " " );
@@ -233,7 +233,7 @@ namespace dbaccess
         m_rDelegator.startElement( impl_prefix( i_eName ) );
     }
 
-    void SettingsExportContext::EndElement( const sal_Bool i_bIgnoreWhitespace )
+    void SettingsExportContext::EndElement( const bool i_bIgnoreWhitespace )
     {
         if ( i_bIgnoreWhitespace )
             m_rDelegator.ignorableWhitespace( " " );
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 1757d530b4a3..a2ac12a89fcd 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -1257,7 +1257,7 @@ void ODBExport::_ExportContent()
 
 void ODBExport::_ExportMasterStyles()
 {
-    GetPageExport()->exportMasterStyles( sal_True );
+    GetPageExport()->exportMasterStyles( true );
 }
 
 void ODBExport::_ExportAutoStyles()
diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx
index 99a7e055422b..d92193c028d1 100644
--- a/include/xmloff/XMLCharContext.hxx
+++ b/include/xmloff/XMLCharContext.hxx
@@ -41,7 +41,7 @@ public:
             const OUString& rLName,
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
             sal_Unicode c,
-            sal_Bool bCount );
+            bool bCount );
     XMLCharContext(
             SvXMLImport& rImport,
             sal_uInt16 nPrfx,
diff --git a/include/xmloff/XMLEventExport.hxx b/include/xmloff/XMLEventExport.hxx
index e9e67427b764..a65aa5d60a87 100644
--- a/include/xmloff/XMLEventExport.hxx
+++ b/include/xmloff/XMLEventExport.hxx
@@ -86,30 +86,30 @@ public:
     /// export the events (calls EventExport::Export(Reference<XNameAcess>) )
     void Export( ::com::sun::star::uno::Reference<
                      ::com::sun::star::document::XEventsSupplier> & xAccess,
-                sal_Bool bUseWhitespace = sal_True);
+                bool bUseWhitespace = true);
 
     /// export the events (calls EventExport::Export(Reference<XNameAcess>) )
     void Export( ::com::sun::star::uno::Reference<
                      ::com::sun::star::container::XNameReplace> & xAccess,
-                sal_Bool bUseWhitespace = sal_True);
+                bool bUseWhitespace = true);
 
     /// export the events (writes <office:events> element)
     void Export( ::com::sun::star::uno::Reference<
                      ::com::sun::star::container::XNameAccess> & xAccess,
-                sal_Bool bUseWhitespace = sal_True);
+                bool bUseWhitespace = true);
 
     /// export the events, but write <officeooo:events> element
     /// (for new file format additions)
     void ExportExt( ::com::sun::star::uno::Reference<
                      ::com::sun::star::container::XNameAccess> & xAccess,
-                sal_Bool bUseWhitespace = sal_True);
+                bool bUseWhitespace = true);
 
     /// export a single event (writes <office:events> element)
     void ExportSingleEvent(
         ::com::sun::star::uno::Sequence<
             ::com::sun::star::beans::PropertyValue>& rEventValues,
         const OUString& rApiEventName,
-        sal_Bool bUseWhitespace = sal_True );
+        bool bUseWhitespace = true );
 
 private:
 
@@ -118,14 +118,14 @@ private:
         ::com::sun::star::uno::Sequence<
             ::com::sun::star::beans::PropertyValue>& rEventValues,
         const XMLEventName& rXmlEventName,
-        sal_Bool bUseWhitespace,
-        sal_Bool& rExported);
+        bool bUseWhitespace,
+        bool& rExported);
 
     /// export the start element
-    SAL_DLLPRIVATE void StartElement(sal_Bool bUseWhitespace);
+    SAL_DLLPRIVATE void StartElement(bool bUseWhitespace);
 
     /// export the end element
-    SAL_DLLPRIVATE void EndElement(sal_Bool bUseWhitespace);
+    SAL_DLLPRIVATE void EndElement(bool bUseWhitespace);
 };
 
 #endif
diff --git a/include/xmloff/XMLEventsImportContext.hxx b/include/xmloff/XMLEventsImportContext.hxx
index 153b68097b1c..278c5cc6c658 100644
--- a/include/xmloff/XMLEventsImportContext.hxx
+++ b/include/xmloff/XMLEventsImportContext.hxx
@@ -106,7 +106,7 @@ public:
 
     /// if the import operates indelayed mode, you can use this method
     /// to obtain the value sequence for a specific event
-    sal_Bool GetEventSequence(
+    bool GetEventSequence(
         const OUString& rName,
         ::com::sun::star::uno::Sequence<
         ::com::sun::star::beans::PropertyValue> & rSequence );
diff --git a/include/xmloff/XMLFontStylesContext.hxx b/include/xmloff/XMLFontStylesContext.hxx
index b3ddeda9fdd4..f3b8ff2ad8c3 100644
--- a/include/xmloff/XMLFontStylesContext.hxx
+++ b/include/xmloff/XMLFontStylesContext.hxx
@@ -67,7 +67,7 @@ public:
         return *pFontStyleAttrTokenMap;
     }
 
-    sal_Bool FillProperties( const OUString& rName,
+    bool FillProperties( const OUString& rName,
                          ::std::vector< XMLPropertyState > &rProps,
                          sal_Int32 nFamilyNameIdx,
                          sal_Int32 nStyleNameIdx,
diff --git a/include/xmloff/XMLPageExport.hxx b/include/xmloff/XMLPageExport.hxx
index 7abb531579e0..0a5053960040 100644
--- a/include/xmloff/XMLPageExport.hxx
+++ b/include/xmloff/XMLPageExport.hxx
@@ -61,7 +61,7 @@ class XMLOFF_DLLPUBLIC XMLPageExport : public UniRefBase
         ::com::sun::star::container::XNameAccess > xPageStyles;
 
     ::std::vector< XMLPageExportNameEntry > aNameVector;
-    SAL_DLLPRIVATE sal_Bool findPageMasterName( const OUString& rStyleName, OUString& rPMName ) const;
+    SAL_DLLPRIVATE bool findPageMasterName( const OUString& rStyleName, OUString& rPMName ) const;
 
     UniReference < XMLPropertyHandlerFactory > xPageMasterPropHdlFactory;
     UniReference < XMLPropertySetMapper > xPageMasterPropSetMapper;
@@ -81,20 +81,20 @@ protected:
                     ::com::sun::star::beans::XPropertySet > & rPropSet,
                  bool bAutoStyles );
 
-    sal_Bool exportStyle(
+    bool exportStyle(
                 const ::com::sun::star::uno::Reference<
                     ::com::sun::star::style::XStyle >& rStyle,
-                sal_Bool bAutoStyles );
+                bool bAutoStyles );
 
-    void exportStyles( sal_Bool bUsed, sal_Bool bAutoStyles );
+    void exportStyles( bool bUsed, bool bAutoStyles );
 
 public:
     XMLPageExport( SvXMLExport& rExp );
     ~XMLPageExport();
 
-    void    collectAutoStyles( sal_Bool bUsed )     { exportStyles( bUsed, sal_True ); }
+    void    collectAutoStyles( bool bUsed )     { exportStyles( bUsed, true ); }
     void    exportAutoStyles();
-    void    exportMasterStyles( sal_Bool bUsed )    { exportStyles( bUsed, sal_False ); }
+    void    exportMasterStyles( bool bUsed )    { exportStyles( bUsed, false ); }
 
     //text grid enhancement for better CJK support
     void exportDefaultStyle();
diff --git a/include/xmloff/XMLSettingsExportContext.hxx b/include/xmloff/XMLSettingsExportContext.hxx
index f8eeab2fa244..b79104a29dff 100644
--- a/include/xmloff/XMLSettingsExportContext.hxx
+++ b/include/xmloff/XMLSettingsExportContext.hxx
@@ -41,8 +41,8 @@ namespace xmloff
                                       enum ::xmloff::token::XMLTokenEnum i_eValue ) = 0;
 
         virtual void    StartElement( enum ::xmloff::token::XMLTokenEnum i_eName,
-                                      const sal_Bool i_bIgnoreWhitespace ) = 0;
-        virtual void    EndElement(   const sal_Bool i_bIgnoreWhitespace ) = 0;
+                                      const bool i_bIgnoreWhitespace ) = 0;
+        virtual void    EndElement(   const bool i_bIgnoreWhitespace ) = 0;
 
         virtual void    Characters( const OUString& i_rCharacters ) = 0;
 
diff --git a/include/xmloff/XMLShapeStyleContext.hxx b/include/xmloff/XMLShapeStyleContext.hxx
index ab3da6dc2296..89662c09be30 100644
--- a/include/xmloff/XMLShapeStyleContext.hxx
+++ b/include/xmloff/XMLShapeStyleContext.hxx
@@ -35,7 +35,7 @@ class XMLOFF_DLLPUBLIC XMLShapeStyleContext: public XMLPropStyleContext
 protected:
     OUString     m_sControlDataStyleName;
     OUString     m_sListStyleName;
-    sal_Bool            m_bIsNumRuleAlreadyConverted;
+    bool         m_bIsNumRuleAlreadyConverted;
 
 protected:
     virtual void SetAttribute( sal_uInt16 nPrefixKey,
diff --git a/include/xmloff/XMLTextMasterPageContext.hxx b/include/xmloff/XMLTextMasterPageContext.hxx
index cfe9664351b7..929873b2d9d0 100644
--- a/include/xmloff/XMLTextMasterPageContext.hxx
+++ b/include/xmloff/XMLTextMasterPageContext.hxx
@@ -39,18 +39,18 @@ class XMLOFF_DLLPUBLIC XMLTextMasterPageContext : public SvXMLStyleContext
 
     ::com::sun::star::uno::Reference < ::com::sun::star::style::XStyle > xStyle;
 
-    sal_Bool bInsertHeader;
-    sal_Bool bInsertFooter;
-    sal_Bool bInsertHeaderLeft;
-    sal_Bool bInsertFooterLeft;
-    sal_Bool bInsertHeaderFirst;
-    sal_Bool bInsertFooterFirst;
-    sal_Bool bHeaderInserted;
-    sal_Bool bFooterInserted;
-    sal_Bool bHeaderLeftInserted;
-    sal_Bool bFooterLeftInserted;
-    sal_Bool bHeaderFirstInserted;
-    sal_Bool bFooterFirstInserted;
+    bool bInsertHeader;
+    bool bInsertFooter;
+    bool bInsertHeaderLeft;
+    bool bInsertFooterLeft;
+    bool bInsertHeaderFirst;
+    bool bInsertFooterFirst;
+    bool bHeaderInserted;
+    bool bFooterInserted;
+    bool bHeaderLeftInserted;
+    bool bFooterLeftInserted;
+    bool bHeaderFirstInserted;
+    bool bFooterFirstInserted;
 
     SAL_DLLPRIVATE ::com::sun::star::uno::Reference <
         ::com::sun::star::style::XStyle > Create();
@@ -65,7 +65,7 @@ public:
             const OUString& rLName,
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
-            sal_Bool bOverwrite );
+            bool bOverwrite );
     virtual ~XMLTextMasterPageContext();
 
     virtual SvXMLImportContext *CreateChildContext(
diff --git a/include/xmloff/XMLTextShapeStyleContext.hxx b/include/xmloff/XMLTextShapeStyleContext.hxx
index 0466914b7ea3..f33129787371 100644
--- a/include/xmloff/XMLTextShapeStyleContext.hxx
+++ b/include/xmloff/XMLTextShapeStyleContext.hxx
@@ -25,9 +25,9 @@
 
 class XMLOFF_DLLPUBLIC XMLTextShapeStyleContext : public XMLShapeStyleContext
 {
-    const OUString       sIsAutoUpdate;
+    const OUString        sIsAutoUpdate;
 
-    sal_Bool    bAutoUpdate : 1;
+    bool                  bAutoUpdate : 1;
 
     SvXMLImportContextRef xEventContext;
 
@@ -46,7 +46,7 @@ public:
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
             SvXMLStylesContext& rStyles, sal_uInt16 nFamily,
-            sal_Bool bDefaultStyle = sal_False );
+            bool bDefaultStyle = false );
     virtual ~XMLTextShapeStyleContext();
 
     virtual SvXMLImportContext *CreateChildContext(
@@ -54,7 +54,7 @@ public:
             const OUString& rLocalName,
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
 
-    sal_Bool IsAutoUpdate() const { return bAutoUpdate; }
+    bool IsAutoUpdate() const { return bAutoUpdate; }
 
     virtual void CreateAndInsert( sal_Bool bOverwrite ) SAL_OVERRIDE;
 
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index bf266d15bf2a..83de23239560 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -1293,7 +1293,7 @@ void ORptExport::_ExportContent()
 
 void ORptExport::_ExportMasterStyles()
 {
-    GetPageExport()->exportMasterStyles( sal_True );
+    GetPageExport()->exportMasterStyles( true );
 }
 
 void ORptExport::collectComponentStyles()
@@ -1356,7 +1356,7 @@ void ORptExport::_ExportAutoStyles()
     }
     // exported in _ExportMasterStyles
     if( (getExportFlags() & EXPORT_MASTERSTYLES) != 0 )
-        GetPageExport()->collectAutoStyles( sal_False );
+        GetPageExport()->collectAutoStyles( false );
     if( (getExportFlags() & EXPORT_MASTERSTYLES) != 0 )
         GetPageExport()->exportAutoStyles();
 }
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index 008ffc21e289..537ed00dfd69 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -192,7 +192,7 @@ void SwXMLExport::_ExportAutoStyles()
 
     // exported in _ExportMasterStyles
     if( (getExportFlags() & EXPORT_MASTERSTYLES) != 0 )
-        GetPageExport()->collectAutoStyles( sal_False );
+        GetPageExport()->collectAutoStyles( false );
 
     // if we don't export styles (i.e. in content stream only, but not
     // in single-stream case), then we can save ourselves a bit of
@@ -244,7 +244,7 @@ XMLPageExport* SwXMLExport::CreatePageExport()
 void SwXMLExport::_ExportMasterStyles()
 {
     // export master styles
-    GetPageExport()->exportMasterStyles( sal_False );
+    GetPageExport()->exportMasterStyles( false );
 }
 
 class SwXMLAutoStylePoolP : public SvXMLAutoStylePoolP
diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx
index 0df2dd5572ef..64adf5af38c6 100644
--- a/xmloff/source/core/SettingsExportHelper.cxx
+++ b/xmloff/source/core/SettingsExportHelper.cxx
@@ -185,14 +185,14 @@ void XMLSettingsExportHelper::exportBool(const bool bValue, const OUString& rNam
     DBG_ASSERT(!rName.isEmpty(), "no name");
     m_rContext.AddAttribute( XML_NAME, rName );
     m_rContext.AddAttribute( XML_TYPE, XML_BOOLEAN );
-    m_rContext.StartElement( XML_CONFIG_ITEM, sal_True );
+    m_rContext.StartElement( XML_CONFIG_ITEM, true );
     OUString sValue;
     if (bValue)
         sValue = GetXMLToken(XML_TRUE);
     else
         sValue = GetXMLToken(XML_FALSE);
     m_rContext.Characters( sValue );
-    m_rContext.EndElement( sal_False );
+    m_rContext.EndElement( false );
 }
 
 void XMLSettingsExportHelper::exportByte(const sal_Int8 nValue, const OUString& rName) const
@@ -208,11 +208,11 @@ void XMLSettingsExportHelper::exportShort(const sal_Int16 nValue, const OUString
     DBG_ASSERT(!rName.isEmpty(), "no name");
     m_rContext.AddAttribute( XML_NAME, rName );
     m_rContext.AddAttribute( XML_TYPE, XML_SHORT );
-    m_rContext.StartElement( XML_CONFIG_ITEM, sal_True );
+    m_rContext.StartElement( XML_CONFIG_ITEM, true );
     OUStringBuffer sBuffer;
 	::sax::Converter::convertNumber(sBuffer, sal_Int32(nValue));
     m_rContext.Characters( sBuffer.makeStringAndClear() );
-    m_rContext.EndElement( sal_False );
+    m_rContext.EndElement( false );
 }
 
 void XMLSettingsExportHelper::exportInt(const sal_Int32 nValue, const OUString& rName) const
@@ -220,11 +220,11 @@ void XMLSettingsExportHelper::exportInt(const sal_Int32 nValue, const OUString&
     DBG_ASSERT(!rName.isEmpty(), "no name");
     m_rContext.AddAttribute( XML_NAME, rName );
     m_rContext.AddAttribute( XML_TYPE, XML_INT );
-    m_rContext.StartElement( XML_CONFIG_ITEM, sal_True );
+    m_rContext.StartElement( XML_CONFIG_ITEM, true );
     OUStringBuffer sBuffer;
 	::sax::Converter::convertNumber(sBuffer, nValue);
     m_rContext.Characters( sBuffer.makeStringAndClear() );
-    m_rContext.EndElement( sal_False );
+    m_rContext.EndElement( false );
 }
 
 void XMLSettingsExportHelper::exportLong(const sal_Int64 nValue, const OUString& rName) const
@@ -232,10 +232,10 @@ void XMLSettingsExportHelper::exportLong(const sal_Int64 nValue, const OUString&
     DBG_ASSERT(!rName.isEmpty(), "no name");
     m_rContext.AddAttribute( XML_NAME, rName );
     m_rContext.AddAttribute( XML_TYPE, XML_LONG );
-    m_rContext.StartElement( XML_CONFIG_ITEM, sal_True );
+    m_rContext.StartElement( XML_CONFIG_ITEM, true );
     OUString sValue(OUString::number(nValue));
     m_rContext.Characters( sValue );
-    m_rContext.EndElement( sal_False );
+    m_rContext.EndElement( false );
 }
 
 void XMLSettingsExportHelper::exportDouble(const double fValue, const OUString& rName) const
@@ -243,11 +243,11 @@ void XMLSettingsExportHelper::exportDouble(const double fValue, const OUString&
     DBG_ASSERT(!rName.isEmpty(), "no name");
     m_rContext.AddAttribute( XML_NAME, rName );
     m_rContext.AddAttribute( XML_TYPE, XML_DOUBLE );
-    m_rContext.StartElement( XML_CONFIG_ITEM, sal_True );
+    m_rContext.StartElement( XML_CONFIG_ITEM, true );
     OUStringBuffer sBuffer;
 	::sax::Converter::convertDouble(sBuffer, fValue);
     m_rContext.Characters( sBuffer.makeStringAndClear() );
-    m_rContext.EndElement( sal_False );
+    m_rContext.EndElement( false );
 }
 
 void XMLSettingsExportHelper::exportString(const OUString& sValue, const OUString& rName) const
@@ -255,10 +255,10 @@ void XMLSettingsExportHelper::exportString(const OUString& sValue, const OUStrin
     DBG_ASSERT(!rName.isEmpty(), "no name");
     m_rContext.AddAttribute( XML_NAME, rName );
     m_rContext.AddAttribute( XML_TYPE, XML_STRING );
-    m_rContext.StartElement( XML_CONFIG_ITEM, sal_True );
+    m_rContext.StartElement( XML_CONFIG_ITEM, true );
     if (!sValue.isEmpty())
         m_rContext.Characters( sValue );
-    m_rContext.EndElement( sal_False );
+    m_rContext.EndElement( false );
 }
 
 void XMLSettingsExportHelper::exportDateTime(const util::DateTime& aValue, const OUString& rName) const
@@ -268,9 +268,9 @@ void XMLSettingsExportHelper::exportDateTime(const util::DateTime& aValue, const
     m_rContext.AddAttribute( XML_TYPE, XML_DATETIME );
     OUStringBuffer sBuffer;
     ::sax::Converter::convertDateTime(sBuffer, aValue, 0);
-    m_rContext.StartElement( XML_CONFIG_ITEM, sal_True );
+    m_rContext.StartElement( XML_CONFIG_ITEM, true );
     m_rContext.Characters( sBuffer.makeStringAndClear() );
-    m_rContext.EndElement( sal_False );
+    m_rContext.EndElement( false );
 }
 
 void XMLSettingsExportHelper::exportSequencePropertyValue(
@@ -282,10 +282,10 @@ void XMLSettingsExportHelper::exportSequencePropertyValue(
     if(nLength)
     {
         m_rContext.AddAttribute( XML_NAME, rName );
-        m_rContext.StartElement( XML_CONFIG_ITEM_SET, sal_True );
+        m_rContext.StartElement( XML_CONFIG_ITEM_SET, true );
         for (sal_Int32 i = 0; i < nLength; i++)
             CallTypeFunction(aProps[i].Value, aProps[i].Name);
-        m_rContext.EndElement( sal_True );
+        m_rContext.EndElement( true );
     }
 }
 void XMLSettingsExportHelper::exportSymbolDescriptors(
@@ -348,14 +348,14 @@ void XMLSettingsExportHelper::exportbase64Binary(
     sal_Int32 nLength(aProps.getLength());
     m_rContext.AddAttribute( XML_NAME, rName );
     m_rContext.AddAttribute( XML_TYPE, XML_BASE64BINARY );
-    m_rContext.StartElement( XML_CONFIG_ITEM, sal_True );
+    m_rContext.StartElement( XML_CONFIG_ITEM, true );
     if(nLength)
     {
         OUStringBuffer sBuffer;
 		::sax::Converter::encodeBase64(sBuffer, aProps);
         m_rContext.Characters( sBuffer.makeStringAndClear() );
     }
-    m_rContext.EndElement( sal_False );
+    m_rContext.EndElement( false );
 }
 
 void XMLSettingsExportHelper::exportMapEntry(const uno::Any& rAny,
@@ -370,10 +370,10 @@ void XMLSettingsExportHelper::exportMapEntry(const uno::Any& rAny,
     {
         if (bNameAccess)
             m_rContext.AddAttribute( XML_NAME, rName );
-        m_rContext.StartElement( XML_CONFIG_ITEM_MAP_ENTRY, sal_True );
+        m_rContext.StartElement( XML_CONFIG_ITEM_MAP_ENTRY, true );
         for (sal_Int32 i = 0; i < nLength; i++)
             CallTypeFunction(aProps[i].Value, aProps[i].Name);
-        m_rContext.EndElement( sal_True );
+        m_rContext.EndElement( true );
     }
 }
 
@@ -387,11 +387,11 @@ void XMLSettingsExportHelper::exportNameAccess(
     if(aNamed->hasElements())
     {
         m_rContext.AddAttribute( XML_NAME, rName );
-        m_rContext.StartElement( XML_CONFIG_ITEM_MAP_NAMED, sal_True );
+        m_rContext.StartElement( XML_CONFIG_ITEM_MAP_NAMED, true );
         uno::Sequence< OUString > aNames(aNamed->getElementNames());
         for (sal_Int32 i = 0; i < aNames.getLength(); i++)
             exportMapEntry(aNamed->getByName(aNames[i]), aNames[i], true);
-        m_rContext.EndElement( sal_True );
+        m_rContext.EndElement( true );
     }
 }
 
@@ -406,13 +406,13 @@ void XMLSettingsExportHelper::exportIndexAccess(
     if(aIndexed->hasElements())
     {
         m_rContext.AddAttribute( XML_NAME, rName );
-        m_rContext.StartElement( XML_CONFIG_ITEM_MAP_INDEXED, sal_True );
+        m_rContext.StartElement( XML_CONFIG_ITEM_MAP_INDEXED, true );
         sal_Int32 nCount = aIndexed->getCount();
         for (sal_Int32 i = 0; i < nCount; i++)
         {
             exportMapEntry(aIndexed->getByIndex(i), sEmpty, false);
         }
-        m_rContext.EndElement( sal_True );
+        m_rContext.EndElement( true );
     }
 }
 
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 8e9cbfedf0aa..b71b96d3fd66 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -156,8 +156,8 @@ public:
                                   enum ::xmloff::token::XMLTokenEnum i_eValue ) SAL_OVERRIDE;
 
     virtual void    StartElement( enum ::xmloff::token::XMLTokenEnum i_eName,
-                                  const sal_Bool i_bIgnoreWhitespace ) SAL_OVERRIDE;
-    virtual void    EndElement(   const sal_Bool i_bIgnoreWhitespace ) SAL_OVERRIDE;
+                                  const bool i_bIgnoreWhitespace ) SAL_OVERRIDE;
+    virtual void    EndElement(   const bool i_bIgnoreWhitespace ) SAL_OVERRIDE;
 
     virtual void    Characters( const OUString& i_rCharacters ) SAL_OVERRIDE;
 
@@ -178,14 +178,14 @@ void SettingsExportFacade::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eN
     m_rExport.AddAttribute( XML_NAMESPACE_CONFIG, i_eName, i_eValue );
 }
 
-void SettingsExportFacade::StartElement( enum ::xmloff::token::XMLTokenEnum i_eName, const sal_Bool i_bIgnoreWhitespace )
+void SettingsExportFacade::StartElement( enum ::xmloff::token::XMLTokenEnum i_eName, const bool i_bIgnoreWhitespace )
 {
     const OUString sElementName( m_rExport.GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_CONFIG, GetXMLToken( i_eName ) ) );
     m_rExport.StartElement( sElementName, i_bIgnoreWhitespace );
     m_aElements.push( sElementName );
 }
 
-void SettingsExportFacade::EndElement( const sal_Bool i_bIgnoreWhitespace )
+void SettingsExportFacade::EndElement( const bool i_bIgnoreWhitespace )
 {
     const OUString sElementName( m_aElements.top() );
     m_rExport.EndElement( sElementName, i_bIgnoreWhitespace );
@@ -1570,7 +1570,7 @@ void SvXMLExport::_ExportScripts()
 
     // export document events
     Reference< document::XEventsSupplier > xEvents( GetModel(), UNO_QUERY );
-    GetEventExport().Export( xEvents, sal_True );
+    GetEventExport().Export( xEvents, true );
 }
 
 void SvXMLExport::_ExportFontDecls()
diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx
index 0eac5f4fb24d..c6b03ee4b1dc 100644
--- a/xmloff/source/draw/XMLShapeStyleContext.cxx
+++ b/xmloff/source/draw/XMLShapeStyleContext.cxx
@@ -51,7 +51,7 @@ XMLShapeStyleContext::XMLShapeStyleContext(
     SvXMLStylesContext& rStyles,
     sal_uInt16 nFamily)
 :   XMLPropStyleContext(rImport, nPrfx, rLName, xAttrList, rStyles, nFamily ),
-    m_bIsNumRuleAlreadyConverted( sal_False )
+    m_bIsNumRuleAlreadyConverted( false )
 {
 }
 
@@ -125,7 +125,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet
 {
     if( !m_bIsNumRuleAlreadyConverted )
     {
-        m_bIsNumRuleAlreadyConverted = sal_True;
+        m_bIsNumRuleAlreadyConverted = true;
 
         // for compatibility to beta files, search for CTF_SD_NUMBERINGRULES_NAME to
         // import numbering rules from the style:properties element
diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx
index 6a303e6189ab..a27927c082af 100644
--- a/xmloff/source/script/XMLEventExport.cxx
+++ b/xmloff/source/script/XMLEventExport.cxx
@@ -93,7 +93,7 @@ void XMLEventExport::AddTranslationTable(
 }
 
 void XMLEventExport::Export( Reference<XEventsSupplier> & rSupplier,
-                             sal_Bool bWhitespace)
+                             bool bWhitespace)
 {
     if (rSupplier.is())
     {
@@ -104,14 +104,14 @@ void XMLEventExport::Export( Reference<XEventsSupplier> & rSupplier,
 }
 
 void XMLEventExport::Export( Reference<XNameReplace> & rReplace,
-                             sal_Bool bWhitespace)
+                             bool bWhitespace)
 {
     Reference<XNameAccess> xAccess(rReplace, UNO_QUERY);
     Export(xAccess, bWhitespace);
 }
 
 void XMLEventExport::Export( Reference<XNameAccess> & rAccess,
-                             sal_Bool bWhitespace)
+                             bool bWhitespace)
 {
     // early out if we don't actually get any events
     if (!rAccess.is())
@@ -120,7 +120,7 @@ void XMLEventExport::Export( Reference<XNameAccess> & rAccess,
     }
 
     // have we already processed an element?
-    sal_Bool bStarted = sal_False;
+    bool bStarted = false;
 
     // iterate over all event types
     Sequence<OUString> aNames = rAccess->getElementNames();
@@ -160,7 +160,7 @@ void XMLEventExport::Export( Reference<XNameAccess> & rAccess,
 }
 
 void XMLEventExport::ExportExt( Reference<XNameAccess> & rAccess,
-                                sal_Bool bWhitespace )
+                                bool bWhitespace )
 {
     // set bExtNamespace flag to use XML_NAMESPACE_OFFICE_EXT namespace
     // for events element (not for child elements)
@@ -173,7 +173,7 @@ void XMLEventExport::ExportExt( Reference<XNameAccess> & rAccess,
 void XMLEventExport::ExportSingleEvent(
     Sequence<PropertyValue>& rEventValues,
     const OUString& rApiEventName,
-    sal_Bool bUseWhitespace )
+    bool bUseWhitespace )
 {
     // translate the name
     NameMap::iterator aIter = aNameTranslationMap.find(rApiEventName);
@@ -182,7 +182,7 @@ void XMLEventExport::ExportSingleEvent(
         const XMLEventName& rXmlName = aIter->second;
 
         // export the event ...
-        sal_Bool bStarted = sal_False;
+        bool bStarted = false;
         ExportEvent( rEventValues, rXmlName, bUseWhitespace, bStarted );
 
         // ... and close the container element (if necessary)
@@ -207,8 +207,8 @@ void XMLEventExport::ExportSingleEvent(
 void XMLEventExport::ExportEvent(
     Sequence<PropertyValue>& rEventValues,
     const XMLEventName& rXmlEventName,
-    sal_Bool bUseWhitespace,
-    sal_Bool& rExported )
+    bool bUseWhitespace,
+    bool& rExported )
 {
     // search for EventType value and then delegate to EventHandler
     sal_Int32 nValues = rEventValues.getLength();
@@ -228,7 +228,7 @@ void XMLEventExport::ExportEvent(
                 {
                     // OK, we have't yet exported the enclosing
                     // element. So we do that now.
-                    rExported = sal_True;
+                    rExported = true;
                     StartElement(bUseWhitespace);
                 }
 
@@ -258,7 +258,7 @@ void XMLEventExport::ExportEvent(
 }
 
 
-void XMLEventExport::StartElement(sal_Bool bWhitespace)
+void XMLEventExport::StartElement(bool bWhitespace)
 {
     if (bWhitespace)
     {
@@ -270,7 +270,7 @@ void XMLEventExport::StartElement(sal_Bool bWhitespace)
                           bWhitespace);
 }
 
-void XMLEventExport::EndElement(sal_Bool bWhitespace)
+void XMLEventExport::EndElement(bool bWhitespace)
 {
     sal_uInt16 nNamespace = bExtNamespace ? XML_NAMESPACE_OFFICE_EXT
                                           : XML_NAMESPACE_OFFICE;
diff --git a/xmloff/source/script/XMLEventsImportContext.cxx b/xmloff/source/script/XMLEventsImportContext.cxx
index de2a8c1f8a3e..e6edda892421 100644
--- a/xmloff/source/script/XMLEventsImportContext.cxx
+++ b/xmloff/source/script/XMLEventsImportContext.cxx
@@ -158,7 +158,7 @@ void XMLEventsImportContext::SetEvents(
     }
 }
 
-sal_Bool XMLEventsImportContext::GetEventSequence(
+bool XMLEventsImportContext::GetEventSequence(
     const OUString& rName,
     Sequence<PropertyValue> & rSequence )
 {
@@ -174,7 +174,7 @@ sal_Bool XMLEventsImportContext::GetEventSequence(
     }
 
     // if we're not at the end, set the sequence
-    sal_Bool bRet = (aIter != aCollectEvents.end());
+    bool bRet = (aIter != aCollectEvents.end());
     if (bRet)
         rSequence = aIter->second;
 
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx
index f6006aa60a88..e19bb47b9b68 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -375,7 +375,7 @@ XMLFontStylesContext::~XMLFontStylesContext()
     delete pFontStyleAttrTokenMap;
 }
 
-sal_Bool XMLFontStylesContext::FillProperties( const OUString& rName,
+bool XMLFontStylesContext::FillProperties( const OUString& rName,
                          ::std::vector< XMLPropertyState > &rProps,
                          sal_Int32 nFamilyNameIdx,
                          sal_Int32 nStyleNameIdx,
diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx
index b095ee6b6df2..7335548eebda 100644
--- a/xmloff/source/style/XMLPageExport.cxx
+++ b/xmloff/source/style/XMLPageExport.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::beans;
 using namespace ::xmloff::token;
 
-sal_Bool XMLPageExport::findPageMasterName( const OUString& rStyleName, OUString& rPMName ) const
+bool XMLPageExport::findPageMasterName( const OUString& rStyleName, OUString& rPMName ) const
 {
     for( ::std::vector< XMLPageExportNameEntry >::const_iterator pEntry = aNameVector.begin();
             pEntry != aNameVector.end(); ++pEntry )
@@ -48,10 +48,10 @@ sal_Bool XMLPageExport::findPageMasterName( const OUString& rStyleName, OUString
         if( pEntry->sStyleName == rStyleName )
         {
             rPMName = pEntry->sPageMasterName;
-            return sal_True;
+            return true;
         }
     }
-    return sal_False;
+    return false;
 }
 
 void XMLPageExport::collectPageMasterAutoStyle(
@@ -79,9 +79,9 @@ void XMLPageExport::exportMasterPageContent(
 
 }
 
-sal_Bool XMLPageExport::exportStyle(
+bool XMLPageExport::exportStyle(
             const Reference< XStyle >& rStyle,
-            sal_Bool bAutoStyles )
+            bool bAutoStyles )
 {
     Reference< XPropertySet > xPropSet( rStyle, UNO_QUERY );
     Reference< XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo();
@@ -92,7 +92,7 @@ sal_Bool XMLPageExport::exportStyle(
     {
         Any aAny = xPropSet->getPropertyValue( sIsPhysical );
         if( !*(sal_Bool *)aAny.getValue() )
-            return sal_False;
+            return false;
     }
 
     if( bAutoStyles )
@@ -146,7 +146,7 @@ sal_Bool XMLPageExport::exportStyle(
         exportMasterPageContent( xPropSet, false );
     }
 
-    return sal_True;
+    return true;
 }
 
 XMLPageExport::XMLPageExport( SvXMLExport& rExp ) :
@@ -192,7 +192,7 @@ XMLPageExport::~XMLPageExport()
 {
 }
 
-void XMLPageExport::exportStyles( sal_Bool bUsed, sal_Bool bAutoStyles )
+void XMLPageExport::exportStyles( bool bUsed, bool bAutoStyles )
 {
     if( xPageStyles.is() )
     {
diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx
index fab82d33b4cb..dd60e4a33aa5 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.cxx
@@ -192,7 +192,7 @@ void XMLAutoTextEventExport::exportEvents()
 {
     DBG_ASSERT(hasEvents(), "no events to export!");
 
-    GetEventExport().Export(xEvents, sal_True);
+    GetEventExport().Export(xEvents, true);
 }
 
 
diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx
index d4e90b404a70..7eeeeadfd083 100644
--- a/xmloff/source/text/XMLTextMasterPageContext.cxx
+++ b/xmloff/source/text/XMLTextMasterPageContext.cxx
@@ -62,23 +62,23 @@ TYPEINIT1( XMLTextMasterPageContext, SvXMLStyleContext );
 XMLTextMasterPageContext::XMLTextMasterPageContext( SvXMLImport& rImport,
         sal_uInt16 nPrfx, const OUString& rLName,
         const Reference< XAttributeList > & xAttrList,
-        sal_Bool bOverwrite )
+        bool bOverwrite )
 :   SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_MASTER_PAGE )
 ,   sIsPhysical( "IsPhysical" )
 ,   sPageStyleLayout( "PageStyleLayout" )
 ,   sFollowStyle( "FollowStyle" )
-,   bInsertHeader( sal_False )
-,   bInsertFooter( sal_False )
-,   bInsertHeaderLeft( sal_False )
-,   bInsertFooterLeft( sal_False )
-,   bInsertHeaderFirst( sal_False )
-,   bInsertFooterFirst( sal_False )
-,   bHeaderInserted( sal_False )
-,   bFooterInserted( sal_False )
-,   bHeaderLeftInserted( sal_False )
-,   bFooterLeftInserted( sal_False )
-,   bHeaderFirstInserted( sal_False )
-,   bFooterFirstInserted( sal_False )
+,   bInsertHeader( false )
+,   bInsertFooter( false )
+,   bInsertHeaderLeft( false )
+,   bInsertFooterLeft( false )
+,   bInsertHeaderFirst( false )
+,   bInsertFooterFirst( false )
+,   bHeaderInserted( false )
+,   bFooterInserted( false )
+,   bHeaderLeftInserted( false )
+,   bFooterLeftInserted( false )
+,   bHeaderFirstInserted( false )
+,   bFooterFirstInserted( false )
 {
     OUString sName, sDisplayName;
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -163,9 +163,9 @@ XMLTextMasterPageContext::XMLTextMasterPageContext( SvXMLImport& rImport,
         if( xMultiStates.is() )
             xMultiStates->setAllPropertiesToDefault();
 
-        bInsertHeader = bInsertFooter = sal_True;
-        bInsertHeaderLeft = bInsertFooterLeft = sal_True;
-        bInsertHeaderFirst = bInsertFooterFirst = sal_True;
+        bInsertHeader = bInsertFooter = true;
+        bInsertHeaderLeft = bInsertFooterLeft = true;
+        bInsertHeaderFirst = bInsertFooterFirst = true;
     }
 }
 
@@ -190,14 +190,14 @@ SvXMLImportContext *XMLTextMasterPageContext::CreateChildContext(
         if( bInsertHeader && !bHeaderInserted )
         {
             bInsert = sal_True;
-            bHeaderInserted = sal_True;
+            bHeaderInserted = true;
         }
         break;
     case XML_TOK_TEXT_MP_FOOTER:
         if( bInsertFooter && !bFooterInserted )
         {
             bInsert = bFooter = sal_True;
-            bFooterInserted = sal_True;
+            bFooterInserted = true;
         }
         break;
     case XML_TOK_TEXT_MP_HEADER_LEFT:
diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx
index 11306f907858..b75d5e5f1f76 100644
--- a/xmloff/source/text/XMLTextShapeStyleContext.cxx
+++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx
@@ -128,7 +128,7 @@ void XMLTextShapeStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
         IsXMLToken( rLocalName, XML_AUTO_UPDATE ) )
     {
           if( IsXMLToken( rValue, XML_TRUE ) )
-            bAutoUpdate = sal_True;
+            bAutoUpdate = true;
     }
     else
     {
@@ -142,11 +142,11 @@ XMLTextShapeStyleContext::XMLTextShapeStyleContext( SvXMLImport& rImport,
         sal_uInt16 nPrfx, const OUString& rLName,
         const Reference< XAttributeList > & xAttrList,
         SvXMLStylesContext& rStyles, sal_uInt16 nFamily,
-        sal_Bool /*bDefaultStyle*/ ) :
+        bool /*bDefaultStyle*/ ) :
     XMLShapeStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles,
                           nFamily ),
     sIsAutoUpdate( "IsAutoUpdate" ),
-    bAutoUpdate( sal_False )
+    bAutoUpdate( false )
 {
 }
 
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 4cb16199a3d0..1649300ed4fb 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -1023,7 +1023,7 @@ void XMLTextFieldExport::ExportField(
             Any aAny = xRangePropSet->getPropertyValue(sHyperLinkEvents);
             Reference<XNameReplace> xName;
             aAny >>= xName;
-            GetExport().GetEventExport().Export(xName, sal_False);
+            GetExport().GetEventExport().Export(xName, false);
         }
     }
 
@@ -2308,7 +2308,7 @@ void XMLTextFieldExport::ExportMacro(
     }
 
     // 2) export the sequence
-    GetExport().GetEventExport().ExportSingleEvent( aSeq, sOnClick, sal_False );
+    GetExport().GetEventExport().ExportSingleEvent( aSeq, sOnClick, false );
 
     // and finally, the field presentation
     GetExport().Characters(rContent);
diff --git a/xmloff/source/text/txtftne.cxx b/xmloff/source/text/txtftne.cxx
index eb6aed45c50b..31bfde9feed6 100644
--- a/xmloff/source/text/txtftne.cxx
+++ b/xmloff/source/text/txtftne.cxx
@@ -121,7 +121,7 @@ void XMLTextParagraphExport::exportTextFootnote(
                 Any a = rPropSet->getPropertyValue(sHyperLinkEvents);
                 Reference<XNameReplace> xName;
                 a >>= xName;
-                GetExport().GetEventExport().Export(xName, sal_False);
+                GetExport().GetEventExport().Export(xName, false);
             }
         }
 
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index a1315f0ecba8..e965708f1238 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -3397,7 +3397,7 @@ void XMLTextParagraphExport::exportTextRange(
             if (xPropSetInfo->hasPropertyByName(sHyperLinkEvents))
             {
                 Reference< XNameReplace > xName( xPropSet->getPropertyValue( sHyperLinkEvents ), uno::UNO_QUERY );
-                GetExport().GetEventExport().Export( xName, sal_False );
+                GetExport().GetEventExport().Export( xName, false );
             }
 
             exportTextRangeSpan( rTextRange, xPropSet, xPropSetInfo, bIsUICharStyle, bHasAutoStyle, sStyle, rPrevCharIsSpace, openFieldMark );
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index ad19b00707b1..bfa03d8b4b53 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -74,7 +74,7 @@ XMLCharContext::XMLCharContext(
         const OUString& rLName,
         const Reference< xml::sax::XAttributeList > & xAttrList,
         sal_Unicode c,
-        sal_Bool bCount ) :
+        bool bCount ) :
     SvXMLImportContext( rImport, nPrfx, rLName )
     ,m_nControl(0)
     ,m_nCount(1)
@@ -1585,7 +1585,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
     case XML_TOK_TEXT_TAB_STOP:
         pContext = new XMLCharContext( rImport, nPrefix,
                                                rLocalName, xAttrList,
-                                               0x0009, sal_False );
+                                               0x0009, false );
         rIgnoreLeadingSpace = sal_False;
         break;
 
@@ -1599,7 +1599,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
     case XML_TOK_TEXT_S:
         pContext = new XMLCharContext( rImport, nPrefix,
                                                rLocalName, xAttrList,
-                                               0x0020, sal_True );
+                                               0x0020, true );
         break;
 
     case XML_TOK_TEXT_HYPERLINK: