Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code

Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274

36 files changed, 689 insertions, 689 deletions

diff --git a/unoxml/qa/unit/domtest.cxx b/unoxml/qa/unit/domtest.cxx
index d85c8aa43908..44439934db69 100644
--- a/unoxml/qa/unit/domtest.cxx
+++ b/unoxml/qa/unit/domtest.cxx
@@ -100,17 +100,17 @@ struct ErrorHandler
     ErrorHandler() : mnErrCount(0), mnFatalCount(0), mnWarnCount(0)
     {}
 
-    virtual void SAL_CALL error( const uno::Any& ) throw (xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE
+    virtual void SAL_CALL error( const uno::Any& ) throw (xml::sax::SAXException, uno::RuntimeException) override
     {
         ++mnErrCount;
     }
 
-    virtual void SAL_CALL fatalError( const uno::Any& ) throw (xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE
+    virtual void SAL_CALL fatalError( const uno::Any& ) throw (xml::sax::SAXException, uno::RuntimeException) override
     {
         ++mnFatalCount;
     }
 
-    virtual void SAL_CALL warning( const uno::Any& ) throw (xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE
+    virtual void SAL_CALL warning( const uno::Any& ) throw (xml::sax::SAXException, uno::RuntimeException) override
     {
         ++mnWarnCount;
     }
@@ -120,7 +120,7 @@ struct DocumentHandler
     : public ::cppu::WeakImplHelper< xml::sax::XFastDocumentHandler >
 {
     // XFastContextHandler
-    virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList >& ) throw (xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE
+    virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList >& ) throw (xml::sax::SAXException, uno::RuntimeException) override
     {
         SAL_INFO(
             "unoxml",
@@ -128,42 +128,42 @@ struct DocumentHandler
                 << (Element & 0xFFFF0000));
     }
 
-    virtual void SAL_CALL startUnknownElement( const OUString& , const OUString& , const uno::Reference< xml::sax::XFastAttributeList >& ) throw (xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE
+    virtual void SAL_CALL startUnknownElement( const OUString& , const OUString& , const uno::Reference< xml::sax::XFastAttributeList >& ) throw (xml::sax::SAXException, uno::RuntimeException) override
     {
     }
 
-    virtual void SAL_CALL endFastElement( ::sal_Int32 ) throw (xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE
+    virtual void SAL_CALL endFastElement( ::sal_Int32 ) throw (xml::sax::SAXException, uno::RuntimeException) override
     {
     }
 
-    virtual void SAL_CALL endUnknownElement( const OUString&, const OUString& ) throw (xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE
+    virtual void SAL_CALL endUnknownElement( const OUString&, const OUString& ) throw (xml::sax::SAXException, uno::RuntimeException) override
     {
     }
 
-    virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 , const uno::Reference< xml::sax::XFastAttributeList >& ) throw (xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE
+    virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 , const uno::Reference< xml::sax::XFastAttributeList >& ) throw (xml::sax::SAXException, uno::RuntimeException) override
     {
         return this;
     }
 
-    virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& , const OUString& , const uno::Reference< xml::sax::XFastAttributeList >& ) throw (xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE
+    virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& , const OUString& , const uno::Reference< xml::sax::XFastAttributeList >& ) throw (xml::sax::SAXException, uno::RuntimeException) override
     {
         return this;
     }
 
-    virtual void SAL_CALL characters( const OUString& ) throw (xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE
+    virtual void SAL_CALL characters( const OUString& ) throw (xml::sax::SAXException, uno::RuntimeException) override
     {
     }
 
     // XFastDocumentHandler
-    virtual void SAL_CALL startDocument(  ) throw (xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE
+    virtual void SAL_CALL startDocument(  ) throw (xml::sax::SAXException, uno::RuntimeException) override
     {
     }
 
-    virtual void SAL_CALL endDocument(  ) throw (xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE
+    virtual void SAL_CALL endDocument(  ) throw (xml::sax::SAXException, uno::RuntimeException) override
     {
     }
 
-    virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& ) throw (xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE
+    virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& ) throw (xml::sax::SAXException, uno::RuntimeException) override
     {
     }
 };
@@ -171,13 +171,13 @@ struct DocumentHandler
 struct TokenHandler
     : public ::cppu::WeakImplHelper< xml::sax::XFastTokenHandler >
 {
-    virtual ::sal_Int32 SAL_CALL getTokenFromUTF8( const uno::Sequence< ::sal_Int8 >& Identifier ) throw (uno::RuntimeException) SAL_OVERRIDE
+    virtual ::sal_Int32 SAL_CALL getTokenFromUTF8( const uno::Sequence< ::sal_Int8 >& Identifier ) throw (uno::RuntimeException) override
     {
         OSL_TRACE("getTokenFromUTF8() %s", reinterpret_cast<const char*>(Identifier.getConstArray()));
         return Identifier.getLength() ? Identifier[0] : 0;
     }
 
-    virtual uno::Sequence< ::sal_Int8 > SAL_CALL getUTF8Identifier( ::sal_Int32 ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+    virtual uno::Sequence< ::sal_Int8 > SAL_CALL getUTF8Identifier( ::sal_Int32 ) throw (uno::RuntimeException, std::exception) override
     {
         CPPUNIT_ASSERT_MESSAGE( "TokenHandler::getUTF8Identifier() unexpected call",
                                 false );
@@ -194,7 +194,7 @@ struct BasicTest : public test::BootstrapFixture
     rtl::Reference<SequenceInputStream> mxErrorInStream;
     rtl::Reference<SequenceInputStream> mxFatalInStream;
 
-    virtual void setUp() SAL_OVERRIDE
+    virtual void setUp() override
     {
         test::BootstrapFixture::setUp();
 
@@ -268,7 +268,7 @@ struct SerializerTest : public test::BootstrapFixture
     rtl::Reference<TokenHandler>                             mxTokHandler;
     uno::Sequence< beans::Pair< OUString, sal_Int32 > > maRegisteredNamespaces;
 
-    void setUp() SAL_OVERRIDE
+    void setUp() override
     {
         test::BootstrapFixture::setUp();
 
diff --git a/unoxml/source/dom/attr.hxx b/unoxml/source/dom/attr.hxx
index 24686251cc46..2dfbe6d64b4e 100644
--- a/unoxml/source/dom/attr.hxx
+++ b/unoxml/source/dom/attr.hxx
@@ -56,149 +56,149 @@ namespace DOM
         /// return the libxml namespace corresponding to m_pNamespace on pNode
         xmlNsPtr GetNamespace(xmlNodePtr const pNode);
 
-        virtual bool IsChildTypeAllowed(css::xml::dom::NodeType const nodeType) SAL_OVERRIDE;
+        virtual bool IsChildTypeAllowed(css::xml::dom::NodeType const nodeType) override;
 
         /**
         Returns the name of this attribute.
         */
-        virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         The Element node this attribute is attached to or null if this
         attribute is not in use.
         */
-        virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL getOwnerElement() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL getOwnerElement() throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         If this attribute was explicitly given a value in the original
         document, this is true; otherwise, it is false.
         */
-        virtual sal_Bool SAL_CALL getSpecified()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual sal_Bool SAL_CALL getSpecified()throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         On retrieval, the value of the attribute is returned as a string.
         */
-        virtual OUString SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual OUString SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Sets the value of the attribute from a string.
         */
 
-        virtual void SAL_CALL setValue(const OUString& value) throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+        virtual void SAL_CALL setValue(const OUString& value) throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         // resolve uno inheritance problems...
         // overrides for XNode base
         virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual OUString SAL_CALL getLocalName()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
     // --- delegation for XNode base.
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::appendChild(newChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::cloneNode(deep);
     }
     virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getAttributes();
     }
     virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getFirstChild();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getLastChild();
     }
     virtual OUString SAL_CALL getNamespaceURI()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getNextSibling();
     }
     virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getNodeType();
     }
     virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getOwnerDocument();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getParentNode();
     }
     virtual OUString SAL_CALL getPrefix()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getPreviousSibling();
     }
     virtual sal_Bool SAL_CALL hasAttributes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::hasAttributes();
     }
     virtual sal_Bool SAL_CALL hasChildNodes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::hasChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
             const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::insertBefore(newChild, refChild);
     }
     virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::isSupported(feature, ver);
     }
     virtual void SAL_CALL normalize()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         CNode::normalize();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::removeChild(oldChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
             const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::replaceChild(newChild, oldChild);
     }
     virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return setValue(nodeValue);
     }
     virtual void SAL_CALL setPrefix(const OUString& prefix)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
     };
 }
diff --git a/unoxml/source/dom/attributesmap.hxx b/unoxml/source/dom/attributesmap.hxx
index 7455b643c550..38a11fb069cc 100644
--- a/unoxml/source/dom/attributesmap.hxx
+++ b/unoxml/source/dom/attributesmap.hxx
@@ -47,54 +47,54 @@ namespace DOM
         /**
         The number of nodes in this map.
         */
-        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Retrieves a node specified by local name
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNamedItem(OUString const& name)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Retrieves a node specified by local name and namespace URI.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNamedItemNS(
                 OUString const& namespaceURI, OUString const& localName)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Returns the indexth item in the map.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Removes a node specified by name.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
             removeNamedItem(OUString const& name)
