Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code

Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274

42 files changed, 220 insertions, 220 deletions

diff --git a/xmloff/inc/AttributeContainerHandler.hxx b/xmloff/inc/AttributeContainerHandler.hxx
index 72fb4823b2ee..d3301986ad3e 100644
--- a/xmloff/inc/AttributeContainerHandler.hxx
+++ b/xmloff/inc/AttributeContainerHandler.hxx
@@ -30,10 +30,10 @@ class XMLAttributeContainerHandler : public XMLPropertyHandler
 public:
     virtual ~XMLAttributeContainerHandler();
 
-    virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE;
+    virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override;
 
-    virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE;
-    virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE;
+    virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
+    virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_ATTRIBUTECONTAINERHANDLER_HXX
diff --git a/xmloff/inc/DomBuilderContext.hxx b/xmloff/inc/DomBuilderContext.hxx
index 8de8e46686b7..4031e46ab867 100644
--- a/xmloff/inc/DomBuilderContext.hxx
+++ b/xmloff/inc/DomBuilderContext.hxx
@@ -77,14 +77,14 @@ public:
     virtual SvXMLImportContext* CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE;
+        const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
 
     virtual void StartElement(
-        const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE;
+        const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
 
-    virtual void EndElement() SAL_OVERRIDE;
+    virtual void EndElement() override;
 
-    virtual void Characters( const OUString& rChars ) SAL_OVERRIDE;
+    virtual void Characters( const OUString& rChars ) override;
 };
 
 #endif
diff --git a/xmloff/inc/MetaExportComponent.hxx b/xmloff/inc/MetaExportComponent.hxx
index 95bcf8a1ae7e..31194b239693 100644
--- a/xmloff/inc/MetaExportComponent.hxx
+++ b/xmloff/inc/MetaExportComponent.hxx
@@ -40,18 +40,18 @@ public:
 protected:
     // export the events off all autotexts
     virtual sal_uInt32 exportDoc(
-        enum ::xmloff::token::XMLTokenEnum eClass = xmloff::token::XML_TOKEN_INVALID ) SAL_OVERRIDE;
+        enum ::xmloff::token::XMLTokenEnum eClass = xmloff::token::XML_TOKEN_INVALID ) override;
 
     // accept XDocumentProperties in addition to XModel
-    virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
 
     // override
-    virtual void _ExportMeta() SAL_OVERRIDE;
+    virtual void _ExportMeta() override;
 
     // methods without content:
-    virtual void _ExportAutoStyles() SAL_OVERRIDE;
-    virtual void _ExportMasterStyles() SAL_OVERRIDE;
-    virtual void _ExportContent() SAL_OVERRIDE;
+    virtual void _ExportAutoStyles() override;
+    virtual void _ExportMasterStyles() override;
+    virtual void _ExportContent() override;
 };
 
 #endif
diff --git a/xmloff/inc/MetaImportComponent.hxx b/xmloff/inc/MetaImportComponent.hxx
index fa20849a8d2b..0df495ded7df 100644
--- a/xmloff/inc/MetaImportComponent.hxx
+++ b/xmloff/inc/MetaImportComponent.hxx
@@ -47,11 +47,11 @@ protected:
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+            ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
 
     // XImporter
     virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc )
-        throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
 };
 
 
diff --git a/xmloff/inc/PageMasterImportContext.hxx b/xmloff/inc/PageMasterImportContext.hxx
index 876773da9499..cd10951b8e36 100644
--- a/xmloff/inc/PageMasterImportContext.hxx
+++ b/xmloff/inc/PageMasterImportContext.hxx
@@ -35,7 +35,7 @@ protected:
 
     virtual void SetAttribute( sal_uInt16 nPrefixKey,
                                const OUString& rLocalName,
-                               const OUString& rValue ) SAL_OVERRIDE;
+                               const OUString& rValue ) override;
 
 public:
 
@@ -51,14 +51,14 @@ public:
     virtual SvXMLImportContext *CreateChildContext(
             sal_uInt16 nPrefix,
             const OUString& rLocalName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
 
     virtual void FillPropertySet(
             const ::com::sun::star::uno::Reference<
-                ::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_OVERRIDE;
+                ::com::sun::star::beans::XPropertySet > & rPropSet ) override;
 
     //text grid enhancement
-    virtual void SetDefaults() SAL_OVERRIDE;
+    virtual void SetDefaults() override;
 };
 
 #endif
diff --git a/xmloff/inc/SchXMLExport.hxx b/xmloff/inc/SchXMLExport.hxx
index dc07b786596b..95c9b10f1fda 100644
--- a/xmloff/inc/SchXMLExport.hxx
+++ b/xmloff/inc/SchXMLExport.hxx
@@ -42,12 +42,12 @@ private:
     rtl::Reference<SchXMLExportHelper> maExportHelper;
 
 protected:
-    virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) SAL_OVERRIDE;
+    virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) override;
 
-    virtual void _ExportStyles( bool bUsed ) SAL_OVERRIDE;
-    virtual void _ExportAutoStyles() SAL_OVERRIDE;
-    virtual void _ExportMasterStyles() SAL_OVERRIDE;
-    virtual void _ExportContent() SAL_OVERRIDE;
+    virtual void _ExportStyles( bool bUsed ) override;
+    virtual void _ExportAutoStyles() override;
+    virtual void _ExportMasterStyles() override;
+    virtual void _ExportContent() override;
 
 public:
     SchXMLExport(
diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx
index 648db1a0d304..596b3f173519 100644
--- a/xmloff/inc/SchXMLImport.hxx
+++ b/xmloff/inc/SchXMLImport.hxx
@@ -166,7 +166,7 @@ protected:
     virtual SvXMLImportContext *CreateContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE;
+        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
 
 public:
     SchXMLImport(
@@ -179,7 +179,7 @@ public:
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
     // XImporter
-    virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_SCHXMLIMPORT_HXX
diff --git a/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx
index 04faf515f67f..e47d3d17d250 100644
--- a/xmloff/inc/StyleMap.hxx
+++ b/xmloff/inc/StyleMap.hxx
@@ -80,7 +80,7 @@ public:
 
     // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething(
-                const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_STYLEMAP_HXX
diff --git a/xmloff/inc/XMLBackgroundImageContext.hxx b/xmloff/inc/XMLBackgroundImageContext.hxx
index 36f68fe224b1..42a7ed18dc72 100644
--- a/xmloff/inc/XMLBackgroundImageContext.hxx
+++ b/xmloff/inc/XMLBackgroundImageContext.hxx
@@ -67,9 +67,9 @@ public:
     SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                 const OUString& rLocalName,
                  const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+                    ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
 
-    virtual void EndElement() SAL_OVERRIDE;
+    virtual void EndElement() override;
 };
 
 
diff --git a/xmloff/inc/XMLBasicExportFilter.hxx b/xmloff/inc/XMLBasicExportFilter.hxx
index a0b2644c81c0..dac0afb27744 100644
--- a/xmloff/inc/XMLBasicExportFilter.hxx
+++ b/xmloff/inc/XMLBasicExportFilter.hxx
@@ -40,22 +40,22 @@ public:
 
     // XDocumentHandler
     virtual void SAL_CALL startDocument()
-        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL endDocument()
-        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL startElement( const OUString& aName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs )
-        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL endElement( const OUString& aName )
-        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL characters( const OUString& aChars )
-        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
-        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData )
-        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator )
-        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_XMLBASICEXPORTFILTER_HXX
diff --git a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
index 2809e0e6be8b..f451dcc22f3b 100644
--- a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
+++ b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
@@ -41,13 +41,13 @@ public:
     virtual bool importXML(
             const OUString& rStrImpValue,
             ::com::sun::star::uno::Any& rValue,
-            const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE;
+            const SvXMLUnitConverter& rUnitConverter ) const override;
 
     /// Exports the given value in cas of the given XML-data-type
     virtual bool exportXML(
             OUString& rStrExpValue,
             const ::com::sun::star::uno::Any& rValue,
-            const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE;
+            const SvXMLUnitConverter& rUnitConverter ) const override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_XMLBITMAPLOGICALSIZEPROPERTYHANDLER_HXX
diff --git a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
index c1a77469db2d..1f9ac3dc0c6f 100644
--- a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
+++ b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
@@ -43,13 +43,13 @@ public:
     virtual bool importXML(
             const OUString& rStrImpValue,
             ::com::sun::star::uno::Any& rValue,
-            const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE;
+            const SvXMLUnitConverter& rUnitConverter ) const override;
 
     /// Exports the given value in cas of the given XML-data-type
     virtual bool exportXML(
             OUString& rStrExpValue,
             const ::com::sun::star::uno::Any& rValue,
-            const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE;
+            const SvXMLUnitConverter& rUnitConverter ) const override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_XMLBITMAPREPEATOFFSETPROPERTYHANDLER_HXX
diff --git a/xmloff/inc/XMLChartPropertySetMapper.hxx b/xmloff/inc/XMLChartPropertySetMapper.hxx
index 3f27bf5370a5..90e6db8d8dea 100644
--- a/xmloff/inc/XMLChartPropertySetMapper.hxx
+++ b/xmloff/inc/XMLChartPropertySetMapper.hxx
@@ -32,7 +32,7 @@ class XMLChartPropHdlFactory : public XMLPropertyHandlerFactory
 {
 public:
     virtual ~XMLChartPropHdlFactory();
-    virtual const XMLPropertyHandler* GetPropertyHandler( sal_Int32 nType ) const SAL_OVERRIDE;
+    virtual const XMLPropertyHandler* GetPropertyHandler( sal_Int32 nType ) const override;
 };
 
 class XMLChartPropertySetMapper : public XMLPropertySetMapper
@@ -53,7 +53,7 @@ protected:
         bool bEnableFoFontFamily,
         ::std::vector< XMLPropertyState >& rProperties,
         ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet > rPropSet ) const SAL_OVERRIDE;
+            ::com::sun::star::beans::XPropertySet > rPropSet ) const override;
 
 private:
     /// this method is called for every item that has the MID_FLAG_ELEMENT_EXPORT flag set
@@ -61,14 +61,14 @@ private:
         SvXMLExport& rExport,
         const XMLPropertyState& rProperty, SvXmlExportFlags nFlags,
         const ::std::vector< XMLPropertyState > *pProperties = 0,
-        sal_uInt32 nIdx = 0  ) const SAL_OVERRIDE;
+        sal_uInt32 nIdx = 0  ) const override;
 
     /// this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_EXPORT flag set
     virtual void handleSpecialItem(
         SvXMLAttributeList& rAttrList, const XMLPropertyState& rProperty,
         const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap,
         const ::std::vector< XMLPropertyState > *pProperties = 0,
-        sal_uInt32 nIdx = 0  ) const SAL_OVERRIDE;
+        sal_uInt32 nIdx = 0  ) const override;
 
 public:
     XMLChartExportPropertyMapper( const rtl::Reference< XMLPropertySetMapper >& rMapper,
@@ -94,11 +94,11 @@ public:
         ::std::vector< XMLPropertyState >& rProperties,
         const OUString& rValue,
         const SvXMLUnitConverter& rUnitConverter,
-        const SvXMLNamespaceMap& rNamespaceMap ) const SAL_OVERRIDE;
+        const SvXMLNamespaceMap& rNamespaceMap ) const override;
 
     virtual void finished(
         ::std::vector< XMLPropertyState >& rProperties,
-        sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const SAL_OVERRIDE;
+        sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_XMLCHARTPROPERTYSETMAPPER_HXX
diff --git a/xmloff/inc/XMLChartStyleContext.hxx b/xmloff/inc/XMLChartStyleContext.hxx
index c199e90adb94..c20fcc6c29fd 100644
--- a/xmloff/inc/XMLChartStyleContext.hxx
+++ b/xmloff/inc/XMLChartStyleContext.hxx
@@ -32,7 +32,7 @@ protected:
     /// is called when an attribute at the (auto)style element is found
     virtual void SetAttribute( sal_uInt16 nPrefixKey,
                                const OUString& rLocalName,
-                               const OUString& rValue ) SAL_OVERRIDE;
+                               const OUString& rValue ) override;
 
 public:
     TYPEINFO_OVERRIDE();
@@ -47,13 +47,13 @@ public:
     /// is called after all styles have been read to apply styles
     void FillPropertySet(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet > & rPropSet ) override;
 
     /// necessary for property context (element-property symbol-image)
     virtual SvXMLImportContext *CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+        const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_XMLCHARTSTYLECONTEXT_HXX
diff --git a/xmloff/inc/XMLClipPropertyHandler.hxx b/xmloff/inc/XMLClipPropertyHandler.hxx
index 4206f2e596f4..b415fd253421 100644
--- a/xmloff/inc/XMLClipPropertyHandler.hxx
+++ b/xmloff/inc/XMLClipPropertyHandler.hxx
@@ -32,9 +32,9 @@ public:
     XMLClipPropertyHandler( bool bODF11 );
     virtual ~XMLClipPropertyHandler();
 
-    virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE;
-    virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE;
-    virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE;
+    virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override;
+    virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
+    virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_XMLCLIPPROPERTYHANDLER_HXX
diff --git a/xmloff/inc/XMLElementPropertyContext.hxx b/xmloff/inc/XMLElementPropertyContext.hxx
index 02f7c06267f5..26d296defc27 100644
--- a/xmloff/inc/XMLElementPropertyContext.hxx
+++ b/xmloff/inc/XMLElementPropertyContext.hxx
@@ -48,7 +48,7 @@ public:
 
     virtual ~XMLElementPropertyContext();
 
-    virtual void EndElement() SAL_OVERRIDE;
+    virtual void EndElement() override;
 };
 
 
diff --git a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
index 0c6fba36f7a7..20df48e18164 100644
--- a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
+++ b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
@@ -51,13 +51,13 @@ public:
 
     virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const OUString& rLocalName,
-                                   const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE;
+                                   const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
 
-    virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE;
+    virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
 
-    virtual void EndElement() SAL_OVERRIDE;
+    virtual void EndElement() override;
 
-    virtual void Characters( const OUString& rChars ) SAL_OVERRIDE;
+    virtual void Characters( const OUString& rChars ) override;
 
     bool SetComponent(
         ::com::sun::star::uno::Reference<
diff --git a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
index bc14d9f2f3ff..40b59bb3318b 100644
--- a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
+++ b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
@@ -41,13 +41,13 @@ public:
     virtual bool importXML(
             const OUString& rStrImpValue,
             ::com::sun::star::uno::Any& rValue,
-            const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE;
+            const SvXMLUnitConverter& rUnitConverter ) const override;
 
     /// Exports the given value in cas of the given XML-data-type
     virtual bool exportXML(
             OUString& rStrExpValue,
             const ::com::sun::star::uno::Any& rValue,
-            const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE;
+            const SvXMLUnitConverter& rUnitConverter ) const override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_XMLFILLBITMAPSIZEPROPERTYHANDLER_HXX
diff --git a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
index 2efee5736ddc..6f5195cd2923 100644
--- a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
+++ b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
@@ -79,14 +79,14 @@ public:
     /// parse attributes
     virtual void StartElement(
         const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE;
+            ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override;
 
     /// for footnotes, also parse begin and end notices
     virtual SvXMLImportContext *CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE;
+            ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override;
 
     /// get token map for attributes
     const SvXMLTokenMap& GetFtnConfigAttrTokenMap();
@@ -95,7 +95,7 @@ public:
     /* Move code from <CreateAndInsertLate(..)> to <Finish(..)>, because
        at this time all styles it references have been set. (#i40579#)
     */
-    virtual void Finish( bool bOverwrite) SAL_OVERRIDE;
+    virtual void Finish( bool bOverwrite) override;
 
     /// set configuration at document
     void ProcessSettings(
diff --git a/xmloff/inc/XMLImageMapContext.hxx b/xmloff/inc/XMLImageMapContext.hxx
index 61105225f8f2..335565cbc58e 100644
--- a/xmloff/inc/XMLImageMapContext.hxx
+++ b/xmloff/inc/XMLImageMapContext.hxx
@@ -60,9 +60,9 @@ public:
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE;
+            ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
 
-    virtual void EndElement() SAL_OVERRIDE;
+    virtual void EndElement() override;
 };
 
 #endif
diff --git a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
index a1cc601e0c1e..9b8bb0d2edc0 100644
--- a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
+++ b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
@@ -81,15 +81,15 @@ protected:
 
     virtual void StartElement(
         const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE;
+            ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
 
-    virtual void CreateAndInsert( bool bOverwrite ) SAL_OVERRIDE;
+    virtual void CreateAndInsert( bool bOverwrite ) override;
 
     virtual SvXMLImportContext *CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE;
+            ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override;
 
     void ProcessAttribute(
         sal_uInt16 nPrefix,
diff --git a/xmloff/inc/XMLIsPercentagePropertyHandler.hxx b/xmloff/inc/XMLIsPercentagePropertyHandler.hxx
index 1941a0ef0a25..c1b5574214eb 100644
--- a/xmloff/inc/XMLIsPercentagePropertyHandler.hxx
+++ b/xmloff/inc/XMLIsPercentagePropertyHandler.hxx
@@ -34,11 +34,11 @@ public:
     virtual bool importXML(
             const OUString& rStrImpValue,
             ::com::sun::star::uno::Any& rValue,
-            const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE;
+            const SvXMLUnitConverter& rUnitConverter ) const override;
     virtual bool exportXML(
             OUString& rStrExpValue,
             const ::com::sun::star::uno::Any& rValue,
-            const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE;
+            const SvXMLUnitConverter& rUnitConverter ) const override;
 };
 
 #endif
diff --git a/xmloff/inc/XMLLineNumberingImportContext.hxx b/xmloff/inc/XMLLineNumberingImportContext.hxx
index 0b93f456f8e4..e7ef59b565d9 100644
--- a/xmloff/inc/XMLLineNumberingImportContext.hxx
+++ b/xmloff/inc/XMLLineNumberingImportContext.hxx
@@ -96,19 +96,19 @@ protected:
 
     virtual void StartElement(
         const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE;
+            ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
 
     void ProcessAttribute(
         enum LineNumberingToken eToken,
         const OUString& sValue);
 
-    virtual void CreateAndInsert(bool bOverwrite) SAL_OVERRIDE;
+    virtual void CreateAndInsert(bool bOverwrite) override;
 
     virtual SvXMLImportContext *CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE;
+            ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override;
 };
 
 #endif
diff --git a/xmloff/inc/XMLNumberStylesImport.hxx b/xmloff/inc/XMLNumberStylesImport.hxx
index 95036757bd6c..7859b9ff4227 100644
--- a/xmloff/inc/XMLNumberStylesImport.hxx
+++ b/xmloff/inc/XMLNumberStylesImport.hxx
@@ -56,10 +56,10 @@ public:
         SvXMLStylesContext& rStyles);
     virtual ~SdXMLNumberFormatImportContext();
 
-    virtual void EndElement() SAL_OVERRIDE;
+    virtual void EndElement() override;
 
     virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE;
+        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
 
     sal_Int32 GetDrawKey() const { return mnKey; }
 };
diff --git a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
index 2e92c694f472..ea8a59fe1d3b 100644
--- a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
+++ b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
@@ -36,11 +36,11 @@ public:
     virtual bool importXML(
             const OUString& rStrImpValue,
             ::com::sun::star::uno::Any& rValue,
-            const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE;
+            const SvXMLUnitConverter& rUnitConverter ) const override;
     virtual bool exportXML(
             OUString& rStrExpValue,
             const ::com::sun::star::uno::Any& rValue,
-            const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE;
+            const SvXMLUnitConverter& rUnitConverter ) const override;
 };
 
 #endif
diff --git a/xmloff/inc/XMLRectangleMembersHandler.hxx b/xmloff/inc/XMLRectangleMembersHandler.hxx
index ae7df5829781..5667245366d0 100644
--- a/xmloff/inc/XMLRectangleMembersHandler.hxx
+++ b/xmloff/inc/XMLRectangleMembersHandler.hxx
@@ -43,13 +43,13 @@ public:
     virtual bool importXML(
             const OUString& rStrImpValue,
             ::com::sun::star::uno::Any& rValue,
-            const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE;
+            const SvXMLUnitConverter& rUnitConverter ) const override;
 
     /// Exports the given value in cas of the given XML-data-type
     virtual bool exportXML(
             OUString& rStrExpValue,
             const ::com::sun::star::uno::Any& rValue,
-            const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE;
+            const SvXMLUnitConverter& rUnitConverter ) const override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_XMLRECTANGLEMEMBERSHANDLER_HXX
diff --git a/xmloff/inc/XMLReplacementImageContext.hxx b/xmloff/inc/XMLReplacementImageContext.hxx
index 0560f1dac159..1d3ef176355d 100644
--- a/xmloff/inc/XMLReplacementImageContext.hxx
+++ b/xmloff/inc/XMLReplacementImageContext.hxx
@@ -51,12 +51,12 @@ public:
                 ::com::sun::star::beans::XPropertySet >& rPropSet );
     virtual ~XMLReplacementImageContext();
 
-    virtual void EndElement() SAL_OVERRIDE;
+    virtual void EndElement() override;
 
     SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                 const OUString& rLocalName,
                  const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+                    ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
 
 };
 
diff --git a/xmloff/inc/XMLScriptContextFactory.hxx b/xmloff/inc/XMLScriptContextFactory.hxx
index 6002b373ac30..a054a5c681c8 100644
--- a/xmloff/inc/XMLScriptContextFactory.hxx
+++ b/xmloff/inc/XMLScriptContextFactory.hxx
@@ -52,7 +52,7 @@ public:
                   /// the event name (as understood by the API)
                   const OUString & rApiEventName,
                   /// the event type name (as registered)
-                  const OUString & rLanguage) SAL_OVERRIDE;
+                  const OUString & rLanguage) override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_XMLSCRIPTCONTEXTFACTORY_HXX
diff --git a/xmloff/inc/XMLScriptExportHandler.hxx b/xmloff/inc/XMLScriptExportHandler.hxx
index 2e968374683f..994ce6322bd7 100644
--- a/xmloff/inc/XMLScriptExportHandler.hxx
+++ b/xmloff/inc/XMLScriptExportHandler.hxx
@@ -45,7 +45,7 @@ public:
         const OUString& rEventName,
         ::com::sun::star::uno::Sequence<
             ::com::sun::star::beans::PropertyValue> & rValues,
-        bool bUseWhitespace) SAL_OVERRIDE;
+        bool bUseWhitespace) override;
 };
 
 #endif
diff --git a/xmloff/inc/XMLShapePropertySetContext.hxx b/xmloff/inc/XMLShapePropertySetContext.hxx
index ccf49d53c5a0..5f8de6841520 100644
--- a/xmloff/inc/XMLShapePropertySetContext.hxx
+++ b/xmloff/inc/XMLShapePropertySetContext.hxx
@@ -41,14 +41,14 @@ public:
 
     virtual ~XMLShapePropertySetContext();
 
-    virtual void EndElement() SAL_OVERRIDE;
+    virtual void EndElement() override;
 
     using SvXMLPropertySetContext::CreateChildContext;
     virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
                                    ::std::vector< XMLPropertyState > &rProperties,
-                                   const XMLPropertyState& rProp) SAL_OVERRIDE;
+                                   const XMLPropertyState& rProp) override;
 };
 
 #endif
diff --git a/xmloff/inc/XMLStarBasicContextFactory.hxx b/xmloff/inc/XMLStarBasicContextFactory.hxx
index 9e1489d5200c..0b5ef38a1113 100644
--- a/xmloff/inc/XMLStarBasicContextFactory.hxx
+++ b/xmloff/inc/XMLStarBasicContextFactory.hxx
@@ -53,7 +53,7 @@ public:
         /// the event name (as understood by the API)
         const OUString& rApiEventName,
         /// the event type name (as registered)
-        const OUString& rLanguage) SAL_OVERRIDE;
+        const OUString& rLanguage) override;
 };
 
 #endif
diff --git a/xmloff/inc/XMLStarBasicExportHandler.hxx b/xmloff/inc/XMLStarBasicExportHandler.hxx
index ef0caf2d7f49..e5d8eef5f2fd 100644
--- a/xmloff/inc/XMLStarBasicExportHandler.hxx
+++ b/xmloff/inc/XMLStarBasicExportHandler.hxx
@@ -49,7 +49,7 @@ public:
         const OUString& rEventName,
         ::com::sun::star::uno::Sequence<
             ::com::sun::star::beans::PropertyValue> & rValues,
-        bool bUseWhitespace) SAL_OVERRIDE;
+        bool bUseWhitespace) override;
 };
 
 #endif
diff --git a/xmloff/inc/XMLStringBufferImportContext.hxx b/xmloff/inc/XMLStringBufferImportContext.hxx
index 332dc2d4baf8..f04a2fc4064b 100644
--- a/xmloff/inc/XMLStringBufferImportContext.hxx
+++ b/xmloff/inc/XMLStringBufferImportContext.hxx
@@ -50,12 +50,12 @@ public:
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE;
+            ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
 
     virtual void Characters(
-        const OUString& rChars ) SAL_OVERRIDE;
+        const OUString& rChars ) override;
 
-    virtual void EndElement() SAL_OVERRIDE;
+    virtual void EndElement() override;
 };
 
 #endif
diff --git a/xmloff/inc/XMLTextColumnsContext.hxx b/xmloff/inc/XMLTextColumnsContext.hxx
index 9a10ac67a00e..25359ce19747 100644
--- a/xmloff/inc/XMLTextColumnsContext.hxx
+++ b/xmloff/inc/XMLTextColumnsContext.hxx
@@ -62,9 +62,9 @@ public:
 
     virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const OUString& rLocalName,
-                                   const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+                                   const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
 
-    virtual void EndElement() SAL_OVERRIDE;
+    virtual void EndElement() override;
 };
 
 
diff --git a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx
index 20fa2b24dfa5..2b04d84760f7 100644
--- a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx
+++ b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx
@@ -32,17 +32,17 @@ public:
 
     virtual bool equals(
             const ::com::sun::star::uno::Any& r1,
-            const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE;
+            const ::com::sun::star::uno::Any& r2 ) const override;
 
     /// TabStops will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place.
     virtual bool importXML(
             const OUString& rStrImpValue,
             ::com::sun::star::uno::Any& rValue,
-            const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE;
+            const SvXMLUnitConverter& rUnitConverter ) const override;
     virtual bool exportXML(
             OUString& rStrExpValue,
             const ::com::sun::star::uno::Any& rValue,
-            const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE;
+            const SvXMLUnitConverter& rUnitConverter ) const override;
 };
 
 #endif
diff --git a/xmloff/inc/XMLTextHeaderFooterContext.hxx b/xmloff/inc/XMLTextHeaderFooterContext.hxx
index c9052ded9c30..3b51cf3ad9b3 100644
--- a/xmloff/inc/XMLTextHeaderFooterContext.hxx
+++ b/xmloff/inc/XMLTextHeaderFooterContext.hxx
@@ -61,9 +61,9 @@ public:
     virtual SvXMLImportContext *CreateChildContext(
             sal_uInt16 nPrefix,
             const OUString& rLocalName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
 
-    virtual void EndElement() SAL_OVERRIDE;
+    virtual void EndElement() override;
 };
 
 
diff --git a/xmloff/inc/animationimport.hxx b/xmloff/inc/animationimport.hxx
index f8a905cfe8d8..8e406e9e5f2c 100644
--- a/xmloff/inc/animationimport.hxx
+++ b/xmloff/inc/animationimport.hxx
@@ -49,10 +49,10 @@ public:
         AnimationsImportHelperImpl* mpImpl = NULL );
     virtual ~AnimationNodeContext();
 
-    virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE;
+    virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
 
     virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE;
+        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
 
     static void postProcessRootNode( SvXMLImport& rImport, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xPageProps );
 };
diff --git a/xmloff/inc/animimp.hxx b/xmloff/inc/animimp.hxx
index 13fc95ed4dff..2fe49c692855 100644
--- a/xmloff/inc/animimp.hxx
+++ b/xmloff/inc/animimp.hxx
@@ -41,7 +41,7 @@ public:
     virtual ~XMLAnimationsContext();
 
     virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE;
+        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_ANIMIMP_HXX
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index b8d8314a561b..b5671d704a89 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -135,15 +135,15 @@ public:
     virtual ~XMLTextFieldImportContext();
 
     /// process character data: will be collected in member sContentBuffer
-    virtual void Characters( const OUString& sContent ) SAL_OVERRIDE;
+    virtual void Characters( const OUString& sContent ) override;
 
     /// parses attributes and calls ProcessAttribute
     virtual void StartElement(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE;
+        ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
 
     /// create XTextField and insert into document; calls PrepareTextField
-    virtual void EndElement() SAL_OVERRIDE;
+    virtual void EndElement() override;
 
     /// create the appropriate field context from
     /// (for use in paragraph import)
@@ -212,16 +212,16 @@ protected:
     /// start element
     virtual void StartElement(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE;
+        ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
 
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** inherit sender field because of fixed attribute in ProcessAttributes */
@@ -247,12 +247,12 @@ protected:
     /// start element
     virtual void StartElement(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE;
+        ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 class XMLPlaceholderFieldImportContext : public XMLTextFieldImportContext
@@ -277,12 +277,12 @@ public:
 protected:
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 class XMLTimeFieldImportContext : public XMLTextFieldImportContext
@@ -317,12 +317,12 @@ public:
 
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import date fields (<text:date>);
@@ -340,7 +340,7 @@ public:
 
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 };
 
 /** import page continuation fields (<text:page-continuation-string>) */
@@ -366,12 +366,12 @@ public:
 
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import page number fields (<text:page-number>) */
@@ -400,12 +400,12 @@ public:
 
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** superclass for database fields: handle database and table names */
@@ -447,19 +447,19 @@ public:
 
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 
     /// handle database-location children
     virtual SvXMLImportContext *CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE;
+        ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override;
 };
 
 /** import database name fields (<text:database-name>) */
@@ -475,7 +475,7 @@ public:
 
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 };
 
 /** import database next fields (<text:database-next>) */
@@ -504,12 +504,12 @@ public:
 
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import database select fields (<text:database-select>) */
@@ -529,12 +529,12 @@ public:
 
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import database display number fields (<text:database-row-number>) */
@@ -557,12 +557,12 @@ public:
 
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import docinfo fields with only fixed attribute */
@@ -592,12 +592,12 @@ public:
 protected:
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 
     static const sal_Char* MapTokenToServiceName(sal_uInt16 nToken);
 };
@@ -627,12 +627,12 @@ public:
 protected:
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import revision field (<text:editing-cycles>) */
@@ -653,7 +653,7 @@ protected:
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import user docinfo field (<text:user-defined>) */
@@ -679,10 +679,10 @@ public:
 protected:
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import hidden paragraph fields (<text:hidden-paragraph>) */
@@ -705,12 +705,12 @@ public:
 protected:
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import conditional text fields (<text:conditional-text>) */
@@ -742,12 +742,12 @@ public:
 protected:
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import conditional text fields (<text:hidden-text>) */
@@ -775,12 +775,12 @@ public:
 protected:
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import file name fields (<text:file-name>) */
@@ -804,12 +804,12 @@ public:
 protected:
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import document template name fields (<text:template-name>) */
@@ -830,12 +830,12 @@ public:
 protected:
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import chapter fields (<text:chapter>) */
@@ -858,12 +858,12 @@ public:
 protected:
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import count fields (<text:[XXX]-count>) */
@@ -888,12 +888,12 @@ public:
 protected:
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 
     static const sal_Char* MapTokenToServiceName(sal_uInt16 nToken);
 };
@@ -919,12 +919,12 @@ public:
 protected:
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import page variable fields (<text:get-page-variable>) */
@@ -947,12 +947,12 @@ public:
 protected:
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import macro fields (<text:execute-macro>) */
@@ -983,16 +983,16 @@ protected:
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE;
+        ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override;
 
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import reference fields (<text:reference-get>) */
@@ -1024,16 +1024,16 @@ protected:
     /// start element
     virtual void StartElement(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE;
+        ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
 
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import dde field declaration container (<text:dde-connection-decls>) */
@@ -1052,7 +1052,7 @@ public:
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE;
+        ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override;
 };
 
 /** import dde field declaration (<text:dde-connection-decl>) */
@@ -1077,7 +1077,7 @@ public:
     // create fieldmaster
     virtual void StartElement(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE;
+        ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
 };
 
 /** import dde fields (<text:dde-connection>) */
@@ -1097,15 +1097,15 @@ public:
 protected:
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// create textfield, attach master, and insert into document
-    virtual void EndElement() SAL_OVERRIDE;
+    virtual void EndElement() override;
 
     /// empty method
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import sheet name fields (Calc) dde fields (<text:sheet-name>) */
@@ -1123,12 +1123,12 @@ public:
 protected:
     /// no attributes -> empty method
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// no attributes -> empty method
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import page|slide name fields (<text:page-name>) */
@@ -1145,12 +1145,12 @@ public:
 
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import hyperlinks as URL fields (Calc, Impress, Draw) (<office:a>) */
@@ -1175,12 +1175,12 @@ public:
 protected:
     /// no attributes -> empty method
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// no attributes -> empty method
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import bibliography info fields (<text:bibliography-mark>) */
@@ -1202,16 +1202,16 @@ protected:
     /// process attributes (fill aValues)
     virtual void StartElement(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE;
+        ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
 
     /// empty method; all attributes are handled in StartElement
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// convert aValues into sequence and set property
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 
     static const sal_Char* MapBibliographyFieldName(const OUString& sName);
 };
@@ -1250,18 +1250,18 @@ public:
 protected:
     /// process attributes
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// set properties
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xPropertySet) SAL_OVERRIDE;
+        const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xPropertySet) override;
 
     virtual SvXMLImportContext *CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
-                ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE;
-    virtual void EndElement() SAL_OVERRIDE;
+                ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
+    virtual void EndElement() override;
 };
 
 /** Import a script field (<text:script>) */
@@ -1288,12 +1288,12 @@ public:
 protected:
     /// process attributes
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// set properties
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import measure fields (<text:measure>) */
@@ -1312,12 +1312,12 @@ public:
 protected:
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** dropdown field (filter legacy) */
@@ -1349,17 +1349,17 @@ public:
     virtual SvXMLImportContext* CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE;
+        const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
 
 protected:
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import header fields (<draw:header>) */
@@ -1376,12 +1376,12 @@ public:
 
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import footer fields (<draw:footer>) */
@@ -1398,12 +1398,12 @@ public:
 
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import footer fields (<draw:date-and-time>) */
@@ -1420,12 +1420,12 @@ public:
 
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 class XMLCustomPropertyFieldImportContext : public XMLTextFieldImportContext
@@ -1446,12 +1446,12 @@ public:
 protected:
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 #endif
diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx
index fdef070d9204..b369ad0bb8b9 100644
--- a/xmloff/inc/txtvfldi.hxx
+++ b/xmloff/inc/txtvfldi.hxx
@@ -194,12 +194,12 @@ public:
 protected:
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 
     // various accessor methods:
     inline OUString GetName()    { return sName; }
@@ -226,7 +226,7 @@ protected:
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 
@@ -249,7 +249,7 @@ public:
 protected:
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 /*** import text input fields (<text:text-input>) */
@@ -270,7 +270,7 @@ public:
 protected:
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 
@@ -316,7 +316,7 @@ protected:
 
     /// create XTextField, attach master and insert into document;
     /// also calls PrepareTextField
-    virtual void EndElement() SAL_OVERRIDE;
+    virtual void EndElement() override;
 
     /// find appropriate field master
     bool FindFieldMaster(
@@ -345,7 +345,7 @@ protected:
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 
@@ -371,7 +371,7 @@ protected:
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 
@@ -407,7 +407,7 @@ public:
 
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 
@@ -437,12 +437,12 @@ protected:
 
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 
@@ -474,7 +474,7 @@ public:
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE;
+        ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override;
 };
 
 /**
@@ -542,12 +542,12 @@ protected:
 
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) SAL_OVERRIDE;
+        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
 };
 
 
@@ -582,10 +582,10 @@ protected:
 
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) SAL_OVERRIDE;
+                                   const OUString& sAttrValue ) override;
 
     /// create, prepare and insert database field master and database field
-    virtual void EndElement() SAL_OVERRIDE;
+    virtual void EndElement() override;
 };
 
 #endif
diff --git a/xmloff/inc/xmltabi.hxx b/xmloff/inc/xmltabi.hxx
index e8e1e275ab14..d20678ee409d 100644
--- a/xmloff/inc/xmltabi.hxx
+++ b/xmloff/inc/xmltabi.hxx
@@ -44,9 +44,9 @@ public:
 
     virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const OUString& rLocalName,
-                                   const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+                                   const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
 
-    virtual void EndElement() SAL_OVERRIDE;
+    virtual void EndElement() override;
 };
 
 
diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx
index fc8e8ac90ee3..e87ddc24375b 100644
--- a/xmloff/inc/xmlversion.hxx
+++ b/xmloff/inc/xmlversion.hxx
@@ -44,10 +44,10 @@ public:
         com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > &rHandler );
     virtual     ~XMLVersionListExport() {}
 
-    sal_uInt32  exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) SAL_OVERRIDE;
-    void        _ExportAutoStyles() SAL_OVERRIDE {}
-    void        _ExportMasterStyles () SAL_OVERRIDE {}
-    void        _ExportContent() SAL_OVERRIDE {}
+    sal_uInt32  exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) override;
+    void        _ExportAutoStyles() override {}
+    void        _ExportMasterStyles () override {}
+    void        _ExportContent() override {}
 };
 
 class XMLVersionListImport : public SvXMLImport
@@ -62,7 +62,7 @@ protected:
     virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix,
                     const OUString& rLocalName,
                     const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+                    ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
 
 public:
 
@@ -93,7 +93,7 @@ public:
     virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                            const OUString& rLocalName,
                            const ::com::sun::star::uno::Reference<
-                           ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+                           ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
 
 };
 
@@ -120,17 +120,17 @@ public:
 class XMLVersionListPersistence : public ::cppu::WeakImplHelper< ::com::sun::star::document::XDocumentRevisionListPersistence, css::lang::XServiceInfo >
 {
 public:
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::util::RevisionTag > SAL_CALL load( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL store( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, const ::com::sun::star::uno::Sequence< ::com::sun::star::util::RevisionTag >& List ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::util::RevisionTag > SAL_CALL load( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL store( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, const ::com::sun::star::uno::Sequence< ::com::sun::star::util::RevisionTag >& List ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
 
     OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 };
 
 #endif