Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code

Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274

28 files changed, 148 insertions, 148 deletions

diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx
index 07b5b195d1eb..ae9736aa524e 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/writerfilter/source/dmapper/BorderHandler.hxx
@@ -61,8 +61,8 @@ private:
     void appendGrabBag(const OUString& aKey, const OUString& aValue);
 
     // Properties
-    virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
-    virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE;
+    virtual void lcl_attribute(Id Name, Value & val) override;
+    virtual void lcl_sprm(Sprm & sprm) override;
 
 public:
     explicit BorderHandler( bool bOOXML );
diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx b/writerfilter/source/dmapper/CellColorHandler.hxx
index c55d280d0b79..98fe7916b181 100644
--- a/writerfilter/source/dmapper/CellColorHandler.hxx
+++ b/writerfilter/source/dmapper/CellColorHandler.hxx
@@ -43,8 +43,8 @@ private:
     std::vector<css::beans::PropertyValue> m_aInteropGrabBag;
 
     // Properties
-    virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
-    virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE;
+    virtual void lcl_attribute(Id Name, Value & val) override;
+    virtual void lcl_sprm(Sprm & sprm) override;
 
     void createGrabBag(const OUString& aName, const css::uno::Any& rValue);
 
diff --git a/writerfilter/source/dmapper/CellMarginHandler.hxx b/writerfilter/source/dmapper/CellMarginHandler.hxx
index de97ac89009f..a33f92d64b4d 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.hxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.hxx
@@ -39,8 +39,8 @@ private:
     std::vector<css::beans::PropertyValue> m_aInteropGrabBag;
 
     // Properties
-    virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
-    virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE;
+    virtual void lcl_attribute(Id Name, Value & val) override;
+    virtual void lcl_sprm(Sprm & sprm) override;
 
     void createGrabBag(const OUString& aName);
 
diff --git a/writerfilter/source/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx
index 0cd287825193..e0583691be94 100644
--- a/writerfilter/source/dmapper/DomainMapper.hxx
+++ b/writerfilter/source/dmapper/DomainMapper.hxx
@@ -85,12 +85,12 @@ public:
     virtual ~DomainMapper();
 
     // Stream
-    virtual void markLastParagraphInSection() SAL_OVERRIDE;
-    virtual void markLastSectionGroup() SAL_OVERRIDE;
+    virtual void markLastParagraphInSection() override;
+    virtual void markLastSectionGroup() override;
 
     // BinaryObj
     virtual void data(const sal_uInt8* buf, size_t len,
-                      writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE;
+                      writerfilter::Reference<Properties>::Pointer_t ref) override;
 
     void sprmWithProps( Sprm& sprm, ::std::shared_ptr<PropertyMap> pContext );
 
@@ -132,34 +132,34 @@ public:
 
 private:
     // Stream
-    virtual void lcl_startSectionGroup() SAL_OVERRIDE;
-    virtual void lcl_endSectionGroup() SAL_OVERRIDE;
-    virtual void lcl_startParagraphGroup() SAL_OVERRIDE;
-    virtual void lcl_endParagraphGroup() SAL_OVERRIDE;
-    virtual void lcl_startCharacterGroup() SAL_OVERRIDE;
-    virtual void lcl_endCharacterGroup() SAL_OVERRIDE;
-    virtual void lcl_startShape(css::uno::Reference<css::drawing::XShape> const& xShape) SAL_OVERRIDE;
-    virtual void lcl_endShape( ) SAL_OVERRIDE;
-
-    virtual void lcl_text(const sal_uInt8 * data, size_t len) SAL_OVERRIDE;
-    virtual void lcl_utext(const sal_uInt8 * data, size_t len) SAL_OVERRIDE;
-    virtual void lcl_positionOffset(const OUString& rText, bool bVertical) SAL_OVERRIDE;
-    virtual css::awt::Point getPositionOffset() SAL_OVERRIDE;
-    virtual void lcl_align(const OUString& rText, bool bVertical) SAL_OVERRIDE;
-    virtual void lcl_positivePercentage(const OUString& rText) SAL_OVERRIDE;
-    virtual void lcl_props(writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE;
+    virtual void lcl_startSectionGroup() override;
+    virtual void lcl_endSectionGroup() override;
+    virtual void lcl_startParagraphGroup() override;
+    virtual void lcl_endParagraphGroup() override;
+    virtual void lcl_startCharacterGroup() override;
+    virtual void lcl_endCharacterGroup() override;
+    virtual void lcl_startShape(css::uno::Reference<css::drawing::XShape> const& xShape) override;
+    virtual void lcl_endShape( ) override;
+
+    virtual void lcl_text(const sal_uInt8 * data, size_t len) override;
+    virtual void lcl_utext(const sal_uInt8 * data, size_t len) override;
+    virtual void lcl_positionOffset(const OUString& rText, bool bVertical) override;
+    virtual css::awt::Point getPositionOffset() override;
+    virtual void lcl_align(const OUString& rText, bool bVertical) override;
+    virtual void lcl_positivePercentage(const OUString& rText) override;
+    virtual void lcl_props(writerfilter::Reference<Properties>::Pointer_t ref) override;
     virtual void lcl_table(Id name,
-                           writerfilter::Reference<Table>::Pointer_t ref) SAL_OVERRIDE;
+                           writerfilter::Reference<Table>::Pointer_t ref) override;
     virtual void lcl_substream(Id name,
-                               ::writerfilter::Reference<Stream>::Pointer_t ref) SAL_OVERRIDE;
-    virtual void lcl_info(const std::string & info) SAL_OVERRIDE;
+                               ::writerfilter::Reference<Stream>::Pointer_t ref) override;
+    virtual void lcl_info(const std::string & info) override;
 
     // Properties