-            throw (css::xml::dom::DOMException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::xml::dom::DOMException, css::uno::RuntimeException, std::exception) override;
 
         /**
         // Removes a node specified by local name and namespace URI.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeNamedItemNS(
                 OUString const& namespaceURI, OUString const& localName)
-            throw (css::xml::dom::DOMException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::xml::dom::DOMException, css::uno::RuntimeException, std::exception) override;
 
         /**
         // Adds a node using its nodeName attribute.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
             setNamedItem(css::uno::Reference< css::xml::dom::XNode > const& arg)
-            throw (css::xml::dom::DOMException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::xml::dom::DOMException, css::uno::RuntimeException, std::exception) override;
 
         /**
         Adds a node using its namespaceURI and localName.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
             setNamedItemNS(css::uno::Reference< css::xml::dom::XNode > const& arg)
-            throw (css::xml::dom::DOMException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::xml::dom::DOMException, css::uno::RuntimeException, std::exception) override;
     };
 }
 
diff --git a/unoxml/source/dom/cdatasection.hxx b/unoxml/source/dom/cdatasection.hxx
index 2ec4ceb35ae3..8fb6fb98a95e 100644
--- a/unoxml/source/dom/cdatasection.hxx
+++ b/unoxml/source/dom/cdatasection.hxx
@@ -42,50 +42,50 @@ namespace DOM
 
     public:
 
-        virtual void saxify(const css::uno::Reference< css::xml::sax::XDocumentHandler >& i_xHandler) SAL_OVERRIDE;
+        virtual void saxify(const css::uno::Reference< css::xml::sax::XDocumentHandler >& i_xHandler) override;
 
         virtual css::uno::Reference< css::xml::dom::XText > SAL_CALL splitText(sal_Int32 offset)
-             throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+             throw (css::uno::RuntimeException, std::exception) override
         {
             return CText::splitText(offset);
         }
 
          // --- delegations for XCharacterData
         virtual void SAL_CALL appendData(const OUString& arg)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             CCharacterData::appendData(arg);
         }
         virtual void SAL_CALL deleteData(sal_Int32 offset, sal_Int32 count)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             CCharacterData::deleteData(offset, count);
         }
-        virtual OUString SAL_CALL getData() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual OUString SAL_CALL getData() throw (css::uno::RuntimeException, std::exception) override
         {
             return CCharacterData::getData();
         }
-        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override
         {
             return CCharacterData::getLength();
         }
         virtual void SAL_CALL insertData(sal_Int32 offset, const OUString& arg)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             CCharacterData::insertData(offset, arg);
         }
         virtual void SAL_CALL replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             CCharacterData::replaceData(offset, count, arg);
         }
         virtual void SAL_CALL setData(const OUString& data)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             CCharacterData::setData(data);
         }
         virtual OUString SAL_CALL subStringData(sal_Int32 offset, sal_Int32 count)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CCharacterData::subStringData(offset, count);
         }
@@ -93,125 +93,125 @@ namespace DOM
 
          // --- overrides for XNode base
         virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
     // --- delegation for XNode base.
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::appendChild(newChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::cloneNode(deep);
     }
     virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getAttributes();
     }
     virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getFirstChild();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getLastChild();
     }
     virtual OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getLocalName();
     }
     virtual OUString SAL_CALL getNamespaceURI()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getNamespaceURI();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getNextSibling();
     }
     virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getNodeType();
     }
     virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getOwnerDocument();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getParentNode();
     }
     virtual OUString SAL_CALL getPrefix()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getPrefix();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getPreviousSibling();
     }
     virtual sal_Bool SAL_CALL hasAttributes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::hasAttributes();
     }
     virtual sal_Bool SAL_CALL hasChildNodes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::hasChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
             const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::insertBefore(newChild, refChild);
     }
     virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::isSupported(feature, ver);
     }
     virtual void SAL_CALL normalize()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         CNode::normalize();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::removeChild(oldChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
             const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::replaceChild(newChild, oldChild);
     }
     virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CText::setNodeValue(nodeValue);
     }
     virtual void SAL_CALL setPrefix(const OUString& prefix)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::setPrefix(prefix);
     }
diff --git a/unoxml/source/dom/characterdata.hxx b/unoxml/source/dom/characterdata.hxx
index 0eb5222e2c83..54c8e1ab16d9 100644
--- a/unoxml/source/dom/characterdata.hxx
+++ b/unoxml/source/dom/characterdata.hxx
@@ -53,175 +53,175 @@ namespace DOM
         Append the string to the end of the character data of the node.
         */
         virtual void SAL_CALL appendData(const OUString& arg)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         /**
         Remove a range of 16-bit units from the node.
         */
         virtual void SAL_CALL deleteData(sal_Int32 offset, sal_Int32 count)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         /**
         Return the character data of the node that implements this interface.
         */
-        virtual OUString SAL_CALL getData() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual OUString SAL_CALL getData() throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         The number of 16-bit units that are available through data and the
         substringData method below.
         */
-        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Insert a string at the specified 16-bit unit offset.
         */
         virtual void SAL_CALL insertData(sal_Int32 offset, const OUString& arg)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         /**
         Replace the characters starting at the specified 16-bit unit offset
         with the specified string.
         */
         virtual void SAL_CALL replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         /**
         Set the character data of the node that implements this interface.
         */
         virtual void SAL_CALL setData(const OUString& data)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         /**
         Extracts a range of data from the node.
         */
         virtual OUString SAL_CALL subStringData(sal_Int32 offset, sal_Int32 count)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         // --- delegation for XNode base.
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CNode::appendChild(newChild);
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::cloneNode(deep);
         }
         virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getAttributes();
         }
         virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getChildNodes();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getFirstChild();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getLastChild();
         }
         virtual OUString SAL_CALL getLocalName()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getLocalName();
         }
         virtual OUString SAL_CALL getNamespaceURI()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getNamespaceURI();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getNextSibling();
         }
         virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getNodeName();
         }
         virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getNodeType();
         }
         virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return getData();
         }
         virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getOwnerDocument();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getParentNode();
         }
         virtual OUString SAL_CALL getPrefix()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getPrefix();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getPreviousSibling();
         }
         virtual sal_Bool SAL_CALL hasAttributes()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::hasAttributes();
         }
         virtual sal_Bool SAL_CALL hasChildNodes()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::hasChildNodes();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
                 const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CNode::insertBefore(newChild, refChild);
         }
         virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::isSupported(feature, ver);
         }
         virtual void SAL_CALL normalize()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             CNode::normalize();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CNode::removeChild(oldChild);
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
                 const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CNode::replaceChild(newChild, oldChild);
         }
         virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return setData(nodeValue);
         }
         virtual void SAL_CALL setPrefix(const OUString& prefix)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CNode::setPrefix(prefix);
         }
diff --git a/unoxml/source/dom/childlist.hxx b/unoxml/source/dom/childlist.hxx
index fa94ed62a212..91daba41eb7f 100644
--- a/unoxml/source/dom/childlist.hxx
+++ b/unoxml/source/dom/childlist.hxx
@@ -47,12 +47,12 @@ namespace DOM
         /**
         The number of nodes in the list.
         */
-        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override;
         /**
         Returns the indexth item in the collection.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
     };
 }
 
diff --git a/unoxml/source/dom/comment.hxx b/unoxml/source/dom/comment.hxx
index 44057c62ed0a..4cf3cd2637a5 100644
--- a/unoxml/source/dom/comment.hxx
+++ b/unoxml/source/dom/comment.hxx
@@ -43,44 +43,44 @@ namespace DOM
 
     public:
 
-        virtual void saxify(const css::uno::Reference< css::xml::sax::XDocumentHandler >& i_xHandler) SAL_OVERRIDE;
+        virtual void saxify(const css::uno::Reference< css::xml::sax::XDocumentHandler >& i_xHandler) override;
 
          // --- delegations for XCharacterData
         virtual void SAL_CALL appendData(const OUString& arg)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             CCharacterData::appendData(arg);
         }
         virtual void SAL_CALL deleteData(sal_Int32 offset, sal_Int32 count)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             CCharacterData::deleteData(offset, count);
         }
-        virtual OUString SAL_CALL getData() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual OUString SAL_CALL getData() throw (css::uno::RuntimeException, std::exception) override
         {
             return CCharacterData::getData();
         }
-        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override
         {
             return CCharacterData::getLength();
         }
         virtual void SAL_CALL insertData(sal_Int32 offset, const OUString& arg)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             CCharacterData::insertData(offset, arg);
         }
         virtual void SAL_CALL replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             CCharacterData::replaceData(offset, count, arg);
         }
         virtual void SAL_CALL setData(const OUString& data)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             CCharacterData::setData(data);
         }
         virtual OUString SAL_CALL subStringData(sal_Int32 offset, sal_Int32 count)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CCharacterData::subStringData(offset, count);
         }
@@ -88,125 +88,125 @@ namespace DOM
 
          // --- overrides for XNode base
         virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
     // --- delegation for XNode base.
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CCharacterData::appendChild(newChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CCharacterData::cloneNode(deep);
     }
     virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CCharacterData::getAttributes();
     }
     virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CCharacterData::getChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CCharacterData::getFirstChild();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CCharacterData::getLastChild();
     }
     virtual OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CCharacterData::getLocalName();
     }
     virtual OUString SAL_CALL getNamespaceURI()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CCharacterData::getNamespaceURI();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CCharacterData::getNextSibling();
     }
     virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CCharacterData::getNodeType();
     }
     virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CCharacterData::getOwnerDocument();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CCharacterData::getParentNode();
     }
     virtual OUString SAL_CALL getPrefix()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CCharacterData::getPrefix();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CCharacterData::getPreviousSibling();
     }
     virtual sal_Bool SAL_CALL hasAttributes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CCharacterData::hasAttributes();
     }
     virtual sal_Bool SAL_CALL hasChildNodes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CCharacterData::hasChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
             const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CCharacterData::insertBefore(newChild, refChild);
     }
     virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CCharacterData::isSupported(feature, ver);
     }
     virtual void SAL_CALL normalize()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         CCharacterData::normalize();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CCharacterData::removeChild(oldChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
             const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CCharacterData::replaceChild(newChild, oldChild);
     }
     virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CCharacterData::setNodeValue(nodeValue);
     }
     virtual void SAL_CALL setPrefix(const OUString& prefix)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CCharacterData::setPrefix(prefix);
     }
diff --git a/unoxml/source/dom/document.hxx b/unoxml/source/dom/document.hxx
index 04099ef67fd5..f1a447c78462 100644
--- a/unoxml/source/dom/document.hxx
+++ b/unoxml/source/dom/document.hxx
@@ -107,61 +107,61 @@ namespace DOM
         /// remove a UNO wrapper instance
         void RemoveCNode(xmlNodePtr const pNode, CNode const*const pCNode);
 
-        virtual CDocument & GetOwnerDocument() SAL_OVERRIDE;
+        virtual CDocument & GetOwnerDocument() override;
 
-        virtual void saxify(const css::uno::Reference< css::xml::sax::XDocumentHandler >& i_xHandler) SAL_OVERRIDE;
+        virtual void saxify(const css::uno::Reference< css::xml::sax::XDocumentHandler >& i_xHandler) override;
 
-        virtual void fastSaxify( Context& rContext ) SAL_OVERRIDE;
+        virtual void fastSaxify( Context& rContext ) override;
 
-        virtual bool IsChildTypeAllowed(css::xml::dom::NodeType const nodeType) SAL_OVERRIDE;
+        virtual bool IsChildTypeAllowed(css::xml::dom::NodeType const nodeType) override;
 
         /**
         Creates an Attr of the given name.
         */
         virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL createAttribute(const OUString& name)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         /**
         Creates an attribute of the given qualified name and namespace URI.
         */
         virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL createAttributeNS(const OUString& namespaceURI, const OUString& qualifiedName)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         /**
         Creates a CDATASection node whose value is the specified string.
         */
         virtual css::uno::Reference< css::xml::dom::XCDATASection > SAL_CALL createCDATASection(const OUString& data)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Creates a Comment node given the specified string.
         */
         virtual css::uno::Reference< css::xml::dom::XComment > SAL_CALL createComment(const OUString& data)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Creates an empty DocumentFragment object.
         */
         virtual css::uno::Reference< css::xml::dom::XDocumentFragment > SAL_CALL createDocumentFragment()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Creates an element of the type specified.
         */
         virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL createElement(const OUString& tagName)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         /**
         Creates an element of the given qualified name and namespace URI.
         */
         virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL createElementNS(const OUString& namespaceURI, const OUString& qualifiedName)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         /**
         Creates an EntityReference object.
         */
         virtual css::uno::Reference< css::xml::dom::XEntityReference > SAL_CALL createEntityReference(const OUString& name)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         /**
         Creates a ProcessingInstruction node given the specified name and
@@ -169,33 +169,33 @@ namespace DOM
         */
         virtual css::uno::Reference< css::xml::dom::XProcessingInstruction > SAL_CALL createProcessingInstruction(
                 const OUString& target, const OUString& data)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         /**
         Creates a Text node given the specified string.
         */
         virtual css::uno::Reference< css::xml::dom::XText > SAL_CALL createTextNode(const OUString& data)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         The Document Type Declaration (see DocumentType) associated with this
         document.
         */
         virtual css::uno::Reference< css::xml::dom::XDocumentType > SAL_CALL getDoctype()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         This is a convenience attribute that allows direct access to the child
         node that is the root element of the document.
         */
         virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL getDocumentElement()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Returns the Element whose ID is given by elementId.
         */
         virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL getElementById(const OUString& elementId)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Returns a NodeList of all the Elements with a given tag name in the
@@ -203,7 +203,7 @@ namespace DOM
         Document tree.
         */
         virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getElementsByTagName(const OUString& tagname)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Returns a NodeList of all the Elements with a given local name and
@@ -211,153 +211,153 @@ namespace DOM
         traversal of the Document tree.
         */
         virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getElementsByTagNameNS(const OUString& namespaceURI, const OUString& localName)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         The DOMImplementation object that handles this document.
         */
         virtual css::uno::Reference< css::xml::dom::XDOMImplementation > SAL_CALL getImplementation()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Imports a node from another document to this document.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL importNode(const css::uno::Reference< css::xml::dom::XNode >& importedNode, sal_Bool deep)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         // XDocumentEvent
-        virtual css::uno::Reference< css::xml::dom::events::XEvent > SAL_CALL createEvent(const OUString& eventType) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual css::uno::Reference< css::xml::dom::events::XEvent > SAL_CALL createEvent(const OUString& eventType) throw (css::uno::RuntimeException, std::exception) override;
 
         // XActiveDataControl,
         // see http://api.libreoffice.org/docs/common/ref/com/sun/star/io/XActiveDataControl.html
-        virtual void SAL_CALL addListener(const css::uno::Reference< css::io::XStreamListener >& aListener )  throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual void SAL_CALL removeListener(const css::uno::Reference< css::io::XStreamListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual void SAL_CALL start() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual void SAL_CALL terminate() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual void SAL_CALL addListener(const css::uno::Reference< css::io::XStreamListener >& aListener )  throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL removeListener(const css::uno::Reference< css::io::XStreamListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL start() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL terminate() throw (css::uno::RuntimeException, std::exception) override;
 
         // XActiveDataSource
         // see http://api.libreoffice.org/docs/common/ref/com/sun/star/io/XActiveDataSource.html
-        virtual void SAL_CALL setOutputStream(  const css::uno::Reference< css::io::XOutputStream >& aStream ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual void SAL_CALL setOutputStream(  const css::uno::Reference< css::io::XOutputStream >& aStream ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream() throw (css::uno::RuntimeException, std::exception) override;
 
         // ---- resolve uno inheritance problems...
         // overrides for XNode base
         virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         // --- delegation for XNode base.
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CNode::appendChild(newChild);
         }
         virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getAttributes();
         }
         virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getChildNodes();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getFirstChild();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getLastChild();
         }
         virtual OUString SAL_CALL getLocalName()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getLocalName();
         }
         virtual OUString SAL_CALL getNamespaceURI()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getNamespaceURI();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getNextSibling();
         }
         virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getNodeType();
         }
         virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getOwnerDocument();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getParentNode();
         }
         virtual OUString SAL_CALL getPrefix()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
            return CNode::getPrefix();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getPreviousSibling();
         }
         virtual sal_Bool SAL_CALL hasAttributes()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::hasAttributes();
         }
         virtual sal_Bool SAL_CALL hasChildNodes()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::hasChildNodes();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
                 const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CNode::insertBefore(newChild, refChild);
         }
         virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::isSupported(feature, ver);
         }
         virtual void SAL_CALL normalize()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             CNode::normalize();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CNode::removeChild(oldChild);
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
                 const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CNode::replaceChild(newChild, oldChild);
         }
         virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CNode::setNodeValue(nodeValue);
         }
         virtual void SAL_CALL setPrefix(const OUString& prefix)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CNode::setPrefix(prefix);
         }
@@ -366,14 +366,14 @@ namespace DOM
         virtual void SAL_CALL serialize(
             const css::uno::Reference< css::xml::sax::XDocumentHandler >& i_xHandler,
             const css::uno::Sequence< css::beans::StringPair >& i_rNamespaces)
-            throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
 
         // css::xml::sax::XFastSAXSerializable
         virtual void SAL_CALL fastSerialize( const css::uno::Reference< css::xml::sax::XFastDocumentHandler >& handler,
                                              const css::uno::Reference< css::xml::sax::XFastTokenHandler >& tokenHandler,
                                              const css::uno::Sequence< css::beans::StringPair >& i_rNamespaces,
                                              const css::uno::Sequence< css::beans::Pair< OUString, sal_Int32 > >& namespaces )
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
     };
 }
 
diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx
index f3948b8f9453..37d4de501c6d 100644
--- a/unoxml/source/dom/documentbuilder.cxx
+++ b/unoxml/source/dom/documentbuilder.cxx
@@ -64,7 +64,7 @@ namespace DOM
     {
     public:
         virtual InputSource SAL_CALL resolveEntity( const OUString& sPublicId, const OUString& sSystemId )
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             InputSource is;
             is.sPublicId = sPublicId;
diff --git a/unoxml/source/dom/documentbuilder.hxx b/unoxml/source/dom/documentbuilder.hxx
index 631261695337..441b5dd58eb2 100644
--- a/unoxml/source/dom/documentbuilder.hxx
+++ b/unoxml/source/dom/documentbuilder.hxx
@@ -74,59 +74,59 @@ namespace DOM
 
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Obtain an instance of a DOMImplementation object.
         */
         virtual css::uno::Reference< css::xml::dom::XDOMImplementation > SAL_CALL getDOMImplementation()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Indicates whether or not this parser is configured to understand
         namespaces.
         */
         virtual sal_Bool SAL_CALL isNamespaceAware()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Indicates whether or not this parser is configured to validate XML
         documents.
         */
         virtual sal_Bool SAL_CALL isValidating()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Obtain a new instance of a DOM Document object to build a DOM tree
         with.
         */
         virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL newDocument()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Parse the content of the given InputStream as an XML document and
         return a new DOM Document object.
         */
         virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL parse(const css::uno::Reference< css::io::XInputStream >& is)
-            throw (css::uno::RuntimeException, css::xml::sax::SAXParseException, css::io::IOException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::sax::SAXParseException, css::io::IOException, std::exception) override;
 
         /**
         Parse the content of the given URI as an XML document and return
         a new DOM Document object.
         */
         virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL parseURI(const OUString& uri)
-            throw (css::uno::RuntimeException, css::xml::sax::SAXParseException, css::io::IOException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::sax::SAXParseException, css::io::IOException, std::exception) override;
 
         /**
         Specify the EntityResolver to be used to resolve entities present
         in the XML document to be parsed.
         */
         virtual void SAL_CALL setEntityResolver(const css::uno::Reference< css::xml::sax::XEntityResolver >& er)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         css::uno::Reference< css::xml::sax::XEntityResolver > SAL_CALL getEntityResolver()
             throw (css::uno::RuntimeException);
@@ -137,7 +137,7 @@ namespace DOM
         the XML document to be parsed.
         */
         virtual void SAL_CALL setErrorHandler(const css::uno::Reference< css::xml::sax::XErrorHandler >& eh)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
     };
 }
 
diff --git a/unoxml/source/dom/documentfragment.hxx b/unoxml/source/dom/documentfragment.hxx
index 95778fcada98..62068af0c478 100644
--- a/unoxml/source/dom/documentfragment.hxx
+++ b/unoxml/source/dom/documentfragment.hxx
@@ -43,129 +43,129 @@ namespace DOM
                 xmlNodePtr const pNode);
 
     public:
-        virtual bool IsChildTypeAllowed(css::xml::dom::NodeType const nodeType) SAL_OVERRIDE;
+        virtual bool IsChildTypeAllowed(css::xml::dom::NodeType const nodeType) override;
 
         // ---- resolve uno inheritance problems...
         // overrides for XNode base
         virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
     // --- delegation for XNode base.
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::appendChild(newChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::cloneNode(deep);
     }
     virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getAttributes();
     }
     virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getFirstChild();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getLastChild();
     }
     virtual OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getLocalName();
     }
     virtual OUString SAL_CALL getNamespaceURI()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getNamespaceURI();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getNextSibling();
     }
     virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getNodeType();
     }
     virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getOwnerDocument();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getParentNode();
     }
     virtual OUString SAL_CALL getPrefix()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getPrefix();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getPreviousSibling();
     }
     virtual sal_Bool SAL_CALL hasAttributes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::hasAttributes();
     }
     virtual sal_Bool SAL_CALL hasChildNodes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::hasChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
             const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::insertBefore(newChild, refChild);
     }
     virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::isSupported(feature, ver);
     }
     virtual void SAL_CALL normalize()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         CNode::normalize();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::removeChild(oldChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
             const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::replaceChild(newChild, oldChild);
     }
     virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::setNodeValue(nodeValue);
     }
     virtual void SAL_CALL setPrefix(const OUString& prefix)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::setPrefix(prefix);
     }
diff --git a/unoxml/source/dom/documenttype.hxx b/unoxml/source/dom/documenttype.hxx
index bec5d2b57778..711f1a4e5a59 100644
--- a/unoxml/source/dom/documenttype.hxx
+++ b/unoxml/source/dom/documenttype.hxx
@@ -55,155 +55,155 @@ namespace DOM
         A NamedNodeMap containing the general entities, both external and
         internal, declared in the DTD.
         */
-        virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getEntities() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getEntities() throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         The internal subset as a string, or null if there is none.
         */
-        virtual OUString SAL_CALL getInternalSubset() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual OUString SAL_CALL getInternalSubset() throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         The name of DTD; i.e., the name immediately following the DOCTYPE
         keyword.
         */
-        virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         A NamedNodeMap containing the notations declared in the DTD.
         */
-        virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getNotations() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getNotations() throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         The public identifier of the external subset.
         */
-        virtual OUString SAL_CALL getPublicId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual OUString SAL_CALL getPublicId() throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         The system identifier of the external subset.
         */
-        virtual OUString SAL_CALL getSystemId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual OUString SAL_CALL getSystemId() throw (css::uno::RuntimeException, std::exception) override;
 
         // ---- resolve uno inheritance problems...
         // overrides for XNode base
         virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
     // --- delegation for XNode base.
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::appendChild(newChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::cloneNode(deep);
     }
     virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getAttributes();
     }
     virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getFirstChild();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getLastChild();
     }
     virtual OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getLocalName();
     }
     virtual OUString SAL_CALL getNamespaceURI()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getNamespaceURI();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getNextSibling();
     }
     virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getNodeType();
     }
     virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getOwnerDocument();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getParentNode();
     }
     virtual OUString SAL_CALL getPrefix()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getPrefix();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getPreviousSibling();
     }
     virtual sal_Bool SAL_CALL hasAttributes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::hasAttributes();
     }
     virtual sal_Bool SAL_CALL hasChildNodes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::hasChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
             const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::insertBefore(newChild, refChild);
     }
     virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::isSupported(feature, ver);
     }
     virtual void SAL_CALL normalize()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         CNode::normalize();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::removeChild(oldChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
             const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::replaceChild(newChild, oldChild);
     }
     virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::setNodeValue(nodeValue);
     }
     virtual void SAL_CALL setPrefix(const OUString& prefix)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::setPrefix(prefix);
     }
diff --git a/unoxml/source/dom/domimplementation.hxx b/unoxml/source/dom/domimplementation.hxx
index 540fa7fb7f9f..de218640f1f1 100644
--- a/unoxml/source/dom/domimplementation.hxx
+++ b/unoxml/source/dom/domimplementation.hxx
@@ -39,26 +39,26 @@ namespace DOM
         static CDOMImplementation* get();
 
         // there is just 1 static instance, so these must not delete it!
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE;
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE;
+        virtual void SAL_CALL acquire() throw () override;
+        virtual void SAL_CALL release() throw () override;
 
         /**
         Creates a DOM Document object of the specified type with its document element.
         */
         virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL createDocument(const OUString& namespaceURI, const OUString& qualifiedName, const css::uno::Reference< css::xml::dom::XDocumentType >& doctype)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Creates an empty DocumentType node.
         */
         virtual css::uno::Reference< css::xml::dom::XDocumentType > SAL_CALL createDocumentType(const OUString& qualifiedName, const OUString& publicId, const OUString& systemId)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Test if the DOM implementation implements a specific feature.
         */
         virtual sal_Bool SAL_CALL hasFeature(const OUString& feature, const OUString& ver)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         };
 }
 #endif
diff --git a/unoxml/source/dom/element.hxx b/unoxml/source/dom/element.hxx
index 4e29ae1b100c..e14a5de4b908 100644
--- a/unoxml/source/dom/element.hxx
+++ b/unoxml/source/dom/element.hxx
@@ -50,35 +50,35 @@ namespace DOM
 
     public:
 
-        virtual void saxify(const css::uno::Reference< css::xml::sax::XDocumentHandler >& i_xHandler) SAL_OVERRIDE;
+        virtual void saxify(const css::uno::Reference< css::xml::sax::XDocumentHandler >& i_xHandler) override;
 
-        virtual void fastSaxify( Context& i_rContext ) SAL_OVERRIDE;
+        virtual void fastSaxify( Context& i_rContext ) override;
 
-        virtual bool IsChildTypeAllowed(css::xml::dom::NodeType const nodeType) SAL_OVERRIDE;
+        virtual bool IsChildTypeAllowed(css::xml::dom::NodeType const nodeType) override;
 
         /**
         Retrieves an attribute value by name.
         */
         virtual OUString  SAL_CALL getAttribute(const OUString& name)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Retrieves an attribute node by name.
         */
         virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL getAttributeNode(const OUString& name)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Retrieves an Attr node by local name and namespace URI.
         */
         virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL getAttributeNodeNS(const OUString& namespaceURI, const OUString& localName)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Retrieves an attribute value by local name and namespace URI.
         */
         virtual OUString SAL_CALL getAttributeNS(const OUString& namespaceURI, const OUString& localName)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Returns a NodeList of all descendant Elements with a given tag name,
@@ -86,7 +86,7 @@ namespace DOM
         encountered in a preorder traversal of this Element tree.
         */
         virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getElementsByTagName(const OUString& name)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Returns a NodeList of all the descendant Elements with a given local
@@ -95,187 +95,187 @@ namespace DOM
         */
         virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getElementsByTagNameNS(const OUString& namespaceURI,
                 const OUString& localName)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         The name of the element.
         */
         virtual OUString SAL_CALL getTagName()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Returns true when an attribute with a given name is specified on this
         element or has a default value, false otherwise.
         */
         virtual sal_Bool SAL_CALL hasAttribute(const OUString& name)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Returns true when an attribute with a given local name and namespace
         URI is specified on this element or has a default value, false otherwise.
         */
         virtual sal_Bool SAL_CALL hasAttributeNS(const OUString& namespaceURI, const OUString& localName)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Removes an attribute by name.
         */
         virtual void SAL_CALL removeAttribute(const OUString& name)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         /**
         Removes the specified attribute node.
         */
         virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL removeAttributeNode(const css::uno::Reference< css::xml::dom::XAttr >& oldAttr)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         /**
         Removes an attribute by local name and namespace URI.
         */
         virtual void SAL_CALL removeAttributeNS(const OUString& namespaceURI, const OUString& localName)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         /**
         Adds a new attribute.
         */
         virtual void SAL_CALL setAttribute(const OUString& name, const OUString& value)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         /**
         Adds a new attribute node.
         */
         virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL setAttributeNode(const css::uno::Reference< css::xml::dom::XAttr >& newAttr)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         /**
         Adds a new attribute.
         */
         virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL setAttributeNodeNS(const css::uno::Reference< css::xml::dom::XAttr >& newAttr)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         /**
         Adds a new attribute.
         */
         virtual void SAL_CALL setAttributeNS(
                 const OUString& namespaceURI, const OUString& qualifiedName, const OUString& value)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         // overrides for XNode base
         virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual OUString SAL_CALL getLocalName()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         // resolve uno inheritance problems...
         // --- delegation for XNode base.
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CNode::appendChild(newChild);
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::cloneNode(deep);
         }
         virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getChildNodes();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getFirstChild();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getLastChild();
         }
         virtual OUString SAL_CALL getNamespaceURI()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getNamespaceURI();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getNextSibling();
         }
         virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getNodeType();
         }
         virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getOwnerDocument();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getParentNode();
         }
         virtual OUString SAL_CALL getPrefix()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getPrefix();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::getPreviousSibling();
         }
         virtual sal_Bool SAL_CALL hasAttributes()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::hasAttributes();
         }
         virtual sal_Bool SAL_CALL hasChildNodes()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::hasChildNodes();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
                 const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CNode::insertBefore(newChild, refChild);
         }
         virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CNode::isSupported(feature, ver);
         }
         virtual void SAL_CALL normalize()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             CNode::normalize();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CNode::removeChild(oldChild);
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
                 const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CNode::replaceChild(newChild, oldChild);
         }
         virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CNode::setNodeValue(nodeValue);
         }
         virtual void SAL_CALL setPrefix(const OUString& prefix)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CNode::setPrefix(prefix);
         }
diff --git a/unoxml/source/dom/elementlist.cxx b/unoxml/source/dom/elementlist.cxx
index ef88c99b4cce..e67e5f46c14d 100644
--- a/unoxml/source/dom/elementlist.cxx
+++ b/unoxml/source/dom/elementlist.cxx
@@ -49,7 +49,7 @@ namespace
         }
 
         virtual void SAL_CALL handleEvent(const css::uno::Reference<css::xml::dom::events::XEvent>& rEvent)
-            throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw(css::uno::RuntimeException, std::exception) override
         {
             css::uno::Reference<css::xml::dom::events::XEventListener> xOwner(mxOwner.get(),
                 css::uno::UNO_QUERY);
diff --git a/unoxml/source/dom/elementlist.hxx b/unoxml/source/dom/elementlist.hxx
index 0792892369bb..7e4bf688dc6a 100644
--- a/unoxml/source/dom/elementlist.hxx
+++ b/unoxml/source/dom/elementlist.hxx
@@ -75,16 +75,16 @@ namespace DOM
         /**
         The number of nodes in the list.
         */
-        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override;
         /**
         Returns the indexth item in the collection.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         // XEventListener
         virtual void SAL_CALL handleEvent(const css::uno::Reference< css::xml::dom::events::XEvent >& evt)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
     };
 
     class CElementList
@@ -101,7 +101,7 @@ namespace DOM
         /**
         The number of nodes in the list.
         */
-        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override
         {
             return m_xImpl->getLength();
         }
@@ -109,14 +109,14 @@ namespace DOM
         Returns the indexth item in the collection.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return m_xImpl->item(index);
         }
 
         // XEventListener
         virtual void SAL_CALL handleEvent(const css::uno::Reference< css::xml::dom::events::XEvent >& evt)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             m_xImpl->handleEvent(evt);
         }
diff --git a/unoxml/source/dom/entitiesmap.hxx b/unoxml/source/dom/entitiesmap.hxx
index efa977e94b1e..1a3f1e387c77 100644
--- a/unoxml/source/dom/entitiesmap.hxx
+++ b/unoxml/source/dom/entitiesmap.hxx
@@ -45,53 +45,53 @@ namespace DOM
         /**
         The number of nodes in this map.
         */
-        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Retrieves a node specified by local name
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
-            getNamedItem(const OUString& name) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            getNamedItem(const OUString& name) throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Retrieves a node specified by local name and namespace URI.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNamedItemNS(
                 OUString const& namespaceURI, OUString const& localName)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Returns the indexth item in the map.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
-            item(sal_Int32 index) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            item(sal_Int32 index) throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Removes a node specified by name.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
-            removeNamedItem(OUString const& name) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            removeNamedItem(OUString const& name) throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         // Removes a node specified by local name and namespace URI.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeNamedItemNS(
                 OUString const& namespaceURI, OUString const& localName)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         // Adds a node using its nodeName attribute.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
             setNamedItem(css::uno::Reference< css::xml::dom::XNode > const& arg)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Adds a node using its namespaceURI and localName.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
             setNamedItemNS(css::uno::Reference< css::xml::dom::XNode > const& arg)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
     };
 }
 
diff --git a/unoxml/source/dom/entity.hxx b/unoxml/source/dom/entity.hxx
index 30f5c5b3dc01..3bcc94408f87 100644
--- a/unoxml/source/dom/entity.hxx
+++ b/unoxml/source/dom/entity.hxx
@@ -49,144 +49,144 @@ namespace DOM
                 xmlEntityPtr const pEntity);
 
     public:
-        virtual bool IsChildTypeAllowed(css::xml::dom::NodeType const nodeType) SAL_OVERRIDE;
+        virtual bool IsChildTypeAllowed(css::xml::dom::NodeType const nodeType) override;
 
         /**
         For unparsed entities, the name of the notation for the entity.
         */
-        virtual OUString SAL_CALL getNotationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual OUString SAL_CALL getNotationName() throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         The public identifier associated with the entity, if specified.
         */
-        virtual OUString SAL_CALL getPublicId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual OUString SAL_CALL getPublicId() throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         The system identifier associated with the entity, if specified.
         */
-        virtual OUString SAL_CALL getSystemId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual OUString SAL_CALL getSystemId() throw (css::uno::RuntimeException, std::exception) override;
 
         // ---- resolve uno inheritance problems...
         // overrides for XNode base
         virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
     // --- delegation for XNode base.
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::appendChild(newChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::cloneNode(deep);
     }
     virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getAttributes();
     }
     virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getFirstChild();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getLastChild();
     }
     virtual OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getLocalName();
     }
     virtual OUString SAL_CALL getNamespaceURI()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getNamespaceURI();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getNextSibling();
     }
     virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getNodeType();
     }
     virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getOwnerDocument();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getParentNode();
     }
     virtual OUString SAL_CALL getPrefix()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getPrefix();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getPreviousSibling();
     }
     virtual sal_Bool SAL_CALL hasAttributes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::hasAttributes();
     }
     virtual sal_Bool SAL_CALL hasChildNodes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::hasChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
             const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::insertBefore(newChild, refChild);
     }
     virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::isSupported(feature, ver);
     }
     virtual void SAL_CALL normalize()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         CNode::normalize();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::removeChild(oldChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
             const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::replaceChild(newChild, oldChild);
     }
     virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::setNodeValue(nodeValue);
     }
     virtual void SAL_CALL setPrefix(const OUString& prefix)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::setPrefix(prefix);
     }
diff --git a/unoxml/source/dom/entityreference.hxx b/unoxml/source/dom/entityreference.hxx
index 11076cba753a..1ce5c3648559 100644
--- a/unoxml/source/dom/entityreference.hxx
+++ b/unoxml/source/dom/entityreference.hxx
@@ -45,129 +45,129 @@ namespace DOM
             xmlNodePtr const pNode);
 
     public:
-        virtual bool IsChildTypeAllowed(css::xml::dom::NodeType const nodeType) SAL_OVERRIDE;
+        virtual bool IsChildTypeAllowed(css::xml::dom::NodeType const nodeType) override;
 
         // ---- resolve uno inheritance problems...
         // overrides for XNode base
         virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
     // --- delegation for XNode base.
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::appendChild(newChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::cloneNode(deep);
     }
     virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getAttributes();
     }
     virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getFirstChild();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getLastChild();
     }
     virtual OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getLocalName();
     }
     virtual OUString SAL_CALL getNamespaceURI()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getNamespaceURI();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getNextSibling();
     }
     virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getNodeType();
     }
     virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getOwnerDocument();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getParentNode();
     }
     virtual OUString SAL_CALL getPrefix()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getPrefix();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getPreviousSibling();
     }
     virtual sal_Bool SAL_CALL hasAttributes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::hasAttributes();
     }
     virtual sal_Bool SAL_CALL hasChildNodes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::hasChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
             const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::insertBefore(newChild, refChild);
     }
     virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::isSupported(feature, ver);
     }
     virtual void SAL_CALL normalize()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         CNode::normalize();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::removeChild(oldChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
             const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::replaceChild(newChild, oldChild);
     }
     virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::setNodeValue(nodeValue);
     }
     virtual void SAL_CALL setPrefix(const OUString& prefix)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::setPrefix(prefix);
     }
diff --git a/unoxml/source/dom/node.hxx b/unoxml/source/dom/node.hxx
index 74c81d4b9a05..076b2bc26ba0 100644
--- a/unoxml/source/dom/node.hxx
+++ b/unoxml/source/dom/node.hxx
@@ -145,127 +145,127 @@ namespace DOM
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
             appendChild(css::uno::Reference< css::xml::dom::XNode > const& xNewChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         /**
         Returns a duplicate of this node, i.e., serves as a generic copy
         constructor for nodes.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         A NamedNodeMap containing the attributes of this node
         (if it is an Element) or null otherwise.
         */
         virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         A NodeList that contains all children of this node.
         */
         virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         The first child of this node.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         The last child of this node.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Returns the local part of the qualified name of this node.
         */
         virtual OUString SAL_CALL getLocalName()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         The namespace URI of this node, or null if it is unspecified.
         */
         virtual OUString SAL_CALL getNamespaceURI()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         The node immediately following this node.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         The name of this node, depending on its type; see the table above.
         -- virtual implemented by actual node types
         */
         virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         A code representing the type of the underlying object, as defined above.
         */
         virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         The value of this node, depending on its type; see the table above.
         -- virtual implemented by actual node types
         */
         virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         The Document object associated with this node.
         */
         virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         The parent of this node.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         The namespace prefix of this node, or null if it is unspecified.
         */
         virtual OUString SAL_CALL getPrefix()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         The node immediately preceding this node.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Returns whether this node (if it is an element) has any attributes.
         */
         virtual sal_Bool SAL_CALL hasAttributes()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Returns whether this node has any children.
         */
         virtual sal_Bool SAL_CALL hasChildNodes()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Inserts the node newChild before the existing child node refChild.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
                 const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         /**
         Tests whether the DOM implementation implements a specific feature and
         that feature is supported by this node.
         */
         virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Puts all Text nodes in the full depth of the sub-tree underneath this
@@ -275,14 +275,14 @@ namespace DOM
         Text nodes nor empty Text nodes.
         */
         virtual void SAL_CALL normalize()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Removes the child node indicated by oldChild from the list of children,
         and returns it.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         /**
         Replaces the child node oldChild with newChild in the list of children,
@@ -290,39 +290,39 @@ namespace DOM
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
                 const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         /**
         The value of this node, depending on its type; see the table above.
         */
         virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         /**
         The namespace prefix of this node, or null if it is unspecified.
         */
         virtual void SAL_CALL setPrefix(const OUString& prefix)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
 
         // --- XEventTarget
         virtual void SAL_CALL addEventListener(const OUString& eventType,
             const css::uno::Reference< css::xml::dom::events::XEventListener >& listener,
             sal_Bool useCapture)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         virtual void SAL_CALL removeEventListener(const OUString& eventType,
             const css::uno::Reference< css::xml::dom::events::XEventListener >& listener,
             sal_Bool useCapture)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         virtual sal_Bool SAL_CALL dispatchEvent(const css::uno::Reference< css::xml::dom::events::XEvent >& evt)
-            throw(css::uno::RuntimeException, css::xml::dom::events::EventException, std::exception) SAL_OVERRIDE;
+            throw(css::uno::RuntimeException, css::xml::dom::events::EventException, std::exception) override;
 
         // --- XUnoTunnel
         virtual ::sal_Int64 SAL_CALL
             getSomething(css::uno::Sequence< ::sal_Int8 > const& rId)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
     };
 
     /// eliminate redundant namespace declarations
diff --git a/unoxml/source/dom/notation.hxx b/unoxml/source/dom/notation.hxx
index f38ad98d289f..323861f71433 100644
--- a/unoxml/source/dom/notation.hxx
+++ b/unoxml/source/dom/notation.hxx
@@ -48,134 +48,134 @@ namespace DOM
         /**
         The public identifier of this notation.
         */
-        virtual OUString SAL_CALL getPublicId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual OUString SAL_CALL getPublicId() throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         The system identifier of this notation.
         */
-        virtual OUString SAL_CALL getSystemId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual OUString SAL_CALL getSystemId() throw (css::uno::RuntimeException, std::exception) override;
 
         // ---- resolve uno inheritance problems...
         // overrides for XNode base
         virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
     // --- delegation for XNode base.
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::appendChild(newChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::cloneNode(deep);
     }
     virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getAttributes();
     }
     virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getFirstChild();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getLastChild();
     }
     virtual OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getLocalName();
     }
     virtual OUString SAL_CALL getNamespaceURI()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getNamespaceURI();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getNextSibling();
     }
     virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getNodeType();
     }
     virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getOwnerDocument();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getParentNode();
     }
     virtual OUString SAL_CALL getPrefix()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getPrefix();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getPreviousSibling();
     }
     virtual sal_Bool SAL_CALL hasAttributes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::hasAttributes();
     }
     virtual sal_Bool SAL_CALL hasChildNodes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::hasChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
             const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::insertBefore(newChild, refChild);
     }
     virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::isSupported(feature, ver);
     }
     virtual void SAL_CALL normalize()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         CNode::normalize();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::removeChild(oldChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
             const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::replaceChild(newChild, oldChild);
     }
     virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::setNodeValue(nodeValue);
     }
     virtual void SAL_CALL setPrefix(const OUString& prefix)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::setPrefix(prefix);
     }
diff --git a/unoxml/source/dom/notationsmap.hxx b/unoxml/source/dom/notationsmap.hxx
index 6b119a590d60..d07277e1928f 100644
--- a/unoxml/source/dom/notationsmap.hxx
+++ b/unoxml/source/dom/notationsmap.hxx
@@ -45,53 +45,53 @@ namespace DOM
         /**
         The number of nodes in this map.
         */
-        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Retrieves a node specified by local name
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
-            getNamedItem(OUString const& name) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            getNamedItem(OUString const& name) throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Retrieves a node specified by local name and namespace URI.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNamedItemNS(
                 OUString const& namespaceURI, OUString const& localName)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Returns the indexth item in the map.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
-            item(sal_Int32 index) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            item(sal_Int32 index) throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Removes a node specified by name.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
-            removeNamedItem(OUString const& name) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            removeNamedItem(OUString const& name) throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         // Removes a node specified by local name and namespace URI.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeNamedItemNS(
                 OUString const& namespaceURI, OUString const& localName)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         // Adds a node using its nodeName attribute.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
             setNamedItem(css::uno::Reference< css::xml::dom::XNode > const& arg)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Adds a node using its namespaceURI and localName.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
             setNamedItemNS(css::uno::Reference< css::xml::dom::XNode > const& arg)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
     };
 }
 
diff --git a/unoxml/source/dom/processinginstruction.hxx b/unoxml/source/dom/processinginstruction.hxx
index 4e5505aa1d7b..212bbfd7ae11 100644
--- a/unoxml/source/dom/processinginstruction.hxx
+++ b/unoxml/source/dom/processinginstruction.hxx
@@ -46,142 +46,142 @@ namespace DOM
 
     public:
 
-        virtual void saxify(const css::uno::Reference< css::xml::sax::XDocumentHandler >& i_xHandler) SAL_OVERRIDE;
+        virtual void saxify(const css::uno::Reference< css::xml::sax::XDocumentHandler >& i_xHandler) override;
 
         /**
         The content of this processing instruction.
         */
-        virtual OUString SAL_CALL getData() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual OUString SAL_CALL getData() throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         The target of this processing instruction.
         */
-        virtual OUString SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual OUString SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         The content of this processing instruction.
         */
-        virtual void SAL_CALL setData(const OUString& data) throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+        virtual void SAL_CALL setData(const OUString& data) throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
         // ---- resolve uno inheritance problems...
         // overrides for XNode base
         virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual void SAL_CALL setNodeValue(OUString const& rNodeValue)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
 
     // --- delegation for XNode base.
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::appendChild(newChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::cloneNode(deep);
     }
     virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getAttributes();
     }
     virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getFirstChild();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getLastChild();
     }
     virtual OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getLocalName();
     }
     virtual OUString SAL_CALL getNamespaceURI()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getNamespaceURI();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getNextSibling();
     }
     virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getNodeType();
     }
     virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getOwnerDocument();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getParentNode();
     }
     virtual OUString SAL_CALL getPrefix()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getPrefix();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::getPreviousSibling();
     }
     virtual sal_Bool SAL_CALL hasAttributes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::hasAttributes();
     }
     virtual sal_Bool SAL_CALL hasChildNodes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::hasChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
             const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::insertBefore(newChild, refChild);
     }
     virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         return CNode::isSupported(feature, ver);
     }
     virtual void SAL_CALL normalize()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, std::exception) override
     {
         CNode::normalize();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::removeChild(oldChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
             const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::replaceChild(newChild, oldChild);
     }
     virtual void SAL_CALL setPrefix(const OUString& prefix)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
     {
         return CNode::setPrefix(prefix);
     }
diff --git a/unoxml/source/dom/saxbuilder.hxx b/unoxml/source/dom/saxbuilder.hxx
index cfa0869f3b11..ad3e7ce4dca6 100644
--- a/unoxml/source/dom/saxbuilder.hxx
+++ b/unoxml/source/dom/saxbuilder.hxx
@@ -78,46 +78,46 @@ namespace DOM
 
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         // XDocumentHandler
         virtual void SAL_CALL startDocument()
-            throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) SAL_OVERRIDE;
+            throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override;
         virtual void SAL_CALL endDocument()
-            throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) SAL_OVERRIDE;
+            throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override;
         virtual void SAL_CALL startElement( const OUString& aName,
              const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs )
-            throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) SAL_OVERRIDE;
+            throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override;
         virtual void SAL_CALL endElement( const OUString& aName )
-            throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) SAL_OVERRIDE;
+            throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override;
         virtual void SAL_CALL characters( const OUString& aChars )
-            throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) SAL_OVERRIDE;
+            throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override;
         virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
-            throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) SAL_OVERRIDE;
+            throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override;
         virtual void SAL_CALL processingInstruction( const OUString& aTarget,
              const OUString& aData )
-            throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) SAL_OVERRIDE;
+            throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override;
         virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator )
-            throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) SAL_OVERRIDE;
+            throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override;
 
 
         // XSAXDocumentBuilder
         virtual css::xml::dom::SAXDocumentBuilderState SAL_CALL getState()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual void SAL_CALL reset()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getDocument()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual css::uno::Reference< css::xml::dom::XDocumentFragment > SAL_CALL getDocumentFragment()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual void SAL_CALL startDocumentFragment(const css::uno::Reference< css::xml::dom::XDocument >& ownerDoc)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual void SAL_CALL endDocumentFragment()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
 
     };
diff --git a/unoxml/source/dom/text.hxx b/unoxml/source/dom/text.hxx
index 1ee6e5d4f7bd..884f7d6d4eaa 100644
--- a/unoxml/source/dom/text.hxx
+++ b/unoxml/source/dom/text.hxx
@@ -50,52 +50,52 @@ namespace DOM
 
     public:
 
-        virtual void saxify(const css::uno::Reference< css::xml::sax::XDocumentHandler >& i_xHandler) SAL_OVERRIDE;
+        virtual void saxify(const css::uno::Reference< css::xml::sax::XDocumentHandler >& i_xHandler) override;
 
-        virtual void fastSaxify( Context& io_rContext ) SAL_OVERRIDE;
+        virtual void fastSaxify( Context& io_rContext ) override;
 
          // Breaks this node into two nodes at the specified offset, keeping
          // both in the tree as siblings.
          virtual css::uno::Reference< css::xml::dom::XText > SAL_CALL splitText(sal_Int32 offset)
-             throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+             throw (css::uno::RuntimeException, std::exception) override;
 
 
          // --- delegations for XCharacterData
         virtual void SAL_CALL appendData(const OUString& arg)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             CCharacterData::appendData(arg);
         }
         virtual void SAL_CALL deleteData(sal_Int32 offset, sal_Int32 count)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             CCharacterData::deleteData(offset, count);
         }
-        virtual OUString SAL_CALL getData() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual OUString SAL_CALL getData() throw (css::uno::RuntimeException, std::exception) override
         {
             return CCharacterData::getData();
         }
-        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override
         {
             return CCharacterData::getLength();
         }
         virtual void SAL_CALL insertData(sal_Int32 offset, const OUString& arg)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             CCharacterData::insertData(offset, arg);
         }
         virtual void SAL_CALL replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             CCharacterData::replaceData(offset, count, arg);
         }
         virtual void SAL_CALL setData(const OUString& data)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             CCharacterData::setData(data);
         }
         virtual OUString SAL_CALL subStringData(sal_Int32 offset, sal_Int32 count)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CCharacterData::subStringData(offset, count);
         }
@@ -103,128 +103,128 @@ namespace DOM
 
          // --- overrides for XNode base
         virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         // --- resolve uno inheritance problems...
         // --- delegation for XNode base.
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CCharacterData::appendChild(newChild);
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CCharacterData::cloneNode(deep);
         }
         virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CCharacterData::getAttributes();
         }
         virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CCharacterData::getChildNodes();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CCharacterData::getFirstChild();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CCharacterData::getLastChild();
         }
         virtual OUString SAL_CALL getLocalName()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CCharacterData::getLocalName();
         }
         virtual OUString SAL_CALL getNamespaceURI()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CCharacterData::getNamespaceURI();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CCharacterData::getNextSibling();
         }
         virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CCharacterData::getNodeType();
         }
-        virtual OUString SAL_CALL getNodeValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual OUString SAL_CALL getNodeValue() throw (css::uno::RuntimeException, std::exception) override
         {
             return CCharacterData::getNodeValue();
         }
         virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CCharacterData::getOwnerDocument();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CCharacterData::getParentNode();
         }
         virtual OUString SAL_CALL getPrefix()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CCharacterData::getPrefix();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CCharacterData::getPreviousSibling();
         }
         virtual sal_Bool SAL_CALL hasAttributes()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CCharacterData::hasAttributes();
         }
         virtual sal_Bool SAL_CALL hasChildNodes()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CCharacterData::hasChildNodes();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
                 const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CCharacterData::insertBefore(newChild, refChild);
         }
         virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             return CCharacterData::isSupported(feature, ver);
         }
         virtual void SAL_CALL normalize()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, std::exception) override
         {
             CCharacterData::normalize();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CCharacterData::removeChild(oldChild);
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
                 const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CCharacterData::replaceChild(newChild, oldChild);
         }
         virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CCharacterData::setNodeValue(nodeValue);
         }
         virtual void SAL_CALL setPrefix(const OUString& prefix)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) SAL_OVERRIDE
+            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
         {
             return CCharacterData::setPrefix(prefix);
         }
diff --git a/unoxml/source/events/event.hxx b/unoxml/source/events/event.hxx
index d6df8a739d4a..472caa46dc3d 100644
--- a/unoxml/source/events/event.hxx
+++ b/unoxml/source/events/event.hxx
@@ -53,19 +53,19 @@ public:
     explicit CEvent();
 
     virtual ~CEvent();
-    virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL initEvent(
         const OUString& eventTypeArg,
         sal_Bool canBubbleArg,
-        sal_Bool cancelableArg)  throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        sal_Bool cancelableArg)  throw (css::uno::RuntimeException, std::exception) override;
 };
 }}
 #endif
diff --git a/unoxml/source/events/mouseevent.hxx b/unoxml/source/events/mouseevent.hxx
index 6a53ed3e7949..4c1964a71c1e 100644
--- a/unoxml/source/events/mouseevent.hxx
+++ b/unoxml/source/events/mouseevent.hxx
@@ -50,16 +50,16 @@ protected:
 public:
     explicit CMouseEvent();
 
-    virtual sal_Int32 SAL_CALL getScreenX() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Int32 SAL_CALL getScreenY() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Int32 SAL_CALL getClientX() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Int32 SAL_CALL getClientY() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL getCtrlKey() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL getShiftKey() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL getAltKey() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL getMetaKey() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Int16 SAL_CALL getButton() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getRelatedTarget()  throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual sal_Int32 SAL_CALL getScreenX() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getScreenY() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getClientX() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getClientY() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getCtrlKey() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getShiftKey() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getAltKey() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getMetaKey() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getButton() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getRelatedTarget()  throw(css::uno::RuntimeException, std::exception) override;
 
     virtual void SAL_CALL initMouseEvent(
                         const OUString& typeArg,
@@ -77,30 +77,30 @@ public:
                         sal_Bool metaKeyArg,
                         sal_Int16 buttonArg,
                         const css::uno::Reference< css::xml::dom::events::XEventTarget >& relatedTargetArg)
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::uno::RuntimeException, std::exception) override;
 
     // delegate to CUIevent
-    virtual css::uno::Reference< css::xml::dom::views::XAbstractView > SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Int32 SAL_CALL getDetail() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference< css::xml::dom::views::XAbstractView > SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getDetail() throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL initUIEvent(const OUString& typeArg,
                      sal_Bool canBubbleArg,
                      sal_Bool cancelableArg,
                      const css::uno::Reference< css::xml::dom::views::XAbstractView >& viewArg,
-                     sal_Int32 detailArg) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                     sal_Int32 detailArg) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL initEvent(
         const OUString& eventTypeArg,
         sal_Bool canBubbleArg,
         sal_Bool cancelableArg)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 };
 }}
 #endif
diff --git a/unoxml/source/events/mutationevent.hxx b/unoxml/source/events/mutationevent.hxx
index d95a05f3ded5..5dc6472d9dff 100644
--- a/unoxml/source/events/mutationevent.hxx
+++ b/unoxml/source/events/mutationevent.hxx
@@ -52,11 +52,11 @@ public:
 
     virtual ~CMutationEvent();
 
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getRelatedNode() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual OUString SAL_CALL getPrevValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual OUString SAL_CALL getNewValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual OUString SAL_CALL getAttrName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::xml::dom::events::AttrChangeType SAL_CALL getAttrChange() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getRelatedNode() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getPrevValue() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getNewValue() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAttrName() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::xml::dom::events::AttrChangeType SAL_CALL getAttrChange() throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL initMutationEvent(
                            const OUString& typeArg,
                            sal_Bool canBubbleArg,
@@ -65,23 +65,23 @@ public:
                            const OUString& prevValueArg,
                            const OUString& newValueArg,
                            const OUString& attrNameArg,
-                           css::xml::dom::events::AttrChangeType attrChangeArg) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                           css::xml::dom::events::AttrChangeType attrChangeArg) throw (css::uno::RuntimeException, std::exception) override;
 
     // delegate to CEvent, since we are inheriting from CEvent and XEvent
-    virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL initEvent(
         const OUString& eventTypeArg,
         sal_Bool canBubbleArg,
         sal_Bool cancelableArg)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 };
 }}
 #endif
diff --git a/unoxml/source/events/uievent.hxx b/unoxml/source/events/uievent.hxx
index 4d197b2876ef..7a6b57030dfa 100644
--- a/unoxml/source/events/uievent.hxx
+++ b/unoxml/source/events/uievent.hxx
@@ -44,29 +44,29 @@ protected:
 public:
     explicit CUIEvent();
 
-    virtual css::uno::Reference< css::xml::dom::views::XAbstractView > SAL_CALL getView() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Int32 SAL_CALL getDetail() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference< css::xml::dom::views::XAbstractView > SAL_CALL getView() throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getDetail() throw(css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL initUIEvent(const OUString& typeArg,
                      sal_Bool canBubbleArg,
                      sal_Bool cancelableArg,
                      const css::uno::Reference< css::xml::dom::views::XAbstractView >& viewArg,
-                     sal_Int32 detailArg) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                     sal_Int32 detailArg) throw(css::uno::RuntimeException, std::exception) override;
 
     // delegate to CEvent, since we are inheriting from CEvent and XEvent
-    virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL initEvent(
         const OUString& eventTypeArg,
         sal_Bool canBubbleArg,
         sal_Bool cancelableArg)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 };
 }}
 #endif
diff --git a/unoxml/source/rdf/CBlankNode.cxx b/unoxml/source/rdf/CBlankNode.cxx
index 5590f6f39ac3..67280691cdc0 100644
--- a/unoxml/source/rdf/CBlankNode.cxx
+++ b/unoxml/source/rdf/CBlankNode.cxx
@@ -44,15 +44,15 @@ public:
     virtual ~CBlankNode() {}
 
     // css::lang::XServiceInfo:
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
 
     // css::lang::XInitialization:
-    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override;
 
     // css::rdf::XNode:
-    virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception) override;
 
 private:
     css::uno::Reference< css::uno::XComponentContext > m_xContext;
diff --git a/unoxml/source/rdf/CLiteral.cxx b/unoxml/source/rdf/CLiteral.cxx
index 520939823e49..7b2080c36f89 100644
--- a/unoxml/source/rdf/CLiteral.cxx
+++ b/unoxml/source/rdf/CLiteral.cxx
@@ -46,20 +46,20 @@ public:
     virtual ~CLiteral() {}
 
     // css::lang::XServiceInfo:
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
 
     // css::lang::XInitialization:
-    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override;
 
     // css::rdf::XNode:
-    virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception) override;
 
     // css::rdf::XLiteral:
-    virtual OUString SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual OUString SAL_CALL getLanguage() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::uno::Reference< css::rdf::XURI > SAL_CALL getDatatype() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual OUString SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getLanguage() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::rdf::XURI > SAL_CALL getDatatype() throw (css::uno::RuntimeException, std::exception) override;
 
 private:
     css::uno::Reference< css::uno::XComponentContext > m_xContext;
diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx
index ec9430fe2ed0..49a7ec45ea7a 100644
--- a/unoxml/source/rdf/CURI.cxx
+++ b/unoxml/source/rdf/CURI.cxx
@@ -45,19 +45,19 @@ public:
     virtual ~CURI() {}
 
     // css::lang::XServiceInfo:
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
 
     // css::lang::XInitialization:
-    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override;
 
     // css::rdf::XNode:
-    virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception) override;
 
     // css::rdf::XURI:
-    virtual OUString SAL_CALL getLocalName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual OUString SAL_CALL getNamespace() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual OUString SAL_CALL getLocalName() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getNamespace() throw (css::uno::RuntimeException, std::exception) override;
 
 private:
     /// handle css.rdf.URIs
diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx
index 8448f222ddc9..9096b0648421 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -284,15 +284,15 @@ public:
 
     // css::lang::XServiceInfo:
     virtual OUString SAL_CALL getImplementationName()
-        throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL supportsService(
-            const OUString & ServiceName) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            const OUString & ServiceName) throw (uno::RuntimeException, std::exception) override;
     virtual uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override;
 
     // css::rdf::XRepository:
     virtual uno::Reference< rdf::XBlankNode > SAL_CALL createBlankNode()
-        throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (uno::RuntimeException, std::exception) override;
     virtual uno::Reference<rdf::XNamedGraph> SAL_CALL importGraph(
             ::sal_Int16 i_Format,
             const uno::Reference< io::XInputStream > & i_xInStream,
@@ -301,7 +301,7 @@ public:
         throw (uno::RuntimeException, lang::IllegalArgumentException,
             datatransfer::UnsupportedFlavorException,
             container::ElementExistException, rdf::ParseException,
-            rdf::RepositoryException, io::IOException, std::exception) SAL_OVERRIDE;
+            rdf::RepositoryException, io::IOException, std::exception) override;
     virtual void SAL_CALL exportGraph(::sal_Int16 i_Format,
             const uno::Reference< io::XOutputStream > & i_xOutStream,
             const uno::Reference< rdf::XURI > & i_xGraphName,
@@ -309,38 +309,38 @@ public:
         throw (uno::RuntimeException, lang::IllegalArgumentException,
             datatransfer::UnsupportedFlavorException,
             container::NoSuchElementException, rdf::RepositoryException,
-            io::IOException, std::exception) SAL_OVERRIDE;
+            io::IOException, std::exception) override;
     virtual uno::Sequence< uno::Reference< rdf::XURI > > SAL_CALL
-        getGraphNames() throw (uno::RuntimeException, rdf::RepositoryException, std::exception) SAL_OVERRIDE;
+        getGraphNames() throw (uno::RuntimeException, rdf::RepositoryException, std::exception) override;
     virtual uno::Reference< rdf::XNamedGraph > SAL_CALL getGraph(
             const uno::Reference< rdf::XURI > & i_xGraphName)
         throw (uno::RuntimeException, lang::IllegalArgumentException,
-            rdf::RepositoryException, std::exception) SAL_OVERRIDE;
+            rdf::RepositoryException, std::exception) override;
     virtual uno::Reference< rdf::XNamedGraph > SAL_CALL createGraph(
             const uno::Reference< rdf::XURI > & i_xGraphName)
         throw (uno::RuntimeException, lang::IllegalArgumentException,
-            container::ElementExistException, rdf::RepositoryException, std::exception) SAL_OVERRIDE;
+            container::ElementExistException, rdf::RepositoryException, std::exception) override;
     virtual void SAL_CALL destroyGraph(
             const uno::Reference< rdf::XURI > & i_xGraphName)
         throw (uno::RuntimeException, lang::IllegalArgumentException,
-            container::NoSuchElementException, rdf::RepositoryException, std::exception) SAL_OVERRIDE;
+            container::NoSuchElementException, rdf::RepositoryException, std::exception) override;
     virtual uno::Reference< container::XEnumeration > SAL_CALL getStatements(
             const uno::Reference< rdf::XResource > & i_xSubject,
             const uno::Reference< rdf::XURI > & i_xPredicate,
             const uno::Reference< rdf::XNode > & i_xObject)
         throw (uno::RuntimeException,
-            rdf::RepositoryException, std::exception) SAL_OVERRIDE;
+            rdf::RepositoryException, std::exception) override;
     virtual uno::Reference< rdf::XQuerySelectResult > SAL_CALL
             querySelect(const OUString & i_rQuery)
         throw (uno::RuntimeException, rdf::QueryException,
-            rdf::RepositoryException, std::exception) SAL_OVERRIDE;
+            rdf::RepositoryException, std::exception) override;
     virtual uno::Reference< container::XEnumeration > SAL_CALL
         queryConstruct(const OUString & i_rQuery)
         throw (uno::RuntimeException, rdf::QueryException,
-            rdf::RepositoryException, std::exception) SAL_OVERRIDE;
+            rdf::RepositoryException, std::exception) override;
     virtual sal_Bool SAL_CALL queryAsk(const OUString & i_rQuery)
         throw (uno::RuntimeException, rdf::QueryException,
-            rdf::RepositoryException, std::exception) SAL_OVERRIDE;
+            rdf::RepositoryException, std::exception) override;
 
     // css::rdf::XDocumentRepository:
     virtual void SAL_CALL setStatementRDFa(
@@ -350,27 +350,27 @@ public:
             const OUString & i_rRDFaContent,
             const uno::Reference< rdf::XURI > & i_xRDFaDatatype)
         throw (uno::RuntimeException, lang::IllegalArgumentException,
-            rdf::RepositoryException, std::exception) SAL_OVERRIDE;
+            rdf::RepositoryException, std::exception) override;
     virtual void SAL_CALL removeStatementRDFa(
             const uno::Reference< rdf::XMetadatable > & i_xElement)
         throw (uno::RuntimeException, lang::IllegalArgumentException,
-            rdf::RepositoryException, std::exception) SAL_OVERRIDE;
+            rdf::RepositoryException, std::exception) override;
     virtual beans::Pair< uno::Sequence<rdf::Statement>, sal_Bool > SAL_CALL
         getStatementRDFa(uno::Reference< rdf::XMetadatable > const& i_xElement)
         throw (uno::RuntimeException, lang::IllegalArgumentException,
-            rdf::RepositoryException, std::exception) SAL_OVERRIDE;
+            rdf::RepositoryException, std::exception) override;
     virtual uno::Reference< container::XEnumeration > SAL_CALL
         getStatementsRDFa(
             const uno::Reference< rdf::XResource > & i_xSubject,
             const uno::Reference< rdf::XURI > & i_xPredicate,
             const uno::Reference< rdf::XNode > & i_xObject)
         throw (uno::RuntimeException,
-            rdf::RepositoryException, std::exception) SAL_OVERRIDE;
+            rdf::RepositoryException, std::exception) override;
 
     // css::lang::XInitialization:
     virtual void SAL_CALL initialize(
             const uno::Sequence< css::uno::Any > & i_rArguments)
-        throw (uno::RuntimeException, uno::Exception, std::exception) SAL_OVERRIDE;
+        throw (uno::RuntimeException, uno::Exception, std::exception) override;
 
     // XNamedGraph forwards ---------------------------------------------
     const NamedGraphMap_t::iterator clearGraph_NoLock(
@@ -483,10 +483,10 @@ public:
 
     // css::container::XEnumeration:
     virtual sal_Bool SAL_CALL hasMoreElements()
-        throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (uno::RuntimeException, std::exception) override;
     virtual uno::Any SAL_CALL nextElement()
         throw (uno::RuntimeException, container::NoSuchElementException,
-            lang::WrappedTargetException, std::exception) SAL_OVERRIDE;
+            lang::WrappedTargetException, std::exception) override;
 
 private:
     // NB: this is not a weak pointer: streams _must_ be deleted before the
@@ -596,14 +596,14 @@ public:
 
     // css::container::XEnumeration:
     virtual sal_Bool SAL_CALL hasMoreElements()
-        throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (uno::RuntimeException, std::exception) override;
     virtual uno::Any SAL_CALL nextElement()
         throw (uno::RuntimeException, container::NoSuchElementException,
-            lang::WrappedTargetException, std::exception) SAL_OVERRIDE;
+            lang::WrappedTargetException, std::exception) override;
 
     // css::rdf::XQuerySelectResult:
     virtual uno::Sequence< OUString > SAL_CALL getBindingNames()
-        throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (uno::RuntimeException, std::exception) override;
 
 private:
 
@@ -710,38 +710,38 @@ public:
 
     // css::rdf::XNode:
     virtual OUString SAL_CALL getStringValue()
-        throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (uno::RuntimeException, std::exception) override;
 
     // css::rdf::XURI:
     virtual OUString SAL_CALL getNamespace()
-        throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL getLocalName()
-        throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (uno::RuntimeException, std::exception) override;
 
     // css::rdf::XNamedGraph:
     virtual uno::Reference<rdf::XURI> SAL_CALL getName()
-        throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL clear()
         throw (uno::RuntimeException,
-            container::NoSuchElementException, rdf::RepositoryException, std::exception) SAL_OVERRIDE;
+            container::NoSuchElementException, rdf::RepositoryException, std::exception) override;
     virtual void SAL_CALL addStatement(
             const uno::Reference< rdf::XResource > & i_xSubject,
             const uno::Reference< rdf::XURI > & i_xPredicate,
             const uno::Reference< rdf::XNode > & i_xObject)
         throw (uno::RuntimeException, lang::IllegalArgumentException,
-            container::NoSuchElementException, rdf::RepositoryException, std::exception) SAL_OVERRIDE;
+            container::NoSuchElementException, rdf::RepositoryException, std::exception) override;
     virtual void SAL_CALL removeStatements(
             const uno::Reference< rdf::XResource > & i_xSubject,
             const uno::Reference< rdf::XURI > & i_xPredicate,
             const uno::Reference< rdf::XNode > & i_xObject)
         throw (uno::RuntimeException,
-            container::NoSuchElementException, rdf::RepositoryException, std::exception) SAL_OVERRIDE;
+            container::NoSuchElementException, rdf::RepositoryException, std::exception) override;
     virtual uno::Reference< container::XEnumeration > SAL_CALL getStatements(
             const uno::Reference< rdf::XResource > & i_xSubject,
             const uno::Reference< rdf::XURI > & i_xPredicate,
             const uno::Reference< rdf::XNode > & i_xObject)
         throw (uno::RuntimeException,
-            container::NoSuchElementException, rdf::RepositoryException, std::exception) SAL_OVERRIDE;
+            container::NoSuchElementException, rdf::RepositoryException, std::exception) override;
 
 private:
 
diff --git a/unoxml/source/xpath/nodelist.hxx b/unoxml/source/xpath/nodelist.hxx
index 0e0627d307a4..c2dffe44fc33 100644
--- a/unoxml/source/xpath/nodelist.hxx
+++ b/unoxml/source/xpath/nodelist.hxx
@@ -60,12 +60,12 @@ namespace XPath
         /**
         The number of nodes in the list.
         */
-        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override;
         /**
         Returns the indexth item in the collection.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
     };
 }
 
diff --git a/unoxml/source/xpath/xpathapi.hxx b/unoxml/source/xpath/xpathapi.hxx
index cf848867d2da..cf359dacacd4 100644
--- a/unoxml/source/xpath/xpathapi.hxx
+++ b/unoxml/source/xpath/xpathapi.hxx
@@ -80,53 +80,53 @@ namespace XPath
 
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
         virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ()
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
 
         // --- XXPathAPI ---
 
         virtual void SAL_CALL registerNS(const OUString& aPrefix, const OUString& aURI)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         virtual void SAL_CALL unregisterNS(const OUString& aPrefix, const OUString& aURI)
-            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, std::exception) override;
 
         /**
         Use an XPath string to select a nodelist.
         */
         virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL selectNodeList(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str)
-            throw (css::uno::RuntimeException, css::xml::xpath::XPathException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::xpath::XPathException, std::exception) override;
 
         /**
         Use an XPath string to select a nodelist.
         */
         virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL selectNodeListNS(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str, const css::uno::Reference< css::xml::dom::XNode >&  namespaceNode)
-            throw (css::uno::RuntimeException, css::xml::xpath::XPathException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::xpath::XPathException, std::exception) override;
 
         /**
         Use an XPath string to select a single node.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL selectSingleNode(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str)
-            throw (css::uno::RuntimeException, css::xml::xpath::XPathException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::xpath::XPathException, std::exception) override;
 
         /**
         Use an XPath string to select a single node.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL selectSingleNodeNS(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str, const css::uno::Reference< css::xml::dom::XNode >&  namespaceNode)
-            throw (css::uno::RuntimeException, css::xml::xpath::XPathException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::xpath::XPathException, std::exception) override;
 
         virtual css::uno::Reference< css::xml::xpath::XXPathObject > SAL_CALL eval(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str)
-            throw (css::uno::RuntimeException, css::xml::xpath::XPathException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::xpath::XPathException, std::exception) override;
 
         virtual css::uno::Reference< css::xml::xpath::XXPathObject > SAL_CALL evalNS(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str, const css::uno::Reference< css::xml::dom::XNode >&  namespaceNode)
-            throw (css::uno::RuntimeException, css::xml::xpath::XPathException, std::exception) SAL_OVERRIDE;
+            throw (css::uno::RuntimeException, css::xml::xpath::XPathException, std::exception) override;
 
-        virtual void SAL_CALL registerExtension(const OUString& aName) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual void SAL_CALL registerExtensionInstance(const css::uno::Reference< css::xml::xpath::XXPathExtension>& aExtension) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual void SAL_CALL registerExtension(const OUString& aName) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL registerExtensionInstance(const css::uno::Reference< css::xml::xpath::XXPathExtension>& aExtension) throw (css::uno::RuntimeException, std::exception) override;
 
     };
 }
diff --git a/unoxml/source/xpath/xpathobject.hxx b/unoxml/source/xpath/xpathobject.hxx
index ddd954644c8c..7d06dbb08597 100644
--- a/unoxml/source/xpath/xpathobject.hxx
+++ b/unoxml/source/xpath/xpathobject.hxx
@@ -56,53 +56,53 @@ namespace XPath
     /**
         get object type
     */
-    virtual css::xml::xpath::XPathObjectType SAL_CALL getObjectType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::xml::xpath::XPathObjectType SAL_CALL getObjectType() throw (css::uno::RuntimeException, std::exception) override;
 
     /**
         get the nodes from a nodelist type object
     */
     virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getNodeList()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
      /**
         get value of a boolean object
      */
-     virtual sal_Bool SAL_CALL getBoolean() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+     virtual sal_Bool SAL_CALL getBoolean() throw (css::uno::RuntimeException, std::exception) override;
 
     /**
         get number as byte
     */
-    virtual sal_Int8 SAL_CALL getByte() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual sal_Int8 SAL_CALL getByte() throw (css::uno::RuntimeException, std::exception) override;
 
     /**
         get number as short
     */
-    virtual sal_Int16 SAL_CALL getShort() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual sal_Int16 SAL_CALL getShort() throw (css::uno::RuntimeException, std::exception) override;
 
     /**
         get number as long
     */
-    virtual sal_Int32 SAL_CALL getLong() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual sal_Int32 SAL_CALL getLong() throw (css::uno::RuntimeException, std::exception) override;
 
     /**
         get number as hyper
     */
-    virtual sal_Int64 SAL_CALL getHyper() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual sal_Int64 SAL_CALL getHyper() throw (css::uno::RuntimeException, std::exception) override;
 
     /**
         get number as float
     */
-    virtual float SAL_CALL getFloat() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual float SAL_CALL getFloat() throw (css::uno::RuntimeException, std::exception) override;
 
     /**
         get number as double
     */
-    virtual double SAL_CALL getDouble() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual double SAL_CALL getDouble() throw (css::uno::RuntimeException, std::exception) override;
 
     /**
         get string value
     */
-    virtual OUString SAL_CALL getString() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual OUString SAL_CALL getString() throw (css::uno::RuntimeException, std::exception) override;
 
     };
 }