-    virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
-    virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE;
+    virtual void lcl_attribute(Id Name, Value & val) override;
+    virtual void lcl_sprm(Sprm & sprm) override;
 
     // Table
-    virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE;
+    virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) override;
 
     static void handleUnderlineType(const Id nId, const ::std::shared_ptr<PropertyMap>& rContext);
     void handleParaJustification(const sal_Int32 nIntValue, const ::std::shared_ptr<PropertyMap>& rContext, const bool bExchangeLeftRight);
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index 14e20b8c12d9..18c4b4df0d4f 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -76,7 +76,7 @@ class DomainMapperTableManager : public TableManager
     std::unique_ptr<TablePropertiesHandler> m_pTablePropsHandler;
     PropertyMapPtr            m_pStyleProps;
 
-    virtual void clearData() SAL_OVERRIDE;
+    virtual void clearData() override;
 
 public:
 
@@ -87,14 +87,14 @@ public:
     // but in the provided properties map.
     inline void SetStyleProperties( PropertyMapPtr pProperties ) { m_pStyleProps = pProperties; };
 
-    virtual bool sprm(Sprm & rSprm) SAL_OVERRIDE;
+    virtual bool sprm(Sprm & rSprm) override;
     bool attribute(Id nName, Value & val);
 
-    virtual void startLevel( ) SAL_OVERRIDE;
-    virtual void endLevel( ) SAL_OVERRIDE;
+    virtual void startLevel( ) override;
+    virtual void endLevel( ) override;
 
-    virtual void endOfCellAction() SAL_OVERRIDE;
-    virtual void endOfRowAction() SAL_OVERRIDE;
+    virtual void endOfCellAction() override;
+    virtual void endOfRowAction() override;
 
     IntVectorPtr getCurrentGrid( );
     IntVectorPtr getCurrentSpans( );
@@ -105,7 +105,7 @@ public:
     const css::uno::Sequence<css::beans::PropertyValue> getCurrentTablePosition();
     TablePositionHandler* getCurrentTableRealPosition();
 
-    virtual void cellProps(TablePropertyMapPtr pProps) SAL_OVERRIDE
+    virtual void cellProps(TablePropertyMapPtr pProps) override
     {
         if ( m_pStyleProps.get( ) )
             m_pStyleProps->InsertProps(pProps);
@@ -113,7 +113,7 @@ public:
            TableManager::cellProps( pProps );
     };
 
-    virtual void cellPropsByCell(unsigned int i, TablePropertyMapPtr pProps) SAL_OVERRIDE
+    virtual void cellPropsByCell(unsigned int i, TablePropertyMapPtr pProps) override
     {
         if ( m_pStyleProps.get( ) )
             m_pStyleProps->InsertProps(pProps);
@@ -121,7 +121,7 @@ public:
            TableManager::cellPropsByCell( i, pProps );
     };
 
-    virtual void insertRowProps(TablePropertyMapPtr pProps) SAL_OVERRIDE
+    virtual void insertRowProps(TablePropertyMapPtr pProps) override
     {
         if ( m_pStyleProps.get( ) )
             m_pStyleProps->InsertProps(pProps);
@@ -129,7 +129,7 @@ public:
            TableManager::insertRowProps( pProps );
     };
 
-    virtual void insertTableProps(TablePropertyMapPtr pProps) SAL_OVERRIDE
+    virtual void insertTableProps(TablePropertyMapPtr pProps) override
     {
         if ( m_pStyleProps.get( ) )
             m_pStyleProps->InsertProps(pProps);
diff --git a/writerfilter/source/dmapper/FFDataHandler.hxx b/writerfilter/source/dmapper/FFDataHandler.hxx
index 88991e3eeb79..a2149e9c7727 100644
--- a/writerfilter/source/dmapper/FFDataHandler.hxx
+++ b/writerfilter/source/dmapper/FFDataHandler.hxx
@@ -78,10 +78,10 @@ private:
     OUString m_sTextDefault;
 
     // sprm
-    void lcl_sprm(Sprm & r_sprm) SAL_OVERRIDE;
+    void lcl_sprm(Sprm & r_sprm) override;
 
     // attribute
-    void lcl_attribute(Id name, Value & val) SAL_OVERRIDE;
+    void lcl_attribute(Id name, Value & val) override;
 };
 
 
diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx
index 52002cabea6b..ff416930e3ea 100644
--- a/writerfilter/source/dmapper/FontTable.hxx
+++ b/writerfilter/source/dmapper/FontTable.hxx
@@ -67,30 +67,30 @@ class FontTable : public LoggedProperties, public LoggedTable
 
  private:
     // Properties
-    virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
-    virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE;
+    virtual void lcl_attribute(Id Name, Value & val) override;
+    virtual void lcl_sprm(Sprm & sprm) override;
     void resolveSprm(Sprm & r_sprm);
 
     // Table
-    virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE;
+    virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) override;
 
     // Stream
-    virtual void lcl_startSectionGroup() SAL_OVERRIDE;
-    virtual void lcl_endSectionGroup() SAL_OVERRIDE;
-    virtual void lcl_startParagraphGroup() SAL_OVERRIDE;
-    virtual void lcl_endParagraphGroup() SAL_OVERRIDE;
-    virtual void lcl_startCharacterGroup() SAL_OVERRIDE;
-    virtual void lcl_endCharacterGroup() SAL_OVERRIDE;
-    virtual void lcl_text(const sal_uInt8 * data, size_t len) SAL_OVERRIDE;
-    virtual void lcl_utext(const sal_uInt8 * data, size_t len) SAL_OVERRIDE;
-    virtual void lcl_props(writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE;
+    virtual void lcl_startSectionGroup() override;
+    virtual void lcl_endSectionGroup() override;
+    virtual void lcl_startParagraphGroup() override;
+    virtual void lcl_endParagraphGroup() override;
+    virtual void lcl_startCharacterGroup() override;
+    virtual void lcl_endCharacterGroup() override;
+    virtual void lcl_text(const sal_uInt8 * data, size_t len) override;
+    virtual void lcl_utext(const sal_uInt8 * data, size_t len) override;
+    virtual void lcl_props(writerfilter::Reference<Properties>::Pointer_t ref) override;
     virtual void lcl_table(Id name,
-                           writerfilter::Reference<Table>::Pointer_t ref) SAL_OVERRIDE;
+                           writerfilter::Reference<Table>::Pointer_t ref) override;
     virtual void lcl_substream(Id name,
-                               ::writerfilter::Reference<Stream>::Pointer_t ref) SAL_OVERRIDE;
-    virtual void lcl_info(const std::string & info) SAL_OVERRIDE;
-    virtual void lcl_startShape(css::uno::Reference<css::drawing::XShape> const& xShape) SAL_OVERRIDE;
-    virtual void lcl_endShape( ) SAL_OVERRIDE;
+                               ::writerfilter::Reference<Stream>::Pointer_t ref) override;
+    virtual void lcl_info(const std::string & info) override;
+    virtual void lcl_startShape(css::uno::Reference<css::drawing::XShape> const& xShape) override;
+    virtual void lcl_endShape( ) override;
 
 };
 typedef std::shared_ptr< FontTable >          FontTablePtr;
@@ -101,8 +101,8 @@ public:
     EmbeddedFontHandler( const OUString& fontName, const char* style );
     virtual ~EmbeddedFontHandler();
 private:
-    virtual void lcl_attribute( Id name, Value& val ) SAL_OVERRIDE;
-    virtual void lcl_sprm( Sprm& rSprm ) SAL_OVERRIDE;
+    virtual void lcl_attribute( Id name, Value& val ) override;
+    virtual void lcl_sprm( Sprm& rSprm ) override;
     OUString fontName;
     const char* const style;
     OUString id;
diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx b/writerfilter/source/dmapper/GraphicHelpers.hxx
index f669bb175cef..95c33b416c6e 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.hxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.hxx
@@ -39,8 +39,8 @@ public:
     sal_Int16 relation() const { return m_nRelation;}
     sal_Int32 position() const { return m_nPosition;}
  private:
-    virtual void lcl_attribute( Id aName, Value& rVal ) SAL_OVERRIDE;
-    virtual void lcl_sprm( Sprm& rSprm ) SAL_OVERRIDE;
+    virtual void lcl_attribute( Id aName, Value& rVal ) override;
+    virtual void lcl_sprm( Sprm& rSprm ) override;
     sal_Int16 m_nOrient;
     sal_Int16 m_nRelation;
     sal_Int32 m_nPosition;
@@ -61,8 +61,8 @@ public:
     sal_Int32 getWrapMode( );
 
  private:
-    virtual void lcl_attribute( Id aName, Value& rVal ) SAL_OVERRIDE;
-    virtual void lcl_sprm( Sprm& rSprm ) SAL_OVERRIDE;
+    virtual void lcl_attribute( Id aName, Value& rVal ) override;
+    virtual void lcl_sprm( Sprm& rSprm ) override;
 };
 typedef std::shared_ptr<WrapHandler> WrapHandlerPtr;
 
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 8161e55ffa36..a384deaf9e24 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -83,11 +83,11 @@ public:
     XInputStreamHelper(const sal_uInt8* buf, size_t len, bool bBmp);
     virtual ~XInputStreamHelper();
 
-    virtual ::sal_Int32 SAL_CALL readBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual ::sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual ::sal_Int32 SAL_CALL available(  ) throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL closeInput(  ) throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual ::sal_Int32 SAL_CALL readBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL available(  ) throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL closeInput(  ) throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) override;
 };
 
 XInputStreamHelper::XInputStreamHelper(const sal_uInt8* buf, size_t len, bool bBmp) :
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx
index 736a5801ae60..71b86581fe64 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -89,7 +89,7 @@ public:
     virtual ~GraphicImport();
 
     // BinaryObj
-    virtual void data(const sal_uInt8* buffer, size_t len, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE;
+    virtual void data(const sal_uInt8* buffer, size_t len, writerfilter::Reference<Properties>::Pointer_t ref) override;
 
     css::uno::Reference<css::text::XTextContent> GetGraphicObject();
     css::uno::Reference<css::drawing::XShape> GetXShapeObject() { return m_xShape;}
@@ -97,28 +97,28 @@ public:
 
  private:
     // Properties
-    virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
-    virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE;
+    virtual void lcl_attribute(Id Name, Value & val) override;
+    virtual void lcl_sprm(Sprm & sprm) override;
 
     // Table
-    virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE;
+    virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) override;
 
     // Stream
-    virtual void lcl_startSectionGroup() SAL_OVERRIDE;
-    virtual void lcl_endSectionGroup() SAL_OVERRIDE;
-    virtual void lcl_startParagraphGroup() SAL_OVERRIDE;
-    virtual void lcl_endParagraphGroup() SAL_OVERRIDE;
-    virtual void lcl_startCharacterGroup() SAL_OVERRIDE;
-    virtual void lcl_endCharacterGroup() SAL_OVERRIDE;
-    virtual void lcl_text(const sal_uInt8 * data, size_t len) SAL_OVERRIDE;
-    virtual void lcl_utext(const sal_uInt8 * data, size_t len) SAL_OVERRIDE;
-    virtual void lcl_props(writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE;
+    virtual void lcl_startSectionGroup() override;
+    virtual void lcl_endSectionGroup() override;
+    virtual void lcl_startParagraphGroup() override;
+    virtual void lcl_endParagraphGroup() override;
+    virtual void lcl_startCharacterGroup() override;
+    virtual void lcl_endCharacterGroup() override;
+    virtual void lcl_text(const sal_uInt8 * data, size_t len) override;
+    virtual void lcl_utext(const sal_uInt8 * data, size_t len) override;
+    virtual void lcl_props(writerfilter::Reference<Properties>::Pointer_t ref) override;
     virtual void lcl_table(Id name,
-                           writerfilter::Reference<Table>::Pointer_t ref) SAL_OVERRIDE;
-    virtual void lcl_substream(Id name, writerfilter::Reference<Stream>::Pointer_t ref) SAL_OVERRIDE;
-    virtual void lcl_info(const std::string & info) SAL_OVERRIDE;
-    virtual void lcl_startShape(css::uno::Reference<css::drawing::XShape> const& xShape) SAL_OVERRIDE;
-    virtual void lcl_endShape() SAL_OVERRIDE;
+                           writerfilter::Reference<Table>::Pointer_t ref) override;
+    virtual void lcl_substream(Id name, writerfilter::Reference<Stream>::Pointer_t ref) override;
+    virtual void lcl_info(const std::string & info) override;
+    virtual void lcl_startShape(css::uno::Reference<css::drawing::XShape> const& xShape) override;
+    virtual void lcl_endShape() override;
 
     void handleWrapTextValue(sal_uInt32 nVal);
 };
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.hxx b/writerfilter/source/dmapper/LatentStyleHandler.hxx
index 5759785e8c8e..95dc2fbfd0eb 100644
--- a/writerfilter/source/dmapper/LatentStyleHandler.hxx
+++ b/writerfilter/source/dmapper/LatentStyleHandler.hxx
@@ -26,8 +26,8 @@ class LatentStyleHandler
     std::vector<css::beans::PropertyValue> m_aAttributes;
 
     // Properties
-    virtual void lcl_attribute(Id Name, Value& val) SAL_OVERRIDE;
-    virtual void lcl_sprm(Sprm& sprm) SAL_OVERRIDE;
+    virtual void lcl_attribute(Id Name, Value& val) override;
+    virtual void lcl_sprm(Sprm& sprm) override;
 
 public:
     LatentStyleHandler();
diff --git a/writerfilter/source/dmapper/LoggedResources.hxx b/writerfilter/source/dmapper/LoggedResources.hxx
index 2361fe00ee0a..09079b563a6e 100644
--- a/writerfilter/source/dmapper/LoggedResources.hxx
+++ b/writerfilter/source/dmapper/LoggedResources.hxx
@@ -52,23 +52,23 @@ public:
     explicit LoggedStream(const std::string & sPrefix);
     virtual ~LoggedStream();
 
-    void startSectionGroup() SAL_OVERRIDE;
-    void endSectionGroup() SAL_OVERRIDE;
-    void startParagraphGroup() SAL_OVERRIDE;
-    void endParagraphGroup() SAL_OVERRIDE;
-    void startCharacterGroup() SAL_OVERRIDE;
-    void endCharacterGroup() SAL_OVERRIDE;
-    void startShape(css::uno::Reference<css::drawing::XShape> const& xShape) SAL_OVERRIDE;
-    void endShape() SAL_OVERRIDE;
-    void text(const sal_uInt8 * data, size_t len) SAL_OVERRIDE;
-    void utext(const sal_uInt8 * data, size_t len) SAL_OVERRIDE;
-    void positionOffset(const OUString& rText, bool bVertical) SAL_OVERRIDE;
-    void align(const OUString& rText, bool bVertical) SAL_OVERRIDE;
-    void positivePercentage(const OUString& rText) SAL_OVERRIDE;
-    void props(writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE;
-    void table(Id name, writerfilter::Reference<Table>::Pointer_t ref) SAL_OVERRIDE;
-    void substream(Id name, writerfilter::Reference<Stream>::Pointer_t ref) SAL_OVERRIDE;
-    void info(const std::string & info) SAL_OVERRIDE;
+    void startSectionGroup() override;
+    void endSectionGroup() override;
+    void startParagraphGroup() override;
+    void endParagraphGroup() override;
+    void startCharacterGroup() override;
+    void endCharacterGroup() override;
+    void startShape(css::uno::Reference<css::drawing::XShape> const& xShape) override;
+    void endShape() override;
+    void text(const sal_uInt8 * data, size_t len) override;
+    void utext(const sal_uInt8 * data, size_t len) override;
+    void positionOffset(const OUString& rText, bool bVertical) override;
+    void align(const OUString& rText, bool bVertical) override;
+    void positivePercentage(const OUString& rText) override;
+    void props(writerfilter::Reference<Properties>::Pointer_t ref) override;
+    void table(Id name, writerfilter::Reference<Table>::Pointer_t ref) override;
+    void substream(Id name, writerfilter::Reference<Stream>::Pointer_t ref) override;
+    void info(const std::string & info) override;
 
 protected:
     virtual void lcl_startSectionGroup() = 0;
@@ -82,7 +82,7 @@ protected:
     virtual void lcl_text(const sal_uInt8 * data, size_t len) = 0;
     virtual void lcl_utext(const sal_uInt8 * data, size_t len) = 0;
     virtual void lcl_positionOffset(const OUString& /*rText*/, bool /*bVertical*/) { }
-    virtual css::awt::Point getPositionOffset() SAL_OVERRIDE { return css::awt::Point(); }
+    virtual css::awt::Point getPositionOffset() override { return css::awt::Point(); }
     virtual void lcl_align(const OUString& /*rText*/, bool /*bVertical*/) { }
     virtual void lcl_positivePercentage(const OUString& /*rText*/) { }
     virtual void lcl_props(writerfilter::Reference<Properties>::Pointer_t ref) = 0;
@@ -101,8 +101,8 @@ public:
     explicit LoggedProperties(const std::string & sPrefix);
     virtual ~LoggedProperties();
 
-    void attribute(Id name, Value & val) SAL_OVERRIDE;
-    void sprm(Sprm & sprm) SAL_OVERRIDE;
+    void attribute(Id name, Value & val) override;
+    void sprm(Sprm & sprm) override;
 
 protected:
     virtual void lcl_attribute(Id name, Value & val) = 0;
@@ -119,7 +119,7 @@ public:
     explicit LoggedTable(const std::string & sPrefix);
     virtual ~LoggedTable();
 
-    void entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE;
+    void entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) override;
 
 protected:
     virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) = 0;
diff --git a/writerfilter/source/dmapper/MeasureHandler.hxx b/writerfilter/source/dmapper/MeasureHandler.hxx
index c9a392fa2475..6a8ff9dfd944 100644
--- a/writerfilter/source/dmapper/MeasureHandler.hxx
+++ b/writerfilter/source/dmapper/MeasureHandler.hxx
@@ -41,8 +41,8 @@ class MeasureHandler : public LoggedProperties
     std::vector<css::beans::PropertyValue> m_aInteropGrabBag;
 
     // Properties
-    virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
-    virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE;
+    virtual void lcl_attribute(Id Name, Value & val) override;
+    virtual void lcl_sprm(Sprm & sprm) override;
 
 public:
     MeasureHandler();
diff --git a/writerfilter/source/dmapper/ModelEventListener.hxx b/writerfilter/source/dmapper/ModelEventListener.hxx
index a04686b3fb7e..124f221ec388 100644
--- a/writerfilter/source/dmapper/ModelEventListener.hxx
+++ b/writerfilter/source/dmapper/ModelEventListener.hxx
@@ -34,8 +34,8 @@ public:
     ModelEventListener(bool bIndexes, bool bControls);
     virtual ~ModelEventListener();
 
-    virtual void SAL_CALL notifyEvent(const css::document::EventObject& Event) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL notifyEvent(const css::document::EventObject& Event) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) override;
 
 };
 }//namespace writerfilter
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx
index 7887a7597180..caed77570a71 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -187,7 +187,7 @@ public:
     // Mapping functions
     static OUString GetStyleName( sal_Int32 nId );
 
-    css::uno::Sequence< css::uno::Sequence<css::beans::PropertyValue> > GetPropertyValues() SAL_OVERRIDE;
+    css::uno::Sequence< css::uno::Sequence<css::beans::PropertyValue> > GetPropertyValues() override;
 
     void CreateNumberingRules(DomainMapper& rDMapper, css::uno::Reference<css::lang::XMultiServiceFactory> const& xFactory);
 
@@ -220,11 +220,11 @@ private:
     AbstractListDef::Pointer    GetAbstractList( sal_Int32 nId );
 
     // Properties
-    virtual void lcl_attribute( Id nName, Value & rVal ) SAL_OVERRIDE;
-    virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE;
+    virtual void lcl_attribute( Id nName, Value & rVal ) override;
+    virtual void lcl_sprm(Sprm & sprm) override;
 
     // Table
-    virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE;
+    virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) override;
 
 public:
 
diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx
index 9b714daf378a..8e2cb1357aa2 100644
--- a/writerfilter/source/dmapper/OLEHandler.hxx
+++ b/writerfilter/source/dmapper/OLEHandler.hxx
@@ -73,8 +73,8 @@ class OLEHandler : public LoggedProperties
     DomainMapper& m_rDomainMapper;
 
     // Properties
-    virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
-    virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE;
+    virtual void lcl_attribute(Id Name, Value & val) override;
+    virtual void lcl_sprm(Sprm & sprm) override;
 
     // Interoperability
     void saveInteropProperties(css::uno::Reference<css::text::XTextDocument> const& xTextDocument,
diff --git a/writerfilter/source/dmapper/PageBordersHandler.hxx b/writerfilter/source/dmapper/PageBordersHandler.hxx
index ce3660ccafbe..669e5f0e972f 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.hxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.hxx
@@ -55,8 +55,8 @@ private:
     std::vector<_PgBorder> m_aBorders;
 
     // Properties
-    virtual void lcl_attribute( Id eName, Value& rVal ) SAL_OVERRIDE;
-    virtual void lcl_sprm( Sprm& rSprm ) SAL_OVERRIDE;
+    virtual void lcl_attribute( Id eName, Value& rVal ) override;
+    virtual void lcl_sprm( Sprm& rSprm ) override;
 
 public:
     PageBordersHandler( );
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 45805c58401c..cb6b94d17de4 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -517,7 +517,7 @@ public:
     bool    getValue( TablePropertyMapTarget eWhich, sal_Int32& nFill );
     void    setValue( TablePropertyMapTarget eWhich, sal_Int32 nSet );
 
-    virtual void insertTableProperties( const PropertyMap* ) SAL_OVERRIDE;
+    virtual void insertTableProperties( const PropertyMap* ) override;
 };
 typedef std::shared_ptr<TablePropertyMap>  TablePropertyMapPtr;
 } //namespace dmapper
diff --git a/writerfilter/source/dmapper/SectionColumnHandler.hxx b/writerfilter/source/dmapper/SectionColumnHandler.hxx
index c8ab4f15b34c..372ea741de5c 100644
--- a/writerfilter/source/dmapper/SectionColumnHandler.hxx
+++ b/writerfilter/source/dmapper/SectionColumnHandler.hxx
@@ -44,8 +44,8 @@ class SectionColumnHandler : public LoggedProperties
     _Column   m_aTempColumn;
 
     // Properties
-    virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
-    virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE;
+    virtual void lcl_attribute(Id Name, Value & val) override;
+    virtual void lcl_sprm(Sprm & sprm) override;
 
 public:
     SectionColumnHandler();
diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx
index eaa88dc9cf7f..da22eac2ed9a 100644
--- a/writerfilter/source/dmapper/SettingsTable.hxx
+++ b/writerfilter/source/dmapper/SettingsTable.hxx
@@ -80,11 +80,11 @@ class SettingsTable : public LoggedProperties, public LoggedTable
 
  private:
     // Properties
-    virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
-    virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE;
+    virtual void lcl_attribute(Id Name, Value & val) override;
+    virtual void lcl_sprm(Sprm & sprm) override;
 
     // Table
-    virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE;
+    virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) override;
 
 };
 typedef std::shared_ptr< SettingsTable >          SettingsTablePtr;
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx
index 7296ca3c13c0..87faa6912416 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -109,11 +109,11 @@ public:
 
 private:
     // Properties
-    virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
-    virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE;
+    virtual void lcl_attribute(Id Name, Value & val) override;
+    virtual void lcl_sprm(Sprm & sprm) override;
 
     // Table
-    virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE;
+    virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) override;
 
     void applyDefaults(bool bParaProperties);
 };
diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx b/writerfilter/source/dmapper/TDefTableHandler.hxx
index 0765f66d1739..d4b0db1888be 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.hxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.hxx
@@ -66,8 +66,8 @@ private:
     void localResolve(Id Name, writerfilter::Reference<Properties>::Pointer_t pProperties);
 
     // Properties
-    virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
-    virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE;
+    virtual void lcl_attribute(Id Name, Value & val) override;
+    virtual void lcl_sprm(Sprm & sprm) override;
 
 public:
     TDefTableHandler();
diff --git a/writerfilter/source/dmapper/TablePositionHandler.hxx b/writerfilter/source/dmapper/TablePositionHandler.hxx
index cdb239f7b711..c513221c5799 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.hxx
+++ b/writerfilter/source/dmapper/TablePositionHandler.hxx
@@ -34,8 +34,8 @@ class TablePositionHandler
     sal_Int32 m_nBottomFromText;
 
     // Properties
-    virtual void lcl_attribute(Id Name, Value& val) SAL_OVERRIDE;
-    virtual void lcl_sprm(Sprm& sprm) SAL_OVERRIDE;
+    virtual void lcl_attribute(Id Name, Value& val) override;
+    virtual void lcl_sprm(Sprm& sprm) override;
 
 public:
     sal_Int32 getY()
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx b/writerfilter/source/dmapper/TblStylePrHandler.hxx
index 458badb813a0..e895604416ed 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.hxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.hxx
@@ -61,8 +61,8 @@ private:
     std::vector<css::beans::PropertyValue> m_aInteropGrabBag;
 
     // Properties
-    virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
-    virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE;
+    virtual void lcl_attribute(Id Name, Value & val) override;
+    virtual void lcl_sprm(Sprm & sprm) override;
 
 public:
     explicit TblStylePrHandler( DomainMapper & rDMapper );
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/writerfilter/source/dmapper/TextEffectsHandler.hxx
index a0cddf3c8c51..d3c63182c6a4 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.hxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx
@@ -39,8 +39,8 @@ private:
     void convertElementIdToPropertyId(sal_Int32 aElementId);
 
     // LoggedProperties
-    virtual void lcl_attribute(Id aName, Value& aValue) SAL_OVERRIDE;
-    virtual void lcl_sprm(Sprm& sprm) SAL_OVERRIDE;
+    virtual void lcl_attribute(Id aName, Value& aValue) override;
+    virtual void lcl_sprm(Sprm& sprm) override;
 
 public:
     TextEffectsHandler(sal_uInt32 aElementId);
diff --git a/writerfilter/source/dmapper/ThemeTable.hxx b/writerfilter/source/dmapper/ThemeTable.hxx
index 0bc0a47b9340..38d304134035 100644
--- a/writerfilter/source/dmapper/ThemeTable.hxx
+++ b/writerfilter/source/dmapper/ThemeTable.hxx
@@ -47,11 +47,11 @@ public:
 
  private:
     // Properties
-    virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
-    virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE;
+    virtual void lcl_attribute(Id Name, Value & val) override;
+    virtual void lcl_sprm(Sprm & sprm) override;
 
     // Table
-    virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE;
+    virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) override;
 
     // Helper methods
     static OUString fromLocaleToScriptTag(const OUString& sLocale);
diff --git a/writerfilter/source/dmapper/TrackChangesHandler.hxx b/writerfilter/source/dmapper/TrackChangesHandler.hxx
index 3b733e4e82b5..81130b984fca 100644
--- a/writerfilter/source/dmapper/TrackChangesHandler.hxx
+++ b/writerfilter/source/dmapper/TrackChangesHandler.hxx
@@ -28,8 +28,8 @@ class TrackChangesHandler : public LoggedProperties
     RedlineParamsPtr     m_pRedlineParams;
 
     // Properties
-    virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
-    virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE;
+    virtual void lcl_attribute(Id Name, Value & val) override;
+    virtual void lcl_sprm(Sprm & sprm) override;
 
 public:
     explicit TrackChangesHandler( sal_Int32 nToken );
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
index 67e74b545e2e..e6f91758c1a3 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
@@ -68,8 +68,8 @@ private:
     sal_Int32 mnY;
 
     // Properties
-    virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
-    virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE;
+    virtual void lcl_attribute(Id Name, Value & val) override;
+    virtual void lcl_sprm(Sprm & sprm) override;
 
 };