Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code

Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
author: Stephan Bergmann <sbergman@redhat.com> 2015-10-12 16:04:04 +0200
committer: Stephan Bergmann <sbergman@redhat.com> 2015-10-12 17:52:29 +0200
commit: b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree: 33e06dc8d227957cb31355277fb5cf20b9918628 /lotuswordpro/source
parent: b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
124 files changed, 565 insertions, 565 deletions
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
index 428e70cc3ec4..6ad3ab4ab5df 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
@@ -62,29 +62,29 @@ public:
 
     // XFilter
         virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
         virtual void SAL_CALL cancel(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
     // XImporter
         virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc )
-        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
 
     //XExtendedFilterDetection
     virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor )
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XInitialization
         virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
-        throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
 
     // XServiceInfo
         virtual OUString SAL_CALL getImplementationName(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
         virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
         virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
 };
 
diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx
index 6ecc65aa0eee..35ce91c484d8 100644
--- a/lotuswordpro/source/filter/bento.hxx
+++ b/lotuswordpro/source/filter/bento.hxx
@@ -184,11 +184,11 @@ public: // Overridden methods
     sal_uLong GetSize() { return m_ulValueLength; };
 protected: // Overridden methods
 
-    virtual sal_uLong   GetData( void* pData, sal_uLong nSize ) SAL_OVERRIDE;
-    virtual sal_uLong   PutData( const void* pData, sal_uLong nSize ) SAL_OVERRIDE;
-    virtual sal_uInt64   SeekPos( sal_uInt64 nPos ) SAL_OVERRIDE;
-    virtual void    SetSize( sal_uInt64 nSize ) SAL_OVERRIDE;
-    virtual void    FlushData() SAL_OVERRIDE;
+    virtual sal_uLong   GetData( void* pData, sal_uLong nSize ) override;
+    virtual sal_uLong   PutData( const void* pData, sal_uLong nSize ) override;
+    virtual sal_uInt64   SeekPos( sal_uInt64 nPos ) override;
+    virtual void    SetSize( sal_uInt64 nSize ) override;
+    virtual void    FlushData() override;
 
 private: // Data
     pCBenValue cpValue;
@@ -383,7 +383,7 @@ public: // Internal methods
     pCUtListElmt pPrevNamedObjectListElmt) :
     CBenNamedObject(pContainer, ObjectID, pPrevObject, sName,
     pPrevNamedObjectListElmt) { ; }
-    virtual bool IsPropertyName() SAL_OVERRIDE;
+    virtual bool IsPropertyName() override;
 };
 
 class CBenTypeName : public CBenNamedObject
diff --git a/lotuswordpro/source/filter/lwpbackgroundoverride.hxx b/lotuswordpro/source/filter/lwpbackgroundoverride.hxx
index c0d25d7720e1..4cea09869b4c 100644
--- a/lotuswordpro/source/filter/lwpbackgroundoverride.hxx
+++ b/lotuswordpro/source/filter/lwpbackgroundoverride.hxx
@@ -67,10 +67,10 @@ public:
     LwpBackgroundOverride(){}
     virtual ~LwpBackgroundOverride(){}
 
-    virtual LwpBackgroundOverride* clone() const SAL_OVERRIDE;
+    virtual LwpBackgroundOverride* clone() const override;
 
 public:
-    virtual void Read(LwpObjectStream *pStrm) SAL_OVERRIDE
+    virtual void Read(LwpObjectStream *pStrm) override
     {
         if (pStrm->QuickReadBool())
         {
diff --git a/lotuswordpro/source/filter/lwpbreaksoverride.hxx b/lotuswordpro/source/filter/lwpbreaksoverride.hxx
index dbf7a2ecac9f..3a0098ad1c8e 100644
--- a/lotuswordpro/source/filter/lwpbreaksoverride.hxx
+++ b/lotuswordpro/source/filter/lwpbreaksoverride.hxx
@@ -71,7 +71,7 @@ public:
     LwpBreaksOverride();
     virtual ~LwpBreaksOverride();
 
-    virtual LwpBreaksOverride* clone() const SAL_OVERRIDE;
+    virtual LwpBreaksOverride* clone() const override;
 
     enum
     {
@@ -86,7 +86,7 @@ public:
         BO_NEXTSTYLE    = 0x100 // next style name
     };
 public:
-    virtual void Read(LwpObjectStream *pStrm) SAL_OVERRIDE;
+    virtual void Read(LwpObjectStream *pStrm) override;
 
     void Override(LwpBreaksOverride* pOther);
 
diff --git a/lotuswordpro/source/filter/lwpcelllayout.hxx b/lotuswordpro/source/filter/lwpcelllayout.hxx
index 4ac11b1d0a29..e818d839d012 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.hxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.hxx
@@ -88,20 +88,20 @@ class LwpCellLayout : public LwpMiddleLayout
 public:
     LwpCellLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpCellLayout();
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_CELL_LAYOUT;}
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_CELL_LAYOUT;}
     virtual XFCell* ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol);
     sal_uInt16 GetRowID(){return crowid;}
     sal_uInt8 GetColID(){return ccolid;}
-    void RegisterStyle() SAL_OVERRIDE;
+    void RegisterStyle() override;
     LwpObjectID& GetNumericsObject() {return cLayNumerics;}
     LwpObjectID * GetPreviousCellStory();
-    virtual LwpPara* GetLastParaOfPreviousStory() SAL_OVERRIDE;
+    virtual LwpPara* GetLastParaOfPreviousStory() override;
     LwpTableLayout * GetTableLayout();
     virtual void SetCellMap();
     double GetActualWidth();
     OUString GetNumfmtName(){return m_NumfmtName;}
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     LwpTable * GetTable();
     void ApplyPadding(XFCellStyle* pCellStyle);
     void ApplyBorders(XFCellStyle* pCellStyle);
@@ -145,13 +145,13 @@ class LwpHiddenCellLayout : public LwpCellLayout
 public:
     LwpHiddenCellLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpHiddenCellLayout();
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_HIDDEN_CELL_LAYOUT;}
-    virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
-    virtual XFCell* ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol) SAL_OVERRIDE;
-    void RegisterStyle() SAL_OVERRIDE {}
-    virtual void SetCellMap() SAL_OVERRIDE;
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_HIDDEN_CELL_LAYOUT;}
+    virtual void Parse(IXFStream* pOutputStream) override;
+    virtual XFCell* ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol) override;
+    void RegisterStyle() override {}
+    virtual void SetCellMap() override;
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     LwpObjectID cconnectedlayout;
 };
 
@@ -164,17 +164,17 @@ class LwpConnectedCellLayout : public LwpCellLayout
 public:
     LwpConnectedCellLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpConnectedCellLayout();
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_CONNECTED_CELL_LAYOUT;}
-    virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
-    virtual XFCell* ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol) SAL_OVERRIDE;
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_CONNECTED_CELL_LAYOUT;}
+    virtual void Parse(IXFStream* pOutputStream) override;
+    virtual XFCell* ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol) override;
     sal_uInt16 GetNumrows(){return m_nRealrowspan;}
     sal_uInt8 GetNumcols(){return m_nRealcolspan;}
-    virtual void SetCellMap() SAL_OVERRIDE;
+    virtual void SetCellMap() override;
     void SetNumrows(sal_uInt16 nVal){m_nRealrowspan = nVal;}
 protected:
-    void Read() SAL_OVERRIDE;
-    virtual sal_uInt16 GetBelowRowID(sal_uInt16 nRow) SAL_OVERRIDE {return nRow + m_nRealrowspan; };
-    virtual LwpCellBorderType GetCellBorderType(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout) SAL_OVERRIDE;
+    void Read() override;
+    virtual sal_uInt16 GetBelowRowID(sal_uInt16 nRow) override {return nRow + m_nRealrowspan; };
+    virtual LwpCellBorderType GetCellBorderType(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout) override;
     sal_uInt16  cnumrows;
     sal_uInt8   cnumcols;
     sal_uInt16  m_nRealrowspan;
@@ -191,7 +191,7 @@ public:
     LwpParallelColumnsBlock(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpParallelColumnsBlock();
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 
 };
 
diff --git a/lotuswordpro/source/filter/lwpcharacterstyle.hxx b/lotuswordpro/source/filter/lwpcharacterstyle.hxx
index f548a486e1ee..eb8a84a8e71f 100644
--- a/lotuswordpro/source/filter/lwpcharacterstyle.hxx
+++ b/lotuswordpro/source/filter/lwpcharacterstyle.hxx
@@ -79,11 +79,11 @@ public:
 
     inline sal_uInt32 GetFinalFontID() const;
 
-    virtual void RegisterStyle() SAL_OVERRIDE;
+    virtual void RegisterStyle() override;
 
 protected:
     void ReadCommon();
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 
 protected:
 
@@ -125,7 +125,7 @@ class LwpCharacterStyle : public LwpTextStyle
 public:
     LwpCharacterStyle(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
 
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 
 private:
 
diff --git a/lotuswordpro/source/filter/lwpcharborderoverride.hxx b/lotuswordpro/source/filter/lwpcharborderoverride.hxx
index 29c9c9277ddd..e67ef1a7fad7 100644
--- a/lotuswordpro/source/filter/lwpcharborderoverride.hxx
+++ b/lotuswordpro/source/filter/lwpcharborderoverride.hxx
@@ -72,9 +72,9 @@ public:
 
     virtual ~LwpCharacterBorderOverride();
 
-    virtual LwpCharacterBorderOverride* clone() const SAL_OVERRIDE;
+    virtual LwpCharacterBorderOverride* clone() const override;
 
-    void Read(LwpObjectStream* pStrm) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pStrm) override;
 
 protected:
     LwpCharacterBorderOverride(LwpCharacterBorderOverride const& rOther);
diff --git a/lotuswordpro/source/filter/lwpcontent.hxx b/lotuswordpro/source/filter/lwpcontent.hxx
index 249bd254d618..2848e360188f 100644
--- a/lotuswordpro/source/filter/lwpcontent.hxx
+++ b/lotuswordpro/source/filter/lwpcontent.hxx
@@ -103,7 +103,7 @@ protected:
         CF_COPYMASK             = (CF_MODIFIED | CF_PRIVATE)
     };
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 public:
     inline LwpAssociatedLayouts& GetLayoutsWithMe();
     LwpVirtualLayout* GetLayout(LwpVirtualLayout* pStartLayout);
@@ -149,7 +149,7 @@ public:
     LwpHeadContent(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpHeadContent(){}
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 };
 
 #endif
diff --git a/lotuswordpro/source/filter/lwpdivinfo.hxx b/lotuswordpro/source/filter/lwpdivinfo.hxx
index 67cad446f491..1a01e23a3a04 100644
--- a/lotuswordpro/source/filter/lwpdivinfo.hxx
+++ b/lotuswordpro/source/filter/lwpdivinfo.hxx
@@ -87,7 +87,7 @@ public:
     void GetNumberOfPages(sal_uInt16& nPageno);
     sal_uInt16 GetMaxNumberOfPages();
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 private:
     virtual ~LwpDivInfo();
 
diff --git a/lotuswordpro/source/filter/lwpdivopts.hxx b/lotuswordpro/source/filter/lwpdivopts.hxx
index c58359e8747e..d46b3029cfe2 100644
--- a/lotuswordpro/source/filter/lwpdivopts.hxx
+++ b/lotuswordpro/source/filter/lwpdivopts.hxx
@@ -105,7 +105,7 @@ class LwpDivisionOptions : public LwpObject
 public:
     LwpDivisionOptions(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 private:
     virtual ~LwpDivisionOptions();
 
diff --git a/lotuswordpro/source/filter/lwpdlvlist.hxx b/lotuswordpro/source/filter/lwpdlvlist.hxx
index ed05d4f09f7a..4ce8ecc8659b 100644
--- a/lotuswordpro/source/filter/lwpdlvlist.hxx
+++ b/lotuswordpro/source/filter/lwpdlvlist.hxx
@@ -77,7 +77,7 @@ protected:
     LwpObjectID m_ListPrevious;
     LwpObjectID m_ListNext;
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 public:
     LwpObjectID& GetNext() { return m_ListNext; }
     LwpObjectID& GetPrevious() { return m_ListPrevious; }
@@ -98,7 +98,7 @@ protected:
     LwpObjectID m_Parent;
     LwpAtomHolder m_Name;
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     void ReadName(LwpObjectStream* pObjStrm);
 public:
     LwpAtomHolder& GetName() { return m_Name; }
@@ -121,7 +121,7 @@ protected:
     bool m_bHasProperties;
     LwpPropList* m_pPropList;
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     void ReadPropertyList(LwpObjectStream* pObjStrm);
 public:
     LwpPropList* GetPropList() { return m_pPropList; }
diff --git a/lotuswordpro/source/filter/lwpdoc.hxx b/lotuswordpro/source/filter/lwpdoc.hxx
index 7e07977e360e..ad9d5fd6e029 100644
--- a/lotuswordpro/source/filter/lwpdoc.hxx
+++ b/lotuswordpro/source/filter/lwpdoc.hxx
@@ -114,7 +114,7 @@ private:
     LwpObjectID m_STXInfo;
 
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     void ReadPlug();
     void ParseDocContent(IXFStream* pOutputStream);
     void RegisterTextStyles();
@@ -128,8 +128,8 @@ protected:
     void RegisterDefaultParaStyles();
 
 public:
-    void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
-    void RegisterStyle() SAL_OVERRIDE;
+    void Parse(IXFStream* pOutputStream) override;
+    void RegisterStyle() override;
 
     inline bool IsChildDoc();
     inline bool HonorProtection();
@@ -220,10 +220,10 @@ public:
 private:
     LwpObjectID m_Doc;
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 public:
-    void RegisterStyle() SAL_OVERRIDE;
-    void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+    void RegisterStyle() override;
+    void Parse(IXFStream* pOutputStream) override;
 };
 
 #endif
diff --git a/lotuswordpro/source/filter/lwpdocdata.hxx b/lotuswordpro/source/filter/lwpdocdata.hxx
index 226a18a77ce1..e6ea5c6c7620 100644
--- a/lotuswordpro/source/filter/lwpdocdata.hxx
+++ b/lotuswordpro/source/filter/lwpdocdata.hxx
@@ -180,8 +180,8 @@ private:
     static OUString TimeToOUString(LtTm& dt);
 
 public:
-    void Read() SAL_OVERRIDE;
-    void Parse(IXFStream *pOutputStream) SAL_OVERRIDE;
+    void Read() override;
+    void Parse(IXFStream *pOutputStream) override;
 };
 #endif
 
diff --git a/lotuswordpro/source/filter/lwpdrawobj.hxx b/lotuswordpro/source/filter/lwpdrawobj.hxx
index 33e8eea701c1..443f9ba6aa3d 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.hxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.hxx
@@ -152,13 +152,13 @@ public:
     virtual ~LwpDrawGroup() {}
 
 protected:
-    virtual void Read() SAL_OVERRIDE {}
-    virtual OUString RegisterStyle() SAL_OVERRIDE
+    virtual void Read() override {}
+    virtual OUString RegisterStyle() override
     {
         return OUString();
     }
-    virtual XFFrame* CreateDrawObj(const OUString& /*rStyleName*/) SAL_OVERRIDE { return NULL; }
-    virtual XFFrame* CreateStandardDrawObj(const OUString& /*rStyleName*/) SAL_OVERRIDE { return NULL; }
+    virtual XFFrame* CreateDrawObj(const OUString& /*rStyleName*/) override { return NULL; }
+    virtual XFFrame* CreateStandardDrawObj(const OUString& /*rStyleName*/) override { return NULL; }
 };
 
 /**
@@ -175,10 +175,10 @@ public:
     virtual ~LwpDrawLine() {}
 
 protected:
-    virtual void Read() SAL_OVERRIDE;
-    virtual OUString RegisterStyle() SAL_OVERRIDE;
-    virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
-    virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
+    virtual void Read() override;
+    virtual OUString RegisterStyle() override;
+    virtual XFFrame* CreateDrawObj(const OUString& rStyleName) override;
+    virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) override;
 };
 
 /**
@@ -196,10 +196,10 @@ public:
     virtual ~LwpDrawPolyLine();
 
 protected:
-    virtual void Read() SAL_OVERRIDE;
-    virtual OUString RegisterStyle() SAL_OVERRIDE;
-    virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
-    virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
+    virtual void Read() override;
+    virtual OUString RegisterStyle() override;
+    virtual XFFrame* CreateDrawObj(const OUString& rStyleName) override;
+    virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) override;
 };
 
  /**
@@ -217,10 +217,10 @@ public:
     virtual ~LwpDrawPolygon();
 
 protected:
-    virtual void Read() SAL_OVERRIDE;
-    virtual OUString RegisterStyle() SAL_OVERRIDE;
-    virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
-    virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
+    virtual void Read() override;
+    virtual OUString RegisterStyle() override;
+    virtual XFFrame* CreateDrawObj(const OUString& rStyleName) override;
+    virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) override;
 };
 
 /**
@@ -237,10 +237,10 @@ public:
     virtual ~LwpDrawRectangle(){}
 
 protected:
-    virtual void Read() SAL_OVERRIDE;
-    virtual OUString RegisterStyle() SAL_OVERRIDE;
-    virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
-    virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
+    virtual void Read() override;
+    virtual OUString RegisterStyle() override;
+    virtual XFFrame* CreateDrawObj(const OUString& rStyleName) override;
+    virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) override;
 
 private:
     XFFrame* CreateRoundedRect(const OUString& rStyleName);
@@ -260,10 +260,10 @@ public:
     virtual ~LwpDrawEllipse(){}
 
 protected:
-    virtual void Read() SAL_OVERRIDE;
-    virtual OUString RegisterStyle() SAL_OVERRIDE;
-    virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
-    virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
+    virtual void Read() override;
+    virtual OUString RegisterStyle() override;
+    virtual XFFrame* CreateDrawObj(const OUString& rStyleName) override;
+    virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) override;
 };
 
 /**
@@ -281,10 +281,10 @@ public:
     virtual ~LwpDrawArc() {}
 
 protected:
-    virtual void Read() SAL_OVERRIDE;
-    virtual OUString RegisterStyle() SAL_OVERRIDE;
-    virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
-    virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
+    virtual void Read() override;
+    virtual OUString RegisterStyle() override;
+    virtual XFFrame* CreateDrawObj(const OUString& rStyleName) override;
+    virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) override;
 };
 
 /**
@@ -304,10 +304,10 @@ public:
     static void SetFontStyle(rtl::Reference<XFFont> const & pFont, SdwTextBoxRecord* pRec);
 
 protected:
-    virtual void Read() SAL_OVERRIDE;
-    virtual OUString RegisterStyle() SAL_OVERRIDE;
-    virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
-    virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
+    virtual void Read() override;
+    virtual OUString RegisterStyle() override;
+    virtual XFFrame* CreateDrawObj(const OUString& rStyleName) override;
+    virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) override;
 };
 
 /**
@@ -329,10 +329,10 @@ public:
     virtual ~LwpDrawTextArt();
 
 protected:
-    virtual void Read() SAL_OVERRIDE;
-    virtual OUString RegisterStyle() SAL_OVERRIDE;
-    virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
-    virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
+    virtual void Read() override;
+    virtual OUString RegisterStyle() override;
+    virtual XFFrame* CreateDrawObj(const OUString& rStyleName) override;
+    virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) override;
 };
 
 /**
@@ -346,13 +346,13 @@ public:
     virtual ~LwpDrawMetafile() {}
 
 protected:
-    virtual void Read() SAL_OVERRIDE;
-    virtual OUString RegisterStyle() SAL_OVERRIDE
+    virtual void Read() override;
+    virtual OUString RegisterStyle() override
     {
         return OUString();
     }
-    virtual XFFrame* CreateDrawObj(const OUString& /*rStyleName*/) SAL_OVERRIDE {return NULL;}
-    virtual XFFrame* CreateStandardDrawObj(const OUString& /*rStyleName*/) SAL_OVERRIDE {return NULL;}
+    virtual XFFrame* CreateDrawObj(const OUString& /*rStyleName*/) override {return NULL;}
+    virtual XFFrame* CreateStandardDrawObj(const OUString& /*rStyleName*/) override {return NULL;}
 };
 
 /**
@@ -369,10 +369,10 @@ public:
     virtual ~LwpDrawBitmap();
 
 protected:
-    virtual void Read() SAL_OVERRIDE;
-    virtual OUString RegisterStyle() SAL_OVERRIDE;
-    virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
-    virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
+    virtual void Read() override;
+    virtual OUString RegisterStyle() override;
+    virtual XFFrame* CreateDrawObj(const OUString& rStyleName) override;
+    virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) override;
 };
 #endif
 
diff --git a/lotuswordpro/source/filter/lwpfnlayout.hxx b/lotuswordpro/source/filter/lwpfnlayout.hxx
index 1f6a4afcd7fc..ec0af1e58cee 100644
--- a/lotuswordpro/source/filter/lwpfnlayout.hxx
+++ b/lotuswordpro/source/filter/lwpfnlayout.hxx
@@ -72,11 +72,11 @@ class LwpFootnoteLayout : public LwpTableLayout
 public:
     LwpFootnoteLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpFootnoteLayout();
-    void RegisterStyle() SAL_OVERRIDE;
-    virtual void XFConvert(XFContentContainer * pCont) SAL_OVERRIDE;
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_FOOTNOTE_LAYOUT;}
+    void RegisterStyle() override;
+    virtual void XFConvert(XFContentContainer * pCont) override;
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_FOOTNOTE_LAYOUT;}
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 };
 
 /**
@@ -88,11 +88,11 @@ class LwpFnRowLayout : public LwpRowLayout
 public:
     LwpFnRowLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpFnRowLayout();
-    void RegisterStyle() SAL_OVERRIDE;
-    virtual void XFConvert(XFContentContainer * pCont) SAL_OVERRIDE;
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_FOOTNOTE_ROW_LAYOUT;}
+    void RegisterStyle() override;
+    virtual void XFConvert(XFContentContainer * pCont) override;
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_FOOTNOTE_ROW_LAYOUT;}
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 };
 
 /**
@@ -104,11 +104,11 @@ class LwpFnCellLayout : public LwpCellLayout
 public:
     LwpFnCellLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpFnCellLayout();
-    void RegisterStyle() SAL_OVERRIDE;
-    virtual void XFConvert(XFContentContainer * pCont) SAL_OVERRIDE;
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_FOOTNOTE_CELL_LAYOUT;}
+    void RegisterStyle() override;
+    virtual void XFConvert(XFContentContainer * pCont) override;
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_FOOTNOTE_CELL_LAYOUT;}
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 };
 
 /**
@@ -120,11 +120,11 @@ class LwpEndnoteLayout : public LwpTableLayout
 public:
     LwpEndnoteLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpEndnoteLayout();
-    void RegisterStyle() SAL_OVERRIDE;
-    virtual void XFConvert(XFContentContainer * pCont) SAL_OVERRIDE;
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_ENDNOTE_LAYOUT;}
+    void RegisterStyle() override;
+    virtual void XFConvert(XFContentContainer * pCont) override;
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_ENDNOTE_LAYOUT;}
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 };
 
 /**
@@ -136,12 +136,12 @@ class LwpEnSuperTableLayout : public LwpSuperTableLayout
 public:
     LwpEnSuperTableLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpEnSuperTableLayout();
-    void RegisterStyle() SAL_OVERRIDE;
-    void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_ENDNOTE_SUPERTABLE_LAYOUT;}
+    void RegisterStyle() override;
+    void XFConvert(XFContentContainer* pCont) override;
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_ENDNOTE_SUPERTABLE_LAYOUT;}
     virtual LwpVirtualLayout* GetMainTableLayout();
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 };
 
 /**
@@ -153,12 +153,12 @@ class LwpFnSuperTableLayout : public LwpEnSuperTableLayout
 public:
     LwpFnSuperTableLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpFnSuperTableLayout();
-    void RegisterStyle() SAL_OVERRIDE;
-    void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_FOOTNOTE_SUPERTABLE_LAYOUT;}
-    virtual LwpVirtualLayout* GetMainTableLayout() SAL_OVERRIDE;
+    void RegisterStyle() override;
+    void XFConvert(XFContentContainer* pCont) override;
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_FOOTNOTE_SUPERTABLE_LAYOUT;}
+    virtual LwpVirtualLayout* GetMainTableLayout() override;
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 };
 
 /**
@@ -170,10 +170,10 @@ class LwpContFromLayout : public LwpPlacableLayout
 public:
     LwpContFromLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpContFromLayout();
-    void RegisterStyle() SAL_OVERRIDE;
-    void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
+    void RegisterStyle() override;
+    void XFConvert(XFContentContainer* pCont) override;
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 };
 
 /**
@@ -185,10 +185,10 @@ class LwpContOnLayout : public LwpPlacableLayout
 public:
     LwpContOnLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpContOnLayout();
-    void RegisterStyle() SAL_OVERRIDE;
-    void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
+    void RegisterStyle() override;
+    void XFConvert(XFContentContainer* pCont) override;
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 };
 #endif
 
diff --git a/lotuswordpro/source/filter/lwpfootnote.hxx b/lotuswordpro/source/filter/lwpfootnote.hxx
index 36ac95658022..d01c52b1ac8b 100644
--- a/lotuswordpro/source/filter/lwpfootnote.hxx
+++ b/lotuswordpro/source/filter/lwpfootnote.hxx
@@ -104,7 +104,7 @@ class LwpFribFootnote: public LwpFrib
 public:
     explicit LwpFribFootnote(LwpPara* pPara );
     virtual ~LwpFribFootnote(){}
-    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override;
     void RegisterNewStyle();
     void XFConvert(XFContentContainer* pCont);
     LwpFootnote* GetFootnote();
@@ -125,10 +125,10 @@ class LwpFootnote : public LwpOrderedObject
 public:
     LwpFootnote(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpFootnote();
-    void RegisterStyle() SAL_OVERRIDE;
-    void XFConvert(XFContentContainer * pCont) SAL_OVERRIDE;
+    void RegisterStyle() override;
+    void XFConvert(XFContentContainer * pCont) override;
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 private:
     sal_uInt16 m_nType;
     sal_uInt16 m_nRow;
@@ -154,7 +154,7 @@ public:
     LwpFootnoteTable(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpFootnoteTable(){}
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 };
 
 /**
@@ -239,9 +239,9 @@ class LwpFootnoteOptions : public LwpObject
 {
 public:
     LwpFootnoteOptions(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
-    void RegisterStyle() SAL_OVERRIDE;
+    void RegisterStyle() override;
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     void RegisterFootnoteStyle();
     void RegisterEndnoteStyle();
 private:
diff --git a/lotuswordpro/source/filter/lwpframelayout.hxx b/lotuswordpro/source/filter/lwpframelayout.hxx
index fc941c9b6de4..e39606098b65 100644
--- a/lotuswordpro/source/filter/lwpframelayout.hxx
+++ b/lotuswordpro/source/filter/lwpframelayout.hxx
@@ -124,17 +124,17 @@ class LwpFrameLayout: public LwpPlacableLayout
 public:
     LwpFrameLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpFrameLayout();
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_FRAME_LAYOUT;}
-    virtual void RegisterStyle() SAL_OVERRIDE;
-    virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
-    void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, bool bAll = false) SAL_OVERRIDE;
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_FRAME_LAYOUT;}
+    virtual void RegisterStyle() override;
+    virtual void XFConvert(XFContentContainer* pCont) override;
+    void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, bool bAll = false) override;
     OUString GetNextLinkName();
     bool HasPreviousLinkLayout();
-    bool IsForWaterMark() SAL_OVERRIDE;
-    double GetWidth() SAL_OVERRIDE;
+    bool IsForWaterMark() override;
+    double GetWidth() override;
     void ApplyGraphicSize(XFFrame* pXFFrame);
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 private:
     double GetMaxWidth();
 
@@ -152,12 +152,12 @@ class LwpGroupLayout: public LwpPlacableLayout
 public:
     LwpGroupLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpGroupLayout();
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_GROUP_LAYOUT;}
-    virtual void RegisterStyle() SAL_OVERRIDE;
-    virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
-    void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, bool bAll = false) SAL_OVERRIDE;
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_GROUP_LAYOUT;}
+    virtual void RegisterStyle() override;
+    virtual void XFConvert(XFContentContainer* pCont) override;
+    void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, bool bAll = false) override;
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 private:
     LwpFrame* m_pFrame;
 
@@ -172,10 +172,10 @@ class LwpGroupFrame: public LwpContent
 public:
     LwpGroupFrame(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpGroupFrame();
-    virtual void RegisterStyle() SAL_OVERRIDE;
-    virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
+    virtual void RegisterStyle() override;
+    virtual void XFConvert(XFContentContainer* pCont) override;
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 };
 
 class LwpStory;
@@ -185,17 +185,17 @@ class LwpDropcapLayout : public LwpFrameLayout
 public:
     LwpDropcapLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpDropcapLayout(){}
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_DROPCAP_LAYOUT;}
-    virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
-    virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_DROPCAP_LAYOUT;}
+    virtual void Parse(IXFStream* pOutputStream) override;
+    virtual void XFConvert(XFContentContainer* pCont) override;
     sal_uInt16 GetLines(){return m_nLines;}
     void SetChars(sal_uInt32 nChars){ m_nChars += nChars;}
     sal_uInt32 GetChars() const {return m_nChars;}
     LwpStory* GetContentStory();
     void RegisterStyle(LwpFoundry* pFoundry);
-    void RegisterStyle() SAL_OVERRIDE;
+    void RegisterStyle() override;
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 private:
     sal_uInt16 m_nLines;
     sal_uInt32 m_nChars;
@@ -209,7 +209,7 @@ public:
     LwpRubyMarker* GetMarker();
     void ConvertContentText();
     LwpStory* GetContentStory();
-    void RegisterStyle() SAL_OVERRIDE;
+    void RegisterStyle() override;
     enum{
         LEFT = 4,
         RIGHT = 5,
@@ -218,7 +218,7 @@ public:
         BOTTOM = 3
     };
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 private:
     sal_uInt8 m_nPlacement;
     sal_uInt8 m_nAlignment;
diff --git a/lotuswordpro/source/filter/lwpfribbreaks.hxx b/lotuswordpro/source/filter/lwpfribbreaks.hxx
index 4f0ba3ab83a4..e1766d7726cd 100644
--- a/lotuswordpro/source/filter/lwpfribbreaks.hxx
+++ b/lotuswordpro/source/filter/lwpfribbreaks.hxx
@@ -71,7 +71,7 @@ class LwpFribPageBreak: public LwpFrib
 public:
     explicit LwpFribPageBreak( LwpPara* pPara );
     virtual ~LwpFribPageBreak();
-    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override;
     void RegisterBreakStyle(LwpPara* pPara);
     void ParseLayout();
     LwpObjectID& GetLayout() { return m_Layout;}
diff --git a/lotuswordpro/source/filter/lwpfribframe.hxx b/lotuswordpro/source/filter/lwpfribframe.hxx
index a7eef1f8f870..b915a9ad2e8a 100644
--- a/lotuswordpro/source/filter/lwpfribframe.hxx
+++ b/lotuswordpro/source/filter/lwpfribframe.hxx
@@ -71,9 +71,9 @@ class LwpFribFrame : public LwpFrib
 public:
     explicit LwpFribFrame( LwpPara* pPara) : LwpFrib(pPara){}
     virtual ~LwpFribFrame(){}
-    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override;
     rtl::Reference<LwpObject> GetLayout();
-    void RegisterStyle(LwpFoundry* pFoundry) SAL_OVERRIDE;
+    void RegisterStyle(LwpFoundry* pFoundry) override;
     void SetParaDropcap(LwpPara* pPara);
     void XFConvert(XFContentContainer* pCont);
 private:
@@ -85,9 +85,9 @@ class LwpFribRubyFrame : public LwpFrib
 public:
     LwpFribRubyFrame( LwpPara* pPara) : LwpFrib(pPara){}
     virtual ~LwpFribRubyFrame(){}
-    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override;
     LwpRubyLayout* GetLayout();
-    void RegisterStyle(LwpFoundry* pFoundry) SAL_OVERRIDE;
+    void RegisterStyle(LwpFoundry* pFoundry) override;
     void XFConvert(XFContentContainer* pCont);
 private:
     LwpObjectID m_objLayout;
diff --git a/lotuswordpro/source/filter/lwpfribmark.hxx b/lotuswordpro/source/filter/lwpfribmark.hxx
index 0a02bb0138f5..f4e3affea5f1 100644
--- a/lotuswordpro/source/filter/lwpfribmark.hxx
+++ b/lotuswordpro/source/filter/lwpfribmark.hxx
@@ -75,7 +75,7 @@ public:
         , m_nType(0)
         {}
     virtual ~LwpFribCHBlock(){}
-    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override;
     LwpCHBlkMarker* GetMarker();
     sal_uInt8 GetType(){return m_nType;}
     enum{MARKER_START=1,MARKER_END,MARKER_NONE};
@@ -90,12 +90,12 @@ class LwpFribBookMark : public LwpFrib
 public:
     explicit LwpFribBookMark( LwpPara* pPara );
     virtual ~LwpFribBookMark(){}
-    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override;
     LwpObjectID GetMarkerID(){return m_objMarker;}
     sal_uInt8 GetType(){return m_nType;}
     enum{MARKER_START=1,MARKER_END,MARKER_NONE};
     void XFConvert(XFContentContainer* pXFPara);
-    void RegisterStyle(LwpFoundry* pFoundry) SAL_OVERRIDE;
+    void RegisterStyle(LwpFoundry* pFoundry) override;
 private:
     sal_uInt8 m_nType;
     LwpObjectID m_objMarker;
@@ -108,12 +108,12 @@ class LwpFribField : public LwpFrib
 public:
     explicit LwpFribField( LwpPara* pPara );
     virtual ~LwpFribField(){}
-    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override;
     LwpFieldMark* GetMarker();
     sal_uInt8 GetType(){return m_nType;}
     enum{MARKER_START=1,MARKER_END,MARKER_NONE};
     void XFConvert(XFContentContainer* pXFPara);
-    void RegisterStyle(LwpFoundry* pFoundry) SAL_OVERRIDE;
+    void RegisterStyle(LwpFoundry* pFoundry) override;
     enum{
         SUBFIELD_INVALID = 0,
         SUBFIELD_DATETIME = 1,
@@ -149,12 +149,12 @@ class LwpFribRubyMarker : public LwpFrib
 public:
     explicit LwpFribRubyMarker( LwpPara* pPara );
     virtual ~LwpFribRubyMarker(){}
-    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override;
     LwpRubyMarker* GetMarker();
     sal_uInt8 GetType(){return m_nType;}
     enum{MARKER_START=1,MARKER_END,MARKER_NONE};
     void XFConvert(XFContentContainer* pXFPara);
-    void RegisterStyle(LwpFoundry* pFoundry) SAL_OVERRIDE;
+    void RegisterStyle(LwpFoundry* pFoundry) override;
 private:
     sal_uInt8 m_nType;
     LwpObjectID m_objMarker;
diff --git a/lotuswordpro/source/filter/lwpfribsection.hxx b/lotuswordpro/source/filter/lwpfribsection.hxx
index 07910a86a0f1..5acae3c8823b 100644
--- a/lotuswordpro/source/filter/lwpfribsection.hxx
+++ b/lotuswordpro/source/filter/lwpfribsection.hxx
@@ -109,7 +109,7 @@ class LwpFribSection: public LwpFrib
 public:
     explicit LwpFribSection(LwpPara* pPara );
     virtual ~LwpFribSection();
-    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override;
     LwpSection * GetSection();
     void RegisterSectionStyle();
     void ParseSection();
diff --git a/lotuswordpro/source/filter/lwpfribtable.hxx b/lotuswordpro/source/filter/lwpfribtable.hxx
index c9f3fd3d065b..0e83c0e65442 100644
--- a/lotuswordpro/source/filter/lwpfribtable.hxx
+++ b/lotuswordpro/source/filter/lwpfribtable.hxx
@@ -64,7 +64,7 @@ class LwpFribTable : public LwpFrib
 public:
     explicit LwpFribTable( LwpPara* pPara ) : LwpFrib(pPara){}
     virtual ~LwpFribTable(){}
-    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override;
     LwpSuperTableLayout* GetSuperTable();
     void RegisterNewStyle();
     void XFConvert(XFContentContainer* pCont);
diff --git a/lotuswordpro/source/filter/lwpfribtext.hxx b/lotuswordpro/source/filter/lwpfribtext.hxx
index 26ff7152a816..84d66d5fc050 100644
--- a/lotuswordpro/source/filter/lwpfribtext.hxx
+++ b/lotuswordpro/source/filter/lwpfribtext.hxx
@@ -68,7 +68,7 @@ class LwpFribText : public LwpFrib
 public:
     LwpFribText( LwpPara* pPara, bool bNoUnicode=false);
     virtual ~LwpFribText(){}
-    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override;
     void XFConvert(XFContentContainer* pXFPara,LwpStory* pStory);
 private:
     OUString m_Content;
@@ -96,7 +96,7 @@ class LwpFribParaNumber : public LwpFrib
 public:
     explicit LwpFribParaNumber( LwpPara* pPara ) : LwpFrib(pPara),
         m_nStyleID(0), m_nNumberChar(0), m_nLevel(1), m_nStart(0){}
-    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override;
 
     inline sal_uInt16 GetStyleID() const;
 
@@ -130,9 +130,9 @@ public:
 
     virtual ~LwpFribDocVar();
 
-    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override;
 
-    void RegisterStyle(LwpFoundry* pFoundry) SAL_OVERRIDE;
+    void RegisterStyle(LwpFoundry* pFoundry) override;
 
     void XFConvert(XFContentContainer* pXFPara);
 
@@ -187,7 +187,7 @@ class LwpFribUnicode: public LwpFrib
 public:
     explicit LwpFribUnicode( LwpPara* pPara ) : LwpFrib(pPara){}
     virtual ~LwpFribUnicode(){}
-    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override;
     void XFConvert(XFContentContainer* pXFPara,LwpStory* pStory);
 private:
     OUString m_Content;
@@ -201,7 +201,7 @@ public:
     explicit LwpFribPageNumber(LwpPara* pPara) : LwpFrib(pPara),
         m_nNumStyle(0), m_nStartNum(1), m_nStartOnPage(1), m_nFlag(0){}
     virtual ~LwpFribPageNumber(){}
-    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override;
     void XFConvert(XFContentContainer* pXFPara);
 private:
     sal_uInt16 m_nNumStyle;
diff --git a/lotuswordpro/source/filter/lwpgrfobj.hxx b/lotuswordpro/source/filter/lwpgrfobj.hxx
index 20a88b6c8038..d4f62bdf10b4 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.hxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.hxx
@@ -111,9 +111,9 @@ private:
     std::vector< rtl::Reference<XFFrame> > m_vXFDrawObjects;
 
 public:
-    void Read() SAL_OVERRIDE;
-    virtual void XFConvert (XFContentContainer* pCont) SAL_OVERRIDE;
-    void RegisterStyle() SAL_OVERRIDE;
+    void Read() override;
+    virtual void XFConvert (XFContentContainer* pCont) override;
+    void RegisterStyle() override;
 
     void CreateDrawObjects();
     void CreateGrafObject();
@@ -121,7 +121,7 @@ public:
     sal_uInt32 GetRawGrafData(sal_uInt8*& pGrafData);
     sal_uInt32 GetGrafData(sal_uInt8*& pGrafData);
     void GetGrafOrgSize(long& rWidth, long& rHeight) { rWidth = m_Cache.Width; rHeight = m_Cache.Height; }
-    void GetGrafOrgSize(double& rWidth, double& rHeight) SAL_OVERRIDE;
+    void GetGrafOrgSize(double& rWidth, double& rHeight) override;
 
     sal_Int16 IsLinked(){ return m_bIsLinked;}
     OUString GetLinkedFilePath(){ return m_LinkedFilePath;}
diff --git a/lotuswordpro/source/filter/lwpholder.hxx b/lotuswordpro/source/filter/lwpholder.hxx
index 5ba0f2a051cb..7cf3b8f2ceb2 100644
--- a/lotuswordpro/source/filter/lwpholder.hxx
+++ b/lotuswordpro/source/filter/lwpholder.hxx
@@ -71,7 +71,7 @@ class LwpDLVListHeadHolder : public LwpObject
 {
 public:
     LwpDLVListHeadHolder(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     LwpObjectID& GetHeadID() { return m_DLVHead;}
 private:
     virtual ~LwpDLVListHeadHolder(){}
@@ -86,7 +86,7 @@ class LwpDLVListHeadTailHolder : public LwpObject
 {
 public:
     LwpDLVListHeadTailHolder(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     LwpObjectID& GetHead(){ return m_HeadTail.GetHead();}
     LwpObjectID& GetTail(){ return m_HeadTail.GetTail();}
 protected:
@@ -102,7 +102,7 @@ class LwpObjectHolder : public LwpDLVList
 {
 public:
     LwpObjectHolder(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     LwpObjectID& GetObject() { return m_Object; }
 protected:
     virtual ~LwpObjectHolder(){}
@@ -118,7 +118,7 @@ class LwpListList : public LwpObjectHolder
 {
 public:
     LwpListList(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     LwpObjectID& GetHead(){ return m_HeadTail.GetHead();}
 protected:
     LwpDLVListHeadTail m_HeadTail;
diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx
index 12bfa4b4f590..c291f28de269 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -162,7 +162,7 @@ public:
     virtual bool HasContent(){return false;}
     //End by
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 protected:
     sal_uInt32 m_nAttributes;
     sal_uInt32 m_nAttributes2;
@@ -235,11 +235,11 @@ class LwpHeadLayout : public LwpVirtualLayout
 public:
     LwpHeadLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpHeadLayout(){}
-    void RegisterStyle() SAL_OVERRIDE;
+    void RegisterStyle() override;
     LwpVirtualLayout* FindEnSuperTableLayout();
 protected:
-    void Read() SAL_OVERRIDE;
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_HEAD_LAYOUT;}
+    void Read() override;
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_HEAD_LAYOUT;}
 };
 
 class LwpLayoutStyle
@@ -273,9 +273,9 @@ class LwpMiddleLayout : public LwpVirtualLayout
 public:
     LwpMiddleLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm );
     virtual ~LwpMiddleLayout();
-    virtual bool MarginsSameAsParent() SAL_OVERRIDE;
-    virtual double GetMarginsValue(const sal_uInt8& nWhichSide) SAL_OVERRIDE;
-    virtual double GetExtMarginsValue(const sal_uInt8& nWhichSide) SAL_OVERRIDE;
+    virtual bool MarginsSameAsParent() override;
+    virtual double GetMarginsValue(const sal_uInt8& nWhichSide) override;
+    virtual double GetExtMarginsValue(const sal_uInt8& nWhichSide) override;
     LwpLayoutGeometry* GetGeometry();
     double GetGeometryHeight();
     double GetGeometryWidth();
@@ -284,14 +284,14 @@ public:
     enumXFTextDir GetTextDirection();
     XFBorders* GetXFBorders();
     LwpColor* GetBackColor();
-    virtual bool IsAutoGrow() SAL_OVERRIDE;
-    virtual bool IsAutoGrowUp() SAL_OVERRIDE;
-    virtual bool IsAutoGrowDown() SAL_OVERRIDE;
-    virtual bool IsAutoGrowLeft() SAL_OVERRIDE;
-    virtual bool IsAutoGrowRight() SAL_OVERRIDE;
-    virtual sal_uInt8 GetContentOrientation() SAL_OVERRIDE;
-    virtual bool HonorProtection() SAL_OVERRIDE;
-    virtual bool IsProtected() SAL_OVERRIDE;
+    virtual bool IsAutoGrow() override;
+    virtual bool IsAutoGrowUp() override;
+    virtual bool IsAutoGrowDown() override;
+    virtual bool IsAutoGrowLeft() override;
+    virtual bool IsAutoGrowRight() override;
+    virtual sal_uInt8 GetContentOrientation() override;
+    virtual bool HonorProtection() override;
+    virtual bool IsProtected() override;
     LwpVirtualLayout* GetWaterMarkLayout();
     XFBGImage* GetXFBGImage();
     bool GetUsePrinterSettings();
@@ -305,7 +305,7 @@ public:
     double GetScaleHeight();
 
     bool CanSizeRight();
-    virtual double GetWidth() SAL_OVERRIDE;
+    virtual double GetWidth() override;
     sal_Int32 GetMinimumWidth();
     bool IsSizeRightToContent();
     bool IsSizeRightToContainer();
@@ -317,10 +317,10 @@ public:
     XFBGImage* GetFillPattern();
 
     //Check whether there are contents in the layout
-    virtual bool HasContent() SAL_OVERRIDE;
+    virtual bool HasContent() override;
 
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 protected:
     enum
     {
@@ -355,7 +355,7 @@ public:
     LwpShadow* GetShadow();
     XFShadow* GetXFShadow();
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 protected:
     LwpUseWhen* m_pUseWhen;
     LwpObjectID m_Positon;
@@ -366,10 +366,10 @@ protected:
     LwpObjectID m_LayExtJoinStuff;
 
 public:
-    LwpUseWhen* VirtualGetUseWhen() SAL_OVERRIDE;
-    virtual sal_uInt16 GetNumCols() SAL_OVERRIDE;
-    virtual double GetColWidth(sal_uInt16 nIndex) SAL_OVERRIDE;
-    virtual double GetColGap(sal_uInt16 nIndex) SAL_OVERRIDE;
+    LwpUseWhen* VirtualGetUseWhen() override;
+    virtual sal_uInt16 GetNumCols() override;
+    virtual double GetColWidth(sal_uInt16 nIndex) override;
+    virtual double GetColGap(sal_uInt16 nIndex) override;
     sal_uInt16 GetUsePage();
 public:
     enum UseWhenType
@@ -382,12 +382,12 @@ public:
     };
 public:
     UseWhenType GetUseWhenType();
-    virtual bool IsUseOnAllPages() SAL_OVERRIDE;
-    virtual bool IsUseOnAllEvenPages() SAL_OVERRIDE;
-    virtual bool IsUseOnAllOddPages() SAL_OVERRIDE;
-    virtual bool IsUseOnPage() SAL_OVERRIDE;
+    virtual bool IsUseOnAllPages() override;
+    virtual bool IsUseOnAllEvenPages() override;
+    virtual bool IsUseOnAllOddPages() override;
+    virtual bool IsUseOnPage() override;
     LwpObjectID& GetPosition(){ return m_Positon;}
-    virtual LwpVirtualLayout* GetContainerLayout() SAL_OVERRIDE;
+    virtual LwpVirtualLayout* GetContainerLayout() override;
 };
 
 class LwpPlacableLayout : public LwpLayout
@@ -397,11 +397,11 @@ public:
     virtual ~LwpPlacableLayout();
     sal_uInt8 GetWrapType();
     LwpLayoutRelativity* GetRelativityPiece();
-    virtual sal_uInt8 GetRelativeType() SAL_OVERRIDE;
+    virtual sal_uInt8 GetRelativeType() override;
     sal_Int32 GetBaseLineOffset();
-    virtual bool IsAnchorPage() SAL_OVERRIDE;
-    virtual bool IsAnchorFrame() SAL_OVERRIDE;
-    virtual bool IsAnchorCell() SAL_OVERRIDE;
+    virtual bool IsAnchorPage() override;
+    virtual bool IsAnchorFrame() override;
+    virtual bool IsAnchorCell() override;
     virtual void XFConvertFrame(XFContentContainer* /*pCont*/, sal_Int32 /*nStart*/ = 0, sal_Int32 /*nEnd*/ = 0, bool /*bAll*/ = false) {}
     /**
      * @descr:   Get font style for setting position of frame
@@ -423,7 +423,7 @@ public:
         LAY_WRAP_IRREG_BIGGEST
     };
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 protected:
     sal_uInt8 m_nWrapType;
     sal_uInt8 m_nBuoyancy;
diff --git a/lotuswordpro/source/filter/lwplaypiece.hxx b/lotuswordpro/source/filter/lwplaypiece.hxx
index f85fa15bfa6d..173aa19d22cf 100644
--- a/lotuswordpro/source/filter/lwplaypiece.hxx
+++ b/lotuswordpro/source/filter/lwplaypiece.hxx
@@ -78,7 +78,7 @@ class LwpLayoutGeometry : public LwpVirtualPiece
 {
 public:
     LwpLayoutGeometry(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
-    virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+    virtual void Parse(IXFStream* pOutputStream) override;
     sal_Int32 GetWidth() { return m_nWidth; }
     sal_Int32 GetHeight() { return m_nHeight; }
     LwpPoint GetOrigin() { return m_Origin; }
@@ -86,7 +86,7 @@ public:
     sal_uInt8 GetContentOrientation(){ return m_ContentOrientation;}
 
 protected:
-    virtual void Read() SAL_OVERRIDE;
+    virtual void Read() override;
 protected:
     sal_Int32 m_nWidth;
     sal_Int32 m_nHeight;
@@ -106,7 +106,7 @@ public:
 
     enum    {CENTERED = 1, TILED = 2};
     LwpLayoutScale(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
-    virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+    virtual void Parse(IXFStream* pOutputStream) override;
     sal_uInt16 GetScaleMode(){return m_nScaleMode;}
     sal_uInt32 GetScalePercentage(){return m_nScalePercentage;}
     sal_Int32 GetScaleWidth(){return m_nScaleWidth;}
@@ -114,7 +114,7 @@ public:
     sal_uInt16 GetPlacement(){return m_nPlacement;}
     inline LwpPoint& GetOffset() {return m_Offset;}
 protected:
-    virtual void Read() SAL_OVERRIDE;
+    virtual void Read() override;
 protected:
     sal_uInt16 m_nScaleMode;
     sal_uInt32 m_nScalePercentage;
@@ -133,11 +133,11 @@ class LwpLayoutMargins : public LwpVirtualPiece
 {
 public:
     LwpLayoutMargins(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
-    virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+    virtual void Parse(IXFStream* pOutputStream) override;
     LwpMargins& GetMargins() { return m_Margins; }
     LwpMargins& GetExtMargins(){ return m_ExtMargins;}
 protected:
-    virtual void Read() SAL_OVERRIDE;
+    virtual void Read() override;
 protected:
     LwpMargins m_Margins;
     LwpMargins m_ExtMargins;
@@ -151,10 +151,10 @@ class LwpLayoutBorder : public LwpVirtualPiece
 {
 public:
     LwpLayoutBorder(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
-    virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+    virtual void Parse(IXFStream* pOutputStream) override;
     LwpBorderStuff& GetBorderStuff(){ return m_BorderStuff;}
 protected:
-    virtual void Read() SAL_OVERRIDE;
+    virtual void Read() override;
 protected:
     LwpBorderStuff m_BorderStuff;
 private:
@@ -165,10 +165,10 @@ class LwpLayoutBackground : public LwpVirtualPiece
 {
 public:
     LwpLayoutBackground(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
-    virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+    virtual void Parse(IXFStream* pOutputStream) override;
     LwpBackgroundStuff& GetBackgoudStuff(){return m_BackgroundStuff;}
 protected:
-    virtual void Read() SAL_OVERRIDE;
+    virtual void Read() override;
 protected:
     LwpBackgroundStuff m_BackgroundStuff;
 private:
@@ -193,9 +193,9 @@ class LwpLayoutExternalBorder : public LwpVirtualPiece
 {
 public:
     LwpLayoutExternalBorder(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
-    virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+    virtual void Parse(IXFStream* pOutputStream) override;
 protected:
-    virtual void Read() SAL_OVERRIDE;
+    virtual void Read() override;
 protected:
     LwpExternalBorder   m_ExtranalBorder;
 private:
@@ -219,12 +219,12 @@ class LwpLayoutColumns : public LwpVirtualPiece
 {
 public:
     LwpLayoutColumns(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
-    virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+    virtual void Parse(IXFStream* pOutputStream) override;
     inline sal_uInt16 GetNumCols(){return m_nNumCols;}
     double GetColWidth(sal_uInt16 nIndex);
     double GetColGap(sal_uInt16 nIndex);
 protected:
-    virtual void Read() SAL_OVERRIDE;
+    virtual void Read() override;
 protected:
     sal_uInt16 m_nNumCols;
     LwpColumnInfo* m_pColumns;
@@ -236,10 +236,10 @@ class LwpLayoutGutters : public LwpVirtualPiece
 {
 public:
     LwpLayoutGutters(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
-    virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+    virtual void Parse(IXFStream* pOutputStream) override;
     inline LwpBorderStuff& GetBorderStuff() { return m_BorderBuffer; }
 protected:
-    virtual void Read() SAL_OVERRIDE;
+    virtual void Read() override;
 protected:
     LwpBorderStuff m_BorderBuffer;
 private:
@@ -296,9 +296,9 @@ class LwpLayoutJoins : public LwpVirtualPiece
 {
 public:
     LwpLayoutJoins(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
-    virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+    virtual void Parse(IXFStream* pOutputStream) override;
 protected:
-    virtual void Read() SAL_OVERRIDE;
+    virtual void Read() override;
 protected:
     LwpJoinStuff m_JoinStuff;
 private:
@@ -311,10 +311,10 @@ class LwpLayoutShadow : public LwpVirtualPiece
 {
 public:
     LwpLayoutShadow(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
-    virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+    virtual void Parse(IXFStream* pOutputStream) override;
     LwpShadow& GetShadow() { return m_Shadow; }
 protected:
-    virtual void Read() SAL_OVERRIDE;
+    virtual void Read() override;
 protected:
     LwpShadow m_Shadow;
 private:
@@ -367,10 +367,10 @@ class LwpLayoutRelativity: public LwpVirtualPiece
 {
 public:
     LwpLayoutRelativity(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
-    virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+    virtual void Parse(IXFStream* pOutputStream) override;
     LwpLayoutRelativityGuts& GetRelGuts() { return m_RelGuts; }
 protected:
-    virtual void Read() SAL_OVERRIDE;
+    virtual void Read() override;
 protected:
     LwpLayoutRelativityGuts m_RelGuts;
 private:
diff --git a/lotuswordpro/source/filter/lwpmarker.hxx b/lotuswordpro/source/filter/lwpmarker.hxx
index 52b6971145e1..7684decd4c5f 100644
--- a/lotuswordpro/source/filter/lwpmarker.hxx
+++ b/lotuswordpro/source/filter/lwpmarker.hxx
@@ -72,7 +72,7 @@ class LwpMarker : public LwpDLNFPVList
 public:
     LwpMarker(LwpObjectHeader &objHdr, LwpSvStream *pStrm);
     virtual ~LwpMarker(){}
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     OUString GetNamedProperty(const OUString& name);
 protected:
     enum{
@@ -105,7 +105,7 @@ class LwpStoryMarker : public LwpMarker
 public:
     LwpStoryMarker(LwpObjectHeader &objHdr, LwpSvStream *pStrm);
     virtual ~LwpStoryMarker(){}
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 private:
     LwpFribRange m_Range;
     sal_uInt16 m_nFlag;
@@ -116,7 +116,7 @@ class LwpCHBlkMarker : public LwpStoryMarker
 public:
     LwpCHBlkMarker(LwpObjectHeader &objHdr, LwpSvStream *pStrm);
     virtual ~LwpCHBlkMarker(){}
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     sal_uInt16 GetAction(){return m_nAction;}
     void ConvertCHBlock(XFContentContainer* pXFPara,sal_uInt8 nType);
     enum{
@@ -175,7 +175,7 @@ public:
     LwpBookMark(LwpObjectHeader &objHdr, LwpSvStream *pStrm);
     virtual ~LwpBookMark(){}
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 public:
     bool IsRightMarker(LwpObjectID objMarker);
     OUString GetName();
@@ -192,7 +192,7 @@ class LwpFieldMark : public LwpStoryMarker
 public:
     LwpFieldMark(LwpObjectHeader &objHdr, LwpSvStream *pStrm);
     virtual ~LwpFieldMark(){}
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     void ParseIndex(OUString& sKey1,OUString& sKey2);
     void ParseTOC(OUString& sLevel,OUString& sText);
     sal_uInt16 GetFieldType(){return m_nFieldType;}
@@ -256,7 +256,7 @@ class LwpRubyMarker : public LwpStoryMarker
 public:
     LwpRubyMarker(LwpObjectHeader &objHdr, LwpSvStream *pStrm);
     virtual ~LwpRubyMarker(){}
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     OUString GetRubyText(){return m_strRubyText;}
     void SetRubyText(const OUString& sText){m_strRubyText = sText;}
     OUString GetTextStyleName(){return m_TextStyle;}
diff --git a/lotuswordpro/source/filter/lwpnotes.hxx b/lotuswordpro/source/filter/lwpnotes.hxx
index f1507be23890..103195e268f6 100644
--- a/lotuswordpro/source/filter/lwpnotes.hxx
+++ b/lotuswordpro/source/filter/lwpnotes.hxx
@@ -73,7 +73,7 @@ class LwpFribNote: public LwpFrib
 public:
     explicit LwpFribNote(LwpPara* pPara );
     virtual ~LwpFribNote(){}
-    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override;
     void RegisterNewStyle();
     void XFConvert(XFContentContainer* pCont);
 private:
@@ -89,14 +89,14 @@ class LwpNoteLayout: public LwpFrameLayout
 public:
     LwpNoteLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpNoteLayout();
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_NOTE_LAYOUT;}
-    virtual void RegisterStyle() SAL_OVERRIDE;
-    virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_NOTE_LAYOUT;}
+    virtual void RegisterStyle() override;
+    virtual void XFConvert(XFContentContainer* pCont) override;
     sal_uInt32 GetTime(){ return m_nTime;}
     OUString GetAuthor();
 
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     LwpVirtualLayout* GetTextLayout();
 
 private:
@@ -113,12 +113,12 @@ class LwpNoteHeaderLayout: public LwpFrameLayout
 public:
     LwpNoteHeaderLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpNoteHeaderLayout();
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_NOTEHEADER_LAYOUT;}
-    virtual void RegisterStyle() SAL_OVERRIDE;
-    virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_NOTEHEADER_LAYOUT;}
+    virtual void RegisterStyle() override;
+    virtual void XFConvert(XFContentContainer* pCont) override;
 
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 };
 
 /**
@@ -130,12 +130,12 @@ class LwpNoteTextLayout: public LwpFrameLayout
 public:
     LwpNoteTextLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpNoteTextLayout();
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_NOTETEXT_LAYOUT;}
-    virtual void RegisterStyle() SAL_OVERRIDE;
-    virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_NOTETEXT_LAYOUT;}
+    virtual void RegisterStyle() override;
+    virtual void XFConvert(XFContentContainer* pCont) override;
 
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 };
 
 /**
@@ -147,12 +147,12 @@ class LwpViewportLayout: public LwpPlacableLayout
 public:
     LwpViewportLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpViewportLayout();
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_VIEWPORT_LAYOUT;}
-    virtual void RegisterStyle() SAL_OVERRIDE;
-    virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_VIEWPORT_LAYOUT;}
+    virtual void RegisterStyle() override;
+    virtual void XFConvert(XFContentContainer* pCont) override;
 
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 };
 
 #endif
diff --git a/lotuswordpro/source/filter/lwpnumberingoverride.hxx b/lotuswordpro/source/filter/lwpnumberingoverride.hxx
index 300522f1e250..4988eb811812 100644
--- a/lotuswordpro/source/filter/lwpnumberingoverride.hxx
+++ b/lotuswordpro/source/filter/lwpnumberingoverride.hxx
@@ -69,7 +69,7 @@ public:
     LwpNumberingOverride();
     virtual ~LwpNumberingOverride(){}
 
-    virtual LwpNumberingOverride* clone() const SAL_OVERRIDE;
+    virtual LwpNumberingOverride* clone() const override;
 
     enum
     {
@@ -79,7 +79,7 @@ public:
         SMARTLEVEL      = 0x0008
     };
 public:
-    virtual void Read(LwpObjectStream *pStrm) SAL_OVERRIDE;
+    virtual void Read(LwpObjectStream *pStrm) override;
 
     inline sal_uInt16 GetLevel() const;
     inline sal_uInt16 GetPosition() const;
diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx b/lotuswordpro/source/filter/lwpnumericfmt.hxx
index 917f9bfc8166..1ae0fd0d6c92 100644
--- a/lotuswordpro/source/filter/lwpnumericfmt.hxx
+++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx
@@ -302,7 +302,7 @@ public:
     LwpLayoutNumerics(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
     :LwpVirtualPiece(objHdr, pStrm),cNumerics(m_pObjStrm){}
     XFStyle* Convert();
-    virtual void Read() SAL_OVERRIDE;
+    virtual void Read() override;
 
 protected:
     LwpNumericFormat cNumerics;
diff --git a/lotuswordpro/source/filter/lwpoleobject.hxx b/lotuswordpro/source/filter/lwpoleobject.hxx
index f0d219e02605..157761e34052 100644
--- a/lotuswordpro/source/filter/lwpoleobject.hxx
+++ b/lotuswordpro/source/filter/lwpoleobject.hxx
@@ -98,7 +98,7 @@ class LwpGraphicOleObject : public LwpContent
 {
 public:
     LwpGraphicOleObject(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
-    virtual void Read() SAL_OVERRIDE;
+    virtual void Read() override;
     void         GetGrafScaledSize(double& fWidth, double& fHeight);
     virtual void GetGrafOrgSize(double& rWidth, double& rHeight);
 protected:
@@ -117,11 +117,11 @@ class LwpOleObject : public LwpGraphicOleObject
 public:
     LwpOleObject(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
     virtual ~LwpOleObject(){}
-    virtual void Read() SAL_OVERRIDE;
-    virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
-    virtual void XFConvert(XFContentContainer * pCont) SAL_OVERRIDE;
-    virtual void RegisterStyle() SAL_OVERRIDE;
-    void GetGrafOrgSize(double& rWidth, double& rHeight) SAL_OVERRIDE ;
+    virtual void Read() override;
+    virtual void Parse(IXFStream* pOutputStream) override;
+    virtual void XFConvert(XFContentContainer * pCont) override;
+    virtual void RegisterStyle() override;
+    void GetGrafOrgSize(double& rWidth, double& rHeight) override ;
 private:
     sal_uInt16 cPersistentFlags;
 
diff --git a/lotuswordpro/source/filter/lwpoverride.hxx b/lotuswordpro/source/filter/lwpoverride.hxx
index 417ea56d376e..84abc9288bdd 100644
--- a/lotuswordpro/source/filter/lwpoverride.hxx
+++ b/lotuswordpro/source/filter/lwpoverride.hxx
@@ -107,9 +107,9 @@ class LwpTextLanguageOverride : public LwpOverride
 public:
     LwpTextLanguageOverride() : m_nLanguage(0) {}
 
-    virtual LwpTextLanguageOverride* clone() const SAL_OVERRIDE;
+    virtual LwpTextLanguageOverride* clone() const override;
 
-    void Read(LwpObjectStream* pStrm) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pStrm) override;
 
 protected:
     LwpTextLanguageOverride(LwpTextLanguageOverride const& rOther);
@@ -126,9 +126,9 @@ class LwpTextAttributeOverride : public LwpOverride
 public:
     LwpTextAttributeOverride() : m_nHideLevels(0), m_nBaseLineOffset(0) {}
 
-    virtual LwpTextAttributeOverride* clone() const SAL_OVERRIDE;
+    virtual LwpTextAttributeOverride* clone() const override;
 
-    void Read(LwpObjectStream* pStrm) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pStrm) override;
 
     inline sal_uInt16 GetHideLevels() const;
 
@@ -158,9 +158,9 @@ class LwpKinsokuOptsOverride : public LwpOverride
 public:
     LwpKinsokuOptsOverride() : m_nLevels(0) {}
 
-    virtual LwpKinsokuOptsOverride* clone() const SAL_OVERRIDE;
+    virtual LwpKinsokuOptsOverride* clone() const override;
 
-    void Read(LwpObjectStream* pStrm) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pStrm) override;
 
 protected:
     LwpKinsokuOptsOverride(LwpKinsokuOptsOverride const& rOther);
@@ -177,9 +177,9 @@ class LwpBulletOverride : public LwpOverride
 public:
     LwpBulletOverride() {m_bIsNull = true;}
 
-    virtual LwpBulletOverride* clone() const SAL_OVERRIDE;
+    virtual LwpBulletOverride* clone() const override;
 
-    void Read(LwpObjectStream* pStrm) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pStrm) override;
 
     inline LwpObjectID GetSilverBullet() const;
 
@@ -277,9 +277,9 @@ class LwpAlignmentOverride : public LwpOverride
 public:
     LwpAlignmentOverride() : m_nAlignType(ALIGN_LEFT), m_nPosition(0), m_nAlignChar(0){}
 
-    virtual LwpAlignmentOverride* clone() const SAL_OVERRIDE;
+    virtual LwpAlignmentOverride* clone() const override;
 
-    void Read(LwpObjectStream* pStrm) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pStrm) override;
 
     enum AlignType
     {
@@ -321,9 +321,9 @@ class LwpSpacingCommonOverride : public LwpOverride
 public:
     LwpSpacingCommonOverride() : m_nSpacingType(SPACING_NONE), m_nAmount(0), m_nMultiple(65536){}
 
-    virtual LwpSpacingCommonOverride* clone() const SAL_OVERRIDE;
+    virtual LwpSpacingCommonOverride* clone() const override;
 
-    void Read(LwpObjectStream* pStrm) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pStrm) override;
 
     enum SpacingType
     {
@@ -366,9 +366,9 @@ public:
     LwpSpacingOverride();
     virtual ~LwpSpacingOverride();
 
-    virtual LwpSpacingOverride* clone() const SAL_OVERRIDE;
+    virtual LwpSpacingOverride* clone() const override;
 
-    void Read(LwpObjectStream* pStrm) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pStrm) override;
 
     void Override(LwpSpacingOverride* other);
 
@@ -395,9 +395,9 @@ class LwpIndentOverride : public LwpOverride
 public:
     LwpIndentOverride() : m_nAll(0), m_nFirst(0), m_nRest(0), m_nRight(0) {}
 
-    virtual LwpIndentOverride* clone() const SAL_OVERRIDE;
+    virtual LwpIndentOverride* clone() const override;
 
-    void Read(LwpObjectStream* pStrm) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pStrm) override;
 
     enum
     {
@@ -476,9 +476,9 @@ public:
 
     virtual ~LwpAmikakeOverride();
 
-    virtual LwpAmikakeOverride* clone() const SAL_OVERRIDE;
+    virtual LwpAmikakeOverride* clone() const override;
 
-    void Read(LwpObjectStream* pStrm) SAL_OVERRIDE;
+    void Read(LwpObjectStream* pStrm) override;
     enum
     {
         AMIKAKE_NONE        = 0,
diff --git a/lotuswordpro/source/filter/lwppagehint.hxx b/lotuswordpro/source/filter/lwppagehint.hxx
index 85408cb6b0bc..e59bf4db9d7f 100644
--- a/lotuswordpro/source/filter/lwppagehint.hxx
+++ b/lotuswordpro/source/filter/lwppagehint.hxx
@@ -97,8 +97,8 @@ class LwpPageHint : public LwpDLVList
 {
 public:
     LwpPageHint(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
-    void Read() SAL_OVERRIDE;
-    void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+    void Read() override;
+    void Parse(IXFStream* pOutputStream) override;
     sal_uInt16 GetPageNumber(){return m_nPageNumber;}
     LwpObjectID& GetPageLayoutID(){ return m_PageLayout;}
     sal_uInt16 GetLayoutPageNumber(){ return m_nLayoutPageNumber;}
diff --git a/lotuswordpro/source/filter/lwppagelayout.hxx b/lotuswordpro/source/filter/lwppagelayout.hxx
index aca7fc539e2e..8074c3bbc7a3 100644
--- a/lotuswordpro/source/filter/lwppagelayout.hxx
+++ b/lotuswordpro/source/filter/lwppagelayout.hxx
@@ -67,12 +67,12 @@ class LwpPageLayout: public LwpLayout
 public:
     LwpPageLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpPageLayout();
-    virtual void RegisterStyle() SAL_OVERRIDE;
+    virtual void RegisterStyle() override;
     OUString RegisterEndnoteStyle();
-    virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_PAGE_LAYOUT;}
+    virtual void Parse(IXFStream* pOutputStream) override;
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_PAGE_LAYOUT;}
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     LwpHeaderLayout* GetHeaderLayout();
     LwpFooterLayout* GetFooterLayout();
     void ParseGeometry(XFPageMaster* pm1);
@@ -87,8 +87,8 @@ protected:
     void ParseFootNoteSeparator(XFPageMaster* pm1);
     double GetMarginWidth();
     void GetWidthAndHeight(double& fWidth, double& fHeight);
-    double GetWidth() SAL_OVERRIDE;
-    double GetHeight() SAL_OVERRIDE;
+    double GetWidth() override;
+    double GetHeight() override;
 protected:
     LwpAtomHolder*  m_pPrinterBinName;
     sal_uInt16      m_nPrinterBin;
@@ -101,7 +101,7 @@ public:
     void ConvertFillerPageText(XFContentContainer* pCont);
     void ResetXFColumns();
     LwpPageLayout* GetOddChildLayout();
-    virtual sal_Int32 GetPageNumber(sal_uInt16 nLayoutNumber = 0) SAL_OVERRIDE;
+    virtual sal_Int32 GetPageNumber(sal_uInt16 nLayoutNumber = 0) override;
     bool operator <(LwpPageLayout& Other);
     LwpPara* GetPagePosition();
 };
@@ -113,12 +113,12 @@ class LwpHeaderLayout: public LwpPlacableLayout
 public:
     LwpHeaderLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpHeaderLayout();
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_HEADER_LAYOUT;}
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_HEADER_LAYOUT;}
     using LwpPlacableLayout::RegisterStyle;
     void RegisterStyle( XFPageMaster* pm1 );
     void RegisterStyle( XFMasterPage* mp1 );
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     void ParseMargins( XFHeaderStyle* ph1 );
     void ParseBorder( XFHeaderStyle* ph1 );
     void ParseShadow( XFHeaderStyle* ph1 );
@@ -136,12 +136,12 @@ class LwpFooterLayout: public LwpPlacableLayout
 public:
     LwpFooterLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpFooterLayout();
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_FOOTER_LAYOUT;}
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_FOOTER_LAYOUT;}
     using LwpPlacableLayout::RegisterStyle;
     void RegisterStyle(XFPageMaster* pm1);
     void RegisterStyle(XFMasterPage* mp1);
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     void ParseMargins( XFFooterStyle* pFooterStyle );
     void ParseBorder( XFFooterStyle* pFooterStyle );
     void ParseShadow( XFFooterStyle* pFooterStyle );
diff --git a/lotuswordpro/source/filter/lwppara.hxx b/lotuswordpro/source/filter/lwppara.hxx
index b0d24878006e..817811338b23 100644
--- a/lotuswordpro/source/filter/lwppara.hxx
+++ b/lotuswordpro/source/filter/lwppara.hxx
@@ -145,10 +145,10 @@ class LwpPara : public LwpDLVList
 public:
     LwpPara(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
 
-    void Read() SAL_OVERRIDE;
-    void RegisterStyle() SAL_OVERRIDE;
-    void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
-    void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
+    void Read() override;
+    void RegisterStyle() override;
+    void Parse(IXFStream* pOutputStream) override;
+    void XFConvert(XFContentContainer* pCont) override;
 
     LwpPara* GetParent();
     LwpObjectID& GetStoryID();
diff --git a/lotuswordpro/source/filter/lwpparaborderoverride.hxx b/lotuswordpro/source/filter/lwpparaborderoverride.hxx
index 737261c6a023..5a3c4ba1595b 100644
--- a/lotuswordpro/source/filter/lwpparaborderoverride.hxx
+++ b/lotuswordpro/source/filter/lwpparaborderoverride.hxx
@@ -72,7 +72,7 @@ public:
     LwpParaBorderOverride();
     virtual ~LwpParaBorderOverride();
 
-    virtual LwpParaBorderOverride* clone() const SAL_OVERRIDE;
+    virtual LwpParaBorderOverride* clone() const override;
 
     enum BorderWidthType
     {
@@ -82,7 +82,7 @@ public:
         PB_CUSTOMWIDTH  = 3         /* Border width is specified explicitly */
     };
 public:
-    virtual void Read(LwpObjectStream *pStrm) SAL_OVERRIDE;
+    virtual void Read(LwpObjectStream *pStrm) override;
 
     LwpShadow*  GetShadow(){ return m_pShadow; }
     LwpBorderStuff* GetBorderStuff(){ return m_pBorderStuff; }
diff --git a/lotuswordpro/source/filter/lwpparaproperty.hxx b/lotuswordpro/source/filter/lwpparaproperty.hxx
index 5bce48dce864..b75c099ccb56 100644
--- a/lotuswordpro/source/filter/lwpparaproperty.hxx
+++ b/lotuswordpro/source/filter/lwpparaproperty.hxx
@@ -109,7 +109,7 @@ public:
         explicit LwpParaAlignProperty(LwpObjectStream* pFile);
         virtual ~LwpParaAlignProperty();
         LwpAlignmentOverride* GetAlignment();
-        sal_uInt32  GetType() SAL_OVERRIDE;
+        sal_uInt32  GetType() override;
 
 private:
         LwpAlignmentOverride* m_pAlignment;
@@ -126,7 +126,7 @@ public:
         explicit LwpParaIndentProperty(LwpObjectStream* pFile);
         virtual ~LwpParaIndentProperty();
         LwpIndentOverride* GetIndent();
-        sal_uInt32 GetType() SAL_OVERRIDE;
+        sal_uInt32 GetType() override;
         inline LwpObjectID GetIndentID();
 
 private:
@@ -148,7 +148,7 @@ public:
         explicit LwpParaSpacingProperty(LwpObjectStream* pFile);
         virtual ~LwpParaSpacingProperty();
         LwpSpacingOverride* GetSpacing();
-        sal_uInt32 GetType() SAL_OVERRIDE;
+        sal_uInt32 GetType() override;
 private:
         LwpSpacingOverride* m_pSpacing;
 
@@ -165,7 +165,7 @@ class LwpParaBorderProperty : public LwpParaProperty
 public:
     explicit LwpParaBorderProperty(LwpObjectStream* pStrm);
 
-    sal_uInt32 GetType() SAL_OVERRIDE { return PP_LOCAL_BORDER; }
+    sal_uInt32 GetType() override { return PP_LOCAL_BORDER; }
 
     inline LwpParaBorderOverride* GetLocalParaBorder();
 
@@ -183,7 +183,7 @@ class LwpParaBreaksProperty : public LwpParaProperty
 public:
     explicit LwpParaBreaksProperty(LwpObjectStream* pStrm);
 
-    sal_uInt32 GetType() SAL_OVERRIDE { return PP_LOCAL_BREAKS; }
+    sal_uInt32 GetType() override { return PP_LOCAL_BREAKS; }
 
     inline LwpBreaksOverride* GetLocalParaBreaks();
 
@@ -204,7 +204,7 @@ public:
 
     virtual ~LwpParaBulletProperty();
 
-    sal_uInt32 GetType() SAL_OVERRIDE { return PP_LOCAL_BULLET; }
+    sal_uInt32 GetType() override { return PP_LOCAL_BULLET; }
 
     inline LwpBulletOverride* GetLocalParaBullet();
 
@@ -222,7 +222,7 @@ class LwpParaNumberingProperty : public LwpParaProperty
 public:
     explicit LwpParaNumberingProperty(LwpObjectStream* pStrm);
 
-    sal_uInt32 GetType() SAL_OVERRIDE { return PP_LOCAL_NUMBERING; }
+    sal_uInt32 GetType() override { return PP_LOCAL_NUMBERING; }
 
     inline LwpNumberingOverride* GetLocalNumbering() const;
 private:
@@ -239,7 +239,7 @@ class LwpParaTabRackProperty : public LwpParaProperty
 public:
     explicit LwpParaTabRackProperty(LwpObjectStream* pStrm);
     virtual ~LwpParaTabRackProperty();
-    sal_uInt32 GetType() SAL_OVERRIDE { return PP_LOCAL_TABRACK; }
+    sal_uInt32 GetType() override { return PP_LOCAL_TABRACK; }
 
     inline LwpTabOverride* GetTab();
 
@@ -258,7 +258,7 @@ public:
     explicit LwpParaBackGroundProperty(LwpObjectStream* pFile);
     virtual ~LwpParaBackGroundProperty();
     LwpBackgroundOverride* GetBackground();
-    sal_uInt32 GetType() SAL_OVERRIDE;
+    sal_uInt32 GetType() override;
 private:
     LwpBackgroundOverride* m_pBackground;
 };
diff --git a/lotuswordpro/source/filter/lwpparastyle.hxx b/lotuswordpro/source/filter/lwpparastyle.hxx
index 59febd6edd32..c86834c25b72 100644
--- a/lotuswordpro/source/filter/lwpparastyle.hxx
+++ b/lotuswordpro/source/filter/lwpparastyle.hxx
@@ -78,7 +78,7 @@ public:
 
     virtual ~LwpParaStyle();
 
-    void        Read() SAL_OVERRIDE;
+    void        Read() override;
 
     void        Apply(XFParaStyle *pStrm);
     static void ApplyParaBorder(XFParaStyle* pParaStyle, LwpParaBorderOverride* pBorder);
@@ -89,7 +89,7 @@ public:
 
     static void ApplyTab(XFParaStyle* pParaStyle, LwpTabOverride* pTab);
 
-    void RegisterStyle() SAL_OVERRIDE;
+    void RegisterStyle() override;
 
     LwpAlignmentOverride* GetAlignment();
     LwpIndentOverride* GetIndent();
diff --git a/lotuswordpro/source/filter/lwppiece.hxx b/lotuswordpro/source/filter/lwppiece.hxx
index 9125f13b6eae..497c386851b7 100644
--- a/lotuswordpro/source/filter/lwppiece.hxx
+++ b/lotuswordpro/source/filter/lwppiece.hxx
@@ -83,7 +83,7 @@ public:
         m_pOverride = NULL;
     }
 
-    virtual void Read() SAL_OVERRIDE
+    virtual void Read() override
     {
         LwpDLVList::Read();
         if( m_pOverride )
diff --git a/lotuswordpro/source/filter/lwpproplist.hxx b/lotuswordpro/source/filter/lwpproplist.hxx
index d821bfa9134d..7ad14dfc68ad 100644
--- a/lotuswordpro/source/filter/lwpproplist.hxx
+++ b/lotuswordpro/source/filter/lwpproplist.hxx
@@ -69,7 +69,7 @@ class LwpPropListElement : public LwpDLVList
 {
 public:
     LwpPropListElement(LwpObjectHeader &objHdr, LwpSvStream *pStrm);
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     bool IsNamed(const OUString& name);
     LwpPropListElement* GetNext();
     LwpAtomHolder GetValue(){return m_Value;}
diff --git a/lotuswordpro/source/filter/lwprowlayout.hxx b/lotuswordpro/source/filter/lwprowlayout.hxx
index 21225c5dd9ff..20309d6f0c6d 100644
--- a/lotuswordpro/source/filter/lwprowlayout.hxx
+++ b/lotuswordpro/source/filter/lwprowlayout.hxx
@@ -77,13 +77,13 @@ class LwpRowLayout : public LwpVirtualLayout
 public:
     LwpRowLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpRowLayout();
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_ROW_LAYOUT;}
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_ROW_LAYOUT;}
     sal_uInt16 GetRowID() { return crowid;}
-    virtual void RegisterStyle() SAL_OVERRIDE;
+    virtual void RegisterStyle() override;
     inline LwpTableLayout * GetParentTableLayout(){return dynamic_cast<LwpTableLayout *>(GetParent().obj().get());}
     void SetRowMap();
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     sal_uInt16 crowid;
     sal_Int32 cheight;              // Minimum height if height is automatic.
     sal_uInt8 cLeaderDotCount;  // dfb - # of cells with leader dots
@@ -119,9 +119,9 @@ class LwpRowHeadingLayout : public LwpRowLayout
 public:
     LwpRowHeadingLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpRowHeadingLayout();
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_ROW_HEADING_LAYOUT;}
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_ROW_HEADING_LAYOUT;}
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     LwpObjectID cRowLayout;
 };
 
diff --git a/lotuswordpro/source/filter/lwpsection.hxx b/lotuswordpro/source/filter/lwpsection.hxx
index 4a422b89a793..47f81dbbe149 100644
--- a/lotuswordpro/source/filter/lwpsection.hxx
+++ b/lotuswordpro/source/filter/lwpsection.hxx
@@ -72,7 +72,7 @@ class LwpOrderedObject : public LwpDLNFVList
 public:
     LwpOrderedObject(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpOrderedObject(){}
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     LwpObjectID& GetPosition(){ return m_Para;}
     LwpObjectID& GetListList(){ return m_ListList;}
 protected:
@@ -92,11 +92,11 @@ public:
     LwpSection(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpSection();
     inline LwpPageLayout* GetPageLayout();
-    void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+    void Parse(IXFStream* pOutputStream) override;
     OUString GetSectionName(){return m_AtomHolder.str();}
 
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 private:
     sal_uInt16 m_Flags;
     LwpObjectID m_PageLayout;
@@ -122,7 +122,7 @@ public:
     bool IsFormatRunin();
     bool IsFormatSeparator();
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 private:
     enum{
         SEPARATORS = 0x01,
diff --git a/lotuswordpro/source/filter/lwpsilverbullet.hxx b/lotuswordpro/source/filter/lwpsilverbullet.hxx
index b0bde8b7a546..8d7309650236 100644
--- a/lotuswordpro/source/filter/lwpsilverbullet.hxx
+++ b/lotuswordpro/source/filter/lwpsilverbullet.hxx
@@ -93,9 +93,9 @@ public:
 
     virtual ~LwpSilverBullet();
 
-    virtual void RegisterStyle() SAL_OVERRIDE;
+    virtual void RegisterStyle() override;
 
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 
     bool IsBulletOrdered();
 
diff --git a/lotuswordpro/source/filter/lwpstory.hxx b/lotuswordpro/source/filter/lwpstory.hxx
index e025b4217831..18125f93b275 100644
--- a/lotuswordpro/source/filter/lwpstory.hxx
+++ b/lotuswordpro/source/filter/lwpstory.hxx
@@ -93,15 +93,15 @@ private:
     XFContentContainer* m_pXFContainer;
 
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     void XFConvertFrameInCell(XFContentContainer* pCont);
     void XFConvertFrameInFrame(XFContentContainer* pCont);
     void XFConvertFrameInHeaderFooter(XFContentContainer* pCont);
 
 public:
-    void RegisterStyle() SAL_OVERRIDE;
-    void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
-    virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
+    void RegisterStyle() override;
+    void Parse(IXFStream* pOutputStream) override;
+    virtual void XFConvert(XFContentContainer* pCont) override;
     void XFConvertFrameInPage(XFContentContainer* pCont);
     inline LwpObjectID& GetFirstPara();
     inline LwpObjectID& GetLastPara();
diff --git a/lotuswordpro/source/filter/lwptable.hxx b/lotuswordpro/source/filter/lwptable.hxx
index a487801cd997..edc739d7e2c9 100644
--- a/lotuswordpro/source/filter/lwptable.hxx
+++ b/lotuswordpro/source/filter/lwptable.hxx
@@ -81,10 +81,10 @@ public:
     LwpSuperTable(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpSuperTable();
 
-    virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
-    virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
+    virtual void Parse(IXFStream* pOutputStream) override;
+    virtual void XFConvert(XFContentContainer* pCont) override;
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 };
 /**
  * @brief
@@ -113,7 +113,7 @@ public:
     LwpTable(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpTable();
 
-    virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+    virtual void Parse(IXFStream* pOutputStream) override;
     double GetWidth() {return LwpTools::ConvertFromUnitsToMetric(m_nWidth);}
     double GetHeight() {return LwpTools::ConvertFromUnitsToMetric(m_nHeight);}
     LwpObjectID& GetDefaultCellStyle() {return m_DefaultCellStyle;}
@@ -121,7 +121,7 @@ public:
     sal_uInt16 GetColumn() {return m_nColumn;}
     LwpTableLayout * GetTableLayout(){return static_cast<LwpTableLayout *>(GetLayout(NULL));}
     bool IsNumberDown();
-    virtual bool IsTable() SAL_OVERRIDE { return true;}
+    virtual bool IsTable() override { return true;}
     LwpSuperTableLayout* GetSuperTableLayout();
 protected:
     LwpDLVListHeadTail m_RowCache;
@@ -143,7 +143,7 @@ protected:
 
     LwpObjectID     m_Layout;
     LwpObjectID     m_DefaultCellStyle; // gCVirtualLayout
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 };
 
 /**
@@ -156,9 +156,9 @@ public:
     LwpTableHeading(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpTableHeading();
 
-    virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+    virtual void Parse(IXFStream* pOutputStream) override;
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 
 };
 class LwpParallelColumns : public LwpTable
@@ -167,7 +167,7 @@ public:
     LwpParallelColumns(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpParallelColumns();
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     LwpObjectID     cDefaultLeftColumnStyle;
     LwpObjectID cDefaultRightColumnStyle;
 };
@@ -178,7 +178,7 @@ public:
     LwpGlossary(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpGlossary();
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     sal_uInt16 GetNumIndexRows();
 };
 
diff --git a/lotuswordpro/source/filter/lwptablelayout.hxx b/lotuswordpro/source/filter/lwptablelayout.hxx
index 390b3c4011b0..f917fc5c3e26 100644
--- a/lotuswordpro/source/filter/lwptablelayout.hxx
+++ b/lotuswordpro/source/filter/lwptablelayout.hxx
@@ -87,9 +87,9 @@ class LwpTableLayout: public LwpLayout
 public:
     LwpTableLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpTableLayout();
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_TABLE_LAYOUT;}
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_TABLE_LAYOUT;}
     LwpObjectID& GetColumnLayoutHead(){return m_ColumnLayout;}
-    void RegisterStyle() SAL_OVERRIDE;
+    void RegisterStyle() override;
     LwpTable *  GetTable();
     LwpCellLayout * GetDefaultCellLayout(){return m_pDefaultCellLayout;}
     LwpSuperTableLayout * GetSuperTableLayout();
@@ -103,7 +103,7 @@ public:
         m_WordProCellsMap[static_cast<size_t>(nRow) * m_nCols + nCol] = pCell;
     };
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     void TraverseTable();
     void RegisterColumns();
     void RegisterRows();
@@ -126,7 +126,7 @@ private:
     LwpColumnLayout ** m_pColumns;
 
 public:
-    void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
+    void XFConvert(XFContentContainer* pCont) override;
     void ConvertTable(XFTable* pXFTable,sal_uInt16 nStartRow,
                 sal_uInt16 nEndRow,sal_uInt8 nStartCol,sal_uInt8 nEndCol);
     OUString GetDefaultRowStyleName(){return m_DefaultRowStyleName;}
@@ -159,7 +159,7 @@ class LwpSuperTableLayout: public LwpPlacableLayout
 public:
     LwpSuperTableLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpSuperTableLayout();
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_SUPERTABLE_LAYOUT;}
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_SUPERTABLE_LAYOUT;}
     void RegisterNewStyle();
     // for table style
     void ApplyPatternFill(XFTableStyle* pTableStyle);
@@ -167,17 +167,17 @@ public:
 
     void ApplyBackColor(XFTableStyle *pTableStyle);
     void ApplyShadow(XFTableStyle *pTableStyle);
-    double GetWidth() SAL_OVERRIDE;
+    double GetWidth() override;
     double GetTableWidth();
     void ApplyWatermark(XFTableStyle *pTableStyle);
     void ApplyAlignment(XFTableStyle * pTableStyle);
-    void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
+    void XFConvert(XFContentContainer* pCont) override;
     // for frame style
-    virtual void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, bool bAll = false) SAL_OVERRIDE;
+    virtual void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, bool bAll = false) override;
     void RegisterFrameStyle();
     LwpTableHeadingLayout* GetTableHeadingLayout();
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     LwpTableLayout* GetTableLayout();
     bool IsSizeRightToContent();
     bool IsJustifiable();
@@ -194,14 +194,14 @@ class LwpColumnLayout : public LwpVirtualLayout
 public:
     LwpColumnLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpColumnLayout();
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_COLUMN_LAYOUT;}
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_COLUMN_LAYOUT;}
     sal_uInt32 GetColumnID(){return ccolid;}
-    double GetWidth() SAL_OVERRIDE {return LwpTools::ConvertFromUnitsToMetric(cwidth);}
+    double GetWidth() override {return LwpTools::ConvertFromUnitsToMetric(cwidth);}
     using LwpVirtualLayout::RegisterStyle;
     void RegisterStyle(double dCalculatedWidth);
     bool IsJustifiable(){return (( m_nAttributes2 & STYLE2_JUSTIFIABLE) != 0);}
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     sal_uInt8 ccolid;
     sal_Int32 cwidth;
 
@@ -215,10 +215,10 @@ class LwpTableHeadingLayout : public LwpTableLayout
 public:
     LwpTableHeadingLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpTableHeadingLayout();
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_TABLE_HEADING_LAYOUT;}
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_TABLE_HEADING_LAYOUT;}
     void GetStartEndRow(sal_uInt16& nStartRow, sal_uInt16& nEndRow);
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     sal_uInt16 cStartRow;
     sal_uInt16 cEndRow;
 };
@@ -232,7 +232,7 @@ public:
     LwpSuperParallelColumnLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpSuperParallelColumnLayout();
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 };
 
 /**
@@ -245,7 +245,7 @@ public:
     LwpParallelColumnsLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpParallelColumnsLayout();
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 };
 
 class LwpSuperGlossaryLayout : public LwpSuperTableLayout
@@ -254,7 +254,7 @@ public:
     LwpSuperGlossaryLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpSuperGlossaryLayout();
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 };
 
 #include "lwpcelllayout.hxx"
diff --git a/lotuswordpro/source/filter/lwptaboverride.hxx b/lotuswordpro/source/filter/lwptaboverride.hxx
index bb1f8089a8d0..f1cf18fa4676 100644
--- a/lotuswordpro/source/filter/lwptaboverride.hxx
+++ b/lotuswordpro/source/filter/lwptaboverride.hxx
@@ -74,9 +74,9 @@ public:
     {
     }
 
-    virtual LwpTabOverride* clone() const SAL_OVERRIDE;
+    virtual LwpTabOverride* clone() const override;
 
-    virtual void Read(LwpObjectStream *pStrm) SAL_OVERRIDE
+    virtual void Read(LwpObjectStream *pStrm) override
     {
         if (pStrm->QuickReadBool())
         {
diff --git a/lotuswordpro/source/filter/lwptabrack.hxx b/lotuswordpro/source/filter/lwptabrack.hxx
index c4e6244df7ce..6371c9f004c3 100644
--- a/lotuswordpro/source/filter/lwptabrack.hxx
+++ b/lotuswordpro/source/filter/lwptabrack.hxx
@@ -133,7 +133,7 @@ class   LwpTabRack : public LwpObject
 public:
     LwpTabRack(LwpObjectHeader objHdr, LwpSvStream* pStrm);
 public:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     sal_uInt16 GetNumTabs();
     LwpTab* Lookup(sal_uInt16 nIndex);
     LwpTabRack* GetNext();
diff --git a/lotuswordpro/source/filter/lwptblcell.hxx b/lotuswordpro/source/filter/lwptblcell.hxx
index 744fbd5f621a..96951339a143 100644
--- a/lotuswordpro/source/filter/lwptblcell.hxx
+++ b/lotuswordpro/source/filter/lwptblcell.hxx
@@ -81,7 +81,7 @@ class LwpCellList : public LwpDLVList
 public:
     LwpCellList(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
 
-    virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+    virtual void Parse(IXFStream* pOutputStream) override;
     LwpObjectID GetNextID(){return GetNext();}
     sal_uInt8 GetColumnID(){return cColumn;}
     LwpObjectID GetValueID(){return cValue;}
@@ -93,7 +93,7 @@ protected:
     sal_uInt8 cColumn;
     LwpObjectID cParent;
 
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     LwpObjectID cValue;
 };
 /**
@@ -105,7 +105,7 @@ class LwpRowList : public LwpDLVList
 public:
     LwpRowList(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
 
-    void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+    void Parse(IXFStream* pOutputStream) override;
     LwpObjectID GetChildHeadID(){return cChild.GetHead();}
     LwpObjectID GetNextID(){return GetNext();}
     sal_uInt16 GetRowID(){return cRowID;}
@@ -113,7 +113,7 @@ protected:
     LwpDLVListHeadTail cChild;
     LwpObjectID cParent;
     sal_uInt16 cRowID;
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 private:
     virtual ~LwpRowList();
 };
@@ -127,11 +127,11 @@ public:
     LwpNumericValue(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
 
     double GetValue(){return cNumber;}
-    void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+    void Parse(IXFStream* pOutputStream) override;
 protected:
     double cNumber;
     //LwpContent m_TheContent;
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 private:
     virtual ~LwpNumericValue();
 };
@@ -145,14 +145,14 @@ class LwpTableRange: public LwpDLVList
 public:
     LwpTableRange(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
 
-    void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+    void Parse(IXFStream* pOutputStream) override;
     LwpObjectID GetCellRangeID(){return cpCellRange;}
     LwpObjectID GetTableID(){ return cqTable;}
     LwpTableRange* GetNext() { return static_cast<LwpTableRange*>(LwpDLVList::GetNext().obj().get());}
 protected:
     LwpObjectID cqTable;
     LwpObjectID cpCellRange;
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 private:
     virtual ~LwpTableRange();
 };
@@ -165,11 +165,11 @@ class LwpCellRange: public LwpObject
 public:
     LwpCellRange(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
 
-    void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+    void Parse(IXFStream* pOutputStream) override;
     LwpObjectID GetFolderID(){return cpFolder;}
 protected:
     LwpObjectID cpFolder;
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 private:
     virtual ~LwpCellRange();
 };
@@ -182,13 +182,13 @@ class LwpFolder: public LwpDLVList
 public:
     LwpFolder(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
 
-    void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+    void Parse(IXFStream* pOutputStream) override;
     LwpObjectID GetChildHeadID(){ return cChild.GetHead();}
 protected:
     LwpDLVListHeadTail cChild;
     LwpObjectID cParent;
     LwpObjectID cqTable;
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 private:
     virtual ~LwpFolder();
 };
@@ -201,9 +201,9 @@ class LwpDependent: public LwpDLVList
 public:
     LwpDependent(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
 
-    void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+    void Parse(IXFStream* pOutputStream) override;
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     LwpObjectID cFormulaInfo;
     sal_uInt16 cReferenceOffset;    // Used to fix dependent formula when we're
                                 //  dropped, sorted.
diff --git a/lotuswordpro/source/filter/lwptblformula.hxx b/lotuswordpro/source/filter/lwptblformula.hxx
index c19e55bdf221..22d2f6627b14 100644
--- a/lotuswordpro/source/filter/lwptblformula.hxx
+++ b/lotuswordpro/source/filter/lwptblformula.hxx
@@ -120,7 +120,7 @@ class LwpFormulaConst:public LwpFormulaArg
 {
 public:
     explicit LwpFormulaConst( double dVal);
-    virtual OUString ToString(LwpTableLayout* pCellsMap) SAL_OVERRIDE;
+    virtual OUString ToString(LwpTableLayout* pCellsMap) override;
 private:
     double m_dVal;
 };
@@ -129,7 +129,7 @@ class LwpFormulaText:public LwpFormulaArg
 {
 public:
     explicit LwpFormulaText( const OUString& aText);
-    virtual OUString ToString(LwpTableLayout* /*pCellsMap*/) SAL_OVERRIDE {return m_aText;}
+    virtual OUString ToString(LwpTableLayout* /*pCellsMap*/) override {return m_aText;}
 private:
     OUString m_aText;
 };
@@ -142,7 +142,7 @@ public:
     sal_Int16 GetCol(){return m_aCol;}
     sal_Int16 GetRow(){return m_aRow;}
 
-    virtual OUString ToString(LwpTableLayout* pCellsMap) SAL_OVERRIDE;
+    virtual OUString ToString(LwpTableLayout* pCellsMap) override;
 private:
     sal_Int16 m_aCol;
     sal_Int16 m_aRow;
@@ -153,7 +153,7 @@ class LwpFormulaCellRangeAddr:public LwpFormulaArg
 public:
     LwpFormulaCellRangeAddr(sal_Int16 aStartCol, sal_Int16 aStartRow, sal_Int16 aEndCol, sal_Int16 aEndRow);
 
-    virtual OUString ToString(LwpTableLayout* pCellsMap) SAL_OVERRIDE;
+    virtual OUString ToString(LwpTableLayout* pCellsMap) override;
 private:
     sal_Int16 m_aStartCol;
     sal_Int16 m_aStartRow;
@@ -169,8 +169,8 @@ public:
 
     void AddArg(LwpFormulaArg* pArg);
 
-    virtual OUString ToString(LwpTableLayout* pCellsMap) SAL_OVERRIDE;
-    OUString ToArgString(LwpTableLayout* pCellsMap) SAL_OVERRIDE;
+    virtual OUString ToString(LwpTableLayout* pCellsMap) override;
+    OUString ToArgString(LwpTableLayout* pCellsMap) override;
 
 protected:
     std::vector<LwpFormulaArg*> m_aArgs;
@@ -181,14 +181,14 @@ class LwpFormulaOp : public LwpFormulaFunc
 {
 public:
     explicit LwpFormulaOp(sal_uInt16 nTokenType):LwpFormulaFunc(nTokenType){;}
-    virtual OUString ToString(LwpTableLayout* pCellsMap) SAL_OVERRIDE;
+    virtual OUString ToString(LwpTableLayout* pCellsMap) override;
 };
 
 class LwpFormulaUnaryOp : public LwpFormulaFunc
 {
 public:
     explicit LwpFormulaUnaryOp(sal_uInt16 nTokenType):LwpFormulaFunc(nTokenType){;}
-    virtual OUString ToString(LwpTableLayout* pCellsMap) SAL_OVERRIDE;
+    virtual OUString ToString(LwpTableLayout* pCellsMap) override;
 };
 
 class LwpFormulaInfo : public LwpCellList
@@ -196,9 +196,9 @@ class LwpFormulaInfo : public LwpCellList
 public:
     LwpFormulaInfo(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     OUString Convert(LwpTableLayout* pCellsMap);
-    void Convert(XFCell * pCell, LwpTableLayout* pCellsMap) SAL_OVERRIDE;
+    void Convert(XFCell * pCell, LwpTableLayout* pCellsMap) override;
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     bool ReadCellID();
     bool ReadText();
     bool ReadCellRange();
diff --git a/lotuswordpro/source/filter/lwptoc.hxx b/lotuswordpro/source/filter/lwptoc.hxx
index 3ba345b56a36..790f80faa76c 100644
--- a/lotuswordpro/source/filter/lwptoc.hxx
+++ b/lotuswordpro/source/filter/lwptoc.hxx
@@ -72,12 +72,12 @@ class LwpTocSuperLayout : public LwpSuperTableLayout
 public:
     LwpTocSuperLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpTocSuperLayout();
-    void RegisterStyle() SAL_OVERRIDE;
-    virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
-    virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_TOC_SUPERTABLE_LAYOUT;}
-    virtual void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, bool bAll = false) SAL_OVERRIDE;
+    void RegisterStyle() override;
+    virtual void XFConvert(XFContentContainer* pCont) override;
+    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_TOC_SUPERTABLE_LAYOUT;}
+    virtual void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, bool bAll = false) override;
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
     bool GetRightAlignPageNumber(sal_uInt16 index);
     bool GetUsePageNumber(sal_uInt16 index);
     sal_uInt16 GetSeparatorType(sal_uInt16 index);
@@ -147,8 +147,8 @@ public:
         USENUMBER = 0x02
     };
     LwpTocLevelData(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
-    void RegisterStyle() SAL_OVERRIDE;
-    virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
+    void RegisterStyle() override;
+    virtual void XFConvert(XFContentContainer* pCont) override;
     inline sal_uInt16 GetLevel(){return m_nLevel;}
     inline bool GetUseText(){   return (m_nFlags & USETEXT) != 0;}
     inline OUString GetSearchStyle(){return m_SearchName.str();}
@@ -161,7 +161,7 @@ private:
     LwpAtomHolder m_SearchName;
 
 protected:
-    void Read() SAL_OVERRIDE;
+    void Read() override;
 };
 
 #endif
diff --git a/lotuswordpro/source/filter/lwpverdocument.hxx b/lotuswordpro/source/filter/lwpverdocument.hxx
index 4713b38257d7..3d895ad27be3 100644
--- a/lotuswordpro/source/filter/lwpverdocument.hxx
+++ b/lotuswordpro/source/filter/lwpverdocument.hxx
@@ -71,8 +71,8 @@ class LwpVerDocument : public LwpObject
 {
 public:
     LwpVerDocument(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
-    void Read() SAL_OVERRIDE;
-    virtual void RegisterStyle() SAL_OVERRIDE;
+    void Read() override;
+    virtual void RegisterStyle() override;
 private:
     virtual ~LwpVerDocument(){}
 
diff --git a/lotuswordpro/source/filter/lwpvpointer.hxx b/lotuswordpro/source/filter/lwpvpointer.hxx
index 5a5748d483f0..c4ebd5f177f9 100644
--- a/lotuswordpro/source/filter/lwpvpointer.hxx
+++ b/lotuswordpro/source/filter/lwpvpointer.hxx
@@ -68,9 +68,9 @@ class LwpVersionedPointer : public LwpObject
 {
 public:
     LwpVersionedPointer(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
-    void Read() SAL_OVERRIDE;
-    void RegisterStyle() SAL_OVERRIDE;
-    void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+    void Read() override;
+    void RegisterStyle() override;
+    void Parse(IXFStream* pOutputStream) override;
     LwpObjectID& GetPointer(){return m_PointerID;}
 protected:
     LwpObjectID m_PointerID;
diff --git a/lotuswordpro/source/filter/xfilter/xfannotation.hxx b/lotuswordpro/source/filter/xfilter/xfannotation.hxx
index e5f739984b2b..226c1dd90601 100644
--- a/lotuswordpro/source/filter/xfilter/xfannotation.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfannotation.hxx
@@ -71,7 +71,7 @@ public:
 
     void SetAuthor(const OUString& author);
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     OUString   m_strDate;
diff --git a/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx b/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx
index 5fa1eea1d75c..671165448d5a 100644
--- a/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx
@@ -74,9 +74,9 @@ public:
 
     void    SetSVGPath(const OUString& path);
 
-    virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
+    virtual enumXFStyle GetStyleFamily() override;
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     OUString   m_strName;
diff --git a/lotuswordpro/source/filter/xfilter/xfbgimage.hxx b/lotuswordpro/source/filter/xfilter/xfbgimage.hxx
index d0564bbb0c42..14cc9aabbe68 100644
--- a/lotuswordpro/source/filter/xfilter/xfbgimage.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfbgimage.hxx
@@ -101,9 +101,9 @@ public:
      * @descr   decide whether there has been a style that is the same as this object.
      *          If it use base64 stream, i'll simply return sal_False because it's too slow to compare two base64 stream.
      */
-    virtual bool Equal(IXFStyle *pStyle) SAL_OVERRIDE;
+    virtual bool Equal(IXFStyle *pStyle) override;
 
-    virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void ToXml(IXFStream *pStrm) override;
 
     friend bool operator==(XFBGImage& img1, XFBGImage& img2);
     friend bool operator!=(XFBGImage& img1, XFBGImage& img2);
diff --git a/lotuswordpro/source/filter/xfilter/xfbookmark.hxx b/lotuswordpro/source/filter/xfilter/xfbookmark.hxx
index 217556b898e0..d3fc0b117311 100644
--- a/lotuswordpro/source/filter/xfilter/xfbookmark.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfbookmark.hxx
@@ -87,7 +87,7 @@ public:
         m_strName = name;
     }
 
-    virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE
+    virtual void ToXml(IXFStream *pStrm) override
     {
         IXFAttrList *pAttrList = pStrm->GetAttrList();
         pAttrList->Clear();
diff --git a/lotuswordpro/source/filter/xfilter/xfcell.hxx b/lotuswordpro/source/filter/xfilter/xfcell.hxx
index a532d0b20e7c..001855e040e9 100644
--- a/lotuswordpro/source/filter/xfilter/xfcell.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcell.hxx
@@ -84,7 +84,7 @@ public:
     /**
      * @descr   Add content for table cell.
      */
-    void    Add(XFContent *pContent) SAL_OVERRIDE;
+    void    Add(XFContent *pContent) override;
 
     /**
      * @descr   If cell spans more the one column, then set column span.
@@ -139,7 +139,7 @@ public:
     /**
      * @descr   Output cell as xml element.
      */
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     XFRow          *m_pOwnerRow;
diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
index efabda90465a..0131d0c8b46b 100644
--- a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
@@ -124,11 +124,11 @@ public:
      */
     void    SetBackImage(XFBGImage *pImage);
 
-    virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
+    virtual enumXFStyle GetStyleFamily() override;
 
-    virtual bool Equal(IXFStyle *pStyle) SAL_OVERRIDE;
+    virtual bool Equal(IXFStyle *pStyle) override;
 
-    virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void ToXml(IXFStream *pStrm) override;
 
 private:
     OUString   m_strDataStyle;
diff --git a/lotuswordpro/source/filter/xfilter/xfchange.hxx b/lotuswordpro/source/filter/xfilter/xfchange.hxx
index fc848105d4fc..afd3192da40f 100644
--- a/lotuswordpro/source/filter/xfilter/xfchange.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfchange.hxx
@@ -72,7 +72,7 @@ class XFChangeList : public XFContentContainer
 public:
     XFChangeList(){}
     virtual ~XFChangeList(){}
-    virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void ToXml(IXFStream *pStrm) override;
 };
 
 class XFChangeRegion : public XFContentContainer
@@ -80,7 +80,7 @@ class XFChangeRegion : public XFContentContainer
 public:
     XFChangeRegion(){}
     virtual ~XFChangeRegion(){}
-    virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void ToXml(IXFStream *pStrm) override;
     void SetChangeID(const OUString& sID){m_sID=sID;}
     void SetEditor(const OUString& sEditor){m_sEditor=sEditor;}
 protected:
@@ -93,7 +93,7 @@ class XFChangeInsert : public XFChangeRegion
 public:
     XFChangeInsert(){}
     virtual ~XFChangeInsert(){}
-    void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    void ToXml(IXFStream *pStrm) override;
 };
 
 class XFChangeDelete : public XFChangeRegion
@@ -101,7 +101,7 @@ class XFChangeDelete : public XFChangeRegion
 public:
     XFChangeDelete(){}
     virtual ~XFChangeDelete(){}
-    void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    void ToXml(IXFStream *pStrm) override;
 };
 
 class XFChange : public XFContent
@@ -109,7 +109,7 @@ class XFChange : public XFContent
 public:
     XFChange(){}
     virtual ~XFChange(){}
-    void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    void ToXml(IXFStream *pStrm) override;
 private:
     OUString m_sID;
 };
@@ -119,7 +119,7 @@ class XFChangeStart : public XFContent
 public:
     XFChangeStart(){}
     virtual ~XFChangeStart(){}
-    void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    void ToXml(IXFStream *pStrm) override;
     void SetChangeID(const OUString& sID){m_sID=sID;}
 private:
     OUString m_sID;
@@ -130,7 +130,7 @@ class XFChangeEnd : public XFContent
 public:
     XFChangeEnd(){}
     virtual ~XFChangeEnd(){}
-    void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    void ToXml(IXFStream *pStrm) override;
     void SetChangeID(const OUString& sID){m_sID=sID;}
 private:
     OUString m_sID;
diff --git a/lotuswordpro/source/filter/xfilter/xfcolstyle.hxx b/lotuswordpro/source/filter/xfilter/xfcolstyle.hxx
index 490193a445d5..4e89aa61666c 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolstyle.hxx
@@ -84,12 +84,12 @@ public:
      */
     double  GetWidth();
 
-    virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
+    virtual enumXFStyle GetStyleFamily() override;
 
     /**
      * @descr   output column style as an xml node.
      */
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     double      m_fWidth;
diff --git a/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx b/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx
index c48e37bcb893..e158dcddf064 100644
--- a/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx
@@ -97,7 +97,7 @@ public:
     /**
      * @descr   Output config information.
      */
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     XFLineNumberConfig  *m_pLineNumberConfig;
diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx
index f83af6bcf8ac..339625950e8e 100644
--- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx
@@ -119,11 +119,11 @@ public:
     /**
      * @descr   return the content type.
      */
-    virtual enumXFContent   GetContentType() SAL_OVERRIDE;
+    virtual enumXFContent   GetContentType() override;
     /**
      * @descr   Output to OOo model or local file.
      */
-    virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void ToXml(IXFStream *pStrm) override;
 
 private:
     std::vector< rtl::Reference<XFContent> >    m_aContents;
diff --git a/lotuswordpro/source/filter/xfilter/xfcrossref.hxx b/lotuswordpro/source/filter/xfilter/xfcrossref.hxx
index feaef993b4ef..7f505e7b07ac 100644
--- a/lotuswordpro/source/filter/xfilter/xfcrossref.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcrossref.hxx
@@ -73,7 +73,7 @@ public:
     virtual ~XFCrossRefStart();
     void SetRefType(sal_uInt8 nType);
     void SetMarkName(const OUString& sName);
-    void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    void ToXml(IXFStream *pStrm) override;
 private:
     enum{
         CROSSREF_INVALID = 0,
@@ -100,7 +100,7 @@ class XFCrossRefEnd : public XFContent
 public:
     XFCrossRefEnd();
     virtual ~XFCrossRefEnd();
-    void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    void ToXml(IXFStream *pStrm) override;
 };
 
 #endif
diff --git a/lotuswordpro/source/filter/xfilter/xfdate.hxx b/lotuswordpro/source/filter/xfilter/xfdate.hxx
index 338731072e98..ead4062d06e5 100644
--- a/lotuswordpro/source/filter/xfilter/xfdate.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdate.hxx
@@ -73,7 +73,7 @@ public:
 
     virtual ~XFDate();
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     bool    m_bFixed;
@@ -86,13 +86,13 @@ private:
 class XFDateStart : public XFDate
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 
 class XFDateEnd : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 
 #endif
diff --git a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx b/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx
index beb78c5a8628..143b00678e1e 100644
--- a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx
@@ -73,7 +73,7 @@ public:
 public:
     void    SetTexture(bool bTexture);
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     bool        m_bTexture;
@@ -107,9 +107,9 @@ public:
 
     void    AddText( const OUString& part );
 
-    virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
+    virtual enumXFStyle GetStyleFamily() override;
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     bool    m_bFixed;
diff --git a/lotuswordpro/source/filter/xfilter/xfdocfield.hxx b/lotuswordpro/source/filter/xfilter/xfdocfield.hxx
index 56928a5f26e3..36828a9e8ae5 100644
--- a/lotuswordpro/source/filter/xfilter/xfdocfield.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdocfield.hxx
@@ -67,130 +67,130 @@ class XFFileName : public XFContent
 {
 public:
     void SetType(const OUString& sType);
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 private:
     OUString m_strType;
 };
 class XFWordCount : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 class XFWordCountStart : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 
 class XFWordCountEnd : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 
 class XFPageCountStart : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 
 class XFPageCountEnd : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 
 class XFCharCount : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 class XFCharCountStart : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 
 class XFCharCountEnd : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 class XFDescription : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 class XFDescriptionStart : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 
 class XFDescriptionEnd : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 
 class XFKeywords : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 class XFTotalEditTime : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 class XFTotalEditTimeEnd : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 
 class XFTotalEditTimeStart : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 class XFCreateTime : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 class XFCreateTimeStart : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 
 class XFCreateTimeEnd : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 class XFLastEditTime : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 class XFLastEditTimeStart : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 
 class XFLastEditTimeEnd : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 
 class XFInitialCreator : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 
 #endif
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx
index 907937582481..4c0e01eae930 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx
@@ -86,9 +86,9 @@ public:
 
     XFColor GetBackColor();
 
-    virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
+    virtual enumXFStyle GetStyleFamily() override;
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     enumXFAreaStyle     m_eAreaStyle;
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx b/lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx
index 722fce1c2a72..de9d73e45f0b 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx
@@ -84,7 +84,7 @@ public:
     /**
      * @descr   Output group object and all its children.
      */
-    virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void ToXml(IXFStream *pStrm) override;
 
 private:
     rtl::Reference<XFContentContainer>  m_aChildren;
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawline.hxx b/lotuswordpro/source/filter/xfilter/xfdrawline.hxx
index 266e76030686..219174ef9bd6 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawline.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawline.hxx
@@ -86,7 +86,7 @@ public:
     /**
      * @descr   Output line object.
      */
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     XFPoint m_aPoint1;
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx
index 5b3df3f9cf58..5a8f6cf781a2 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx
@@ -129,9 +129,9 @@ public:
 
     sal_Int32   GetTransparency();
 
-    virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
+    virtual enumXFStyle GetStyleFamily() override;
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     enumXFLineStyle m_eLineStyle;
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx
index d273a5378249..5624c6f1a83d 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx
@@ -95,7 +95,7 @@ public:
 
     void    ContentToXml(IXFStream *pStrm);
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 protected:
     rtl::Reference<XFContentContainer>  m_aContents;
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx b/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
index 283768f98b56..584677ad1265 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
@@ -124,7 +124,7 @@ public:
      */
     void    ClosePath(bool absPosition = true);
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     std::vector<XFSvgPathEntry> m_aPaths;
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpolygon.hxx b/lotuswordpro/source/filter/xfilter/xfdrawpolygon.hxx
index 60ceb5df485e..649a6f9e2d82 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpolygon.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpolygon.hxx
@@ -73,7 +73,7 @@ public:
     XFDrawPolygon();
 
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 
 #endif
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.hxx b/lotuswordpro/source/filter/xfilter/xfdrawpolyline.hxx
index 1632c1994d3e..0a978d3184a9 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpolyline.hxx
@@ -77,7 +77,7 @@ public:
 
     XFRect  CalcViewBox();
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 protected:
     std::vector<XFPoint>    m_aPoints;
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawrect.hxx b/lotuswordpro/source/filter/xfilter/xfdrawrect.hxx
index 9edc185b2936..1f7fabe5c06c 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawrect.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawrect.hxx
@@ -75,7 +75,7 @@ public:
 
     void    SetSize(double width, double height);
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     double  m_fCornerRadius;
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
index b72815ca59b1..d9c4b70738db 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
@@ -115,9 +115,9 @@ public:
 
     void SetFontWorkStyle(sal_Int8 nForm, enumXFFWStyle eStyle, enumXFFWAdjust eAdjust);
 
-    virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
+    virtual enumXFStyle GetStyleFamily() override;
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     XFFontWorkStyle* m_pFontWorkStyle;
diff --git a/lotuswordpro/source/filter/xfilter/xfendnote.hxx b/lotuswordpro/source/filter/xfilter/xfendnote.hxx
index 1626d2bcbea2..f73aaad500ba 100644
--- a/lotuswordpro/source/filter/xfilter/xfendnote.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfendnote.hxx
@@ -74,7 +74,7 @@ public:
     XFEndNote();
 
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     OUString   m_strID;
diff --git a/lotuswordpro/source/filter/xfilter/xfentry.hxx b/lotuswordpro/source/filter/xfilter/xfentry.hxx
index cb9422c26c29..c7c8fc224d07 100644
--- a/lotuswordpro/source/filter/xfilter/xfentry.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfentry.hxx
@@ -92,7 +92,7 @@ public:
      */
     void    SetOutlineLevel(sal_Int32 level);
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     enumXFEntry     m_eType;
diff --git a/lotuswordpro/source/filter/xfilter/xffloatframe.hxx b/lotuswordpro/source/filter/xfilter/xffloatframe.hxx
index c921c2764dd3..eaa43bff30c6 100644
--- a/lotuswordpro/source/filter/xfilter/xffloatframe.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffloatframe.hxx
@@ -78,7 +78,7 @@ public:
     XFFloatFrame(sal_Int32 start, sal_Int32 end, bool all=false);
 
 public:
-    void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    void    ToXml(IXFStream *pStrm) override;
 
 private:
     sal_Int32   m_nStart;
diff --git a/lotuswordpro/source/filter/xfilter/xffooter.hxx b/lotuswordpro/source/filter/xfilter/xffooter.hxx
index 1ab5e0851fd8..514891834d25 100644
--- a/lotuswordpro/source/filter/xfilter/xffooter.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffooter.hxx
@@ -72,7 +72,7 @@ public:
     XFFooter()
     {
     }
-    virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE
+    virtual void ToXml(IXFStream *pStrm) override
     {
         IXFAttrList *pAttrList = pStrm->GetAttrList();
         pAttrList->Clear();
diff --git a/lotuswordpro/source/filter/xfilter/xffootnote.hxx b/lotuswordpro/source/filter/xfilter/xffootnote.hxx
index bbe4d95f9eea..27f7d22652a1 100644
--- a/lotuswordpro/source/filter/xfilter/xffootnote.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffootnote.hxx
@@ -75,7 +75,7 @@ public:
     XFFootNote();
 
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     OUString   m_strID;
diff --git a/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx b/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx
index cecda70b164f..6c1c5afbe12b 100644
--- a/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx
@@ -82,7 +82,7 @@ public:
 
     void    SetMessageFrom(const OUString& message);
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 protected:
     OUString   m_strBodyStyle;
diff --git a/lotuswordpro/source/filter/xfilter/xfframe.hxx b/lotuswordpro/source/filter/xfilter/xfframe.hxx
index 6d8ee6135595..bfe124b517b4 100644
--- a/lotuswordpro/source/filter/xfilter/xfframe.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfframe.hxx
@@ -90,7 +90,7 @@ public:
     /**
      * @descr   override the add function to adjust z-index.
      */
-    virtual void    Add(XFContent *pContent) SAL_OVERRIDE;
+    virtual void    Add(XFContent *pContent) override;
 
     /**
      * @descr:  Set the anchor type for the frame object.
@@ -159,12 +159,12 @@ public:
     /**
      * @descr   Get content type, enumXFContentFrame.
      */
-    virtual enumXFContent   GetContentType() SAL_OVERRIDE;
+    virtual enumXFContent   GetContentType() override;
 
     /**
      * @descr   serialize.
      */
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     void    StartFrame(IXFStream *pStrm);
diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx
index 1b26d252f085..838d861b48c1 100644
--- a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx
@@ -143,9 +143,9 @@ public:
 
     void SetTransparency(sal_Int16 nTransparency);
 
-    virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
+    virtual enumXFStyle GetStyleFamily() override;
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 protected:
     enumXFWrap  m_eWrap;
diff --git a/lotuswordpro/source/filter/xfilter/xfheader.hxx b/lotuswordpro/source/filter/xfilter/xfheader.hxx
index 5fc150c05441..c9a14799cd20 100644
--- a/lotuswordpro/source/filter/xfilter/xfheader.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfheader.hxx
@@ -71,7 +71,7 @@ public:
     {
     }
 public:
-    virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE
+    virtual void ToXml(IXFStream *pStrm) override
     {
         IXFAttrList *pAttrList = pStrm->GetAttrList();
         pAttrList->Clear();
diff --git a/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx b/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx
index 715afe60aac3..c08f0f5cb85b 100644
--- a/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx
@@ -116,7 +116,7 @@ public:
     /**
      * @descr   Output header style object.
      */
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 protected:
     bool    m_bIsFooter;
diff --git a/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx b/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx
index d5dcb62d5738..6bf3eecdbf47 100644
--- a/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx
@@ -70,7 +70,7 @@ public:
 
     void    SetText(const OUString& text);
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     OUString   m_strHRef;
diff --git a/lotuswordpro/source/filter/xfilter/xfimage.hxx b/lotuswordpro/source/filter/xfilter/xfimage.hxx
index 841c46243c04..de4f22fa321c 100644
--- a/lotuswordpro/source/filter/xfilter/xfimage.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfimage.hxx
@@ -86,7 +86,7 @@ public:
     /**
      * @descr   Output image.
      */
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     OUString m_strImageFile;
diff --git a/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx b/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx
index b45f4375d39f..ea602e8dcbe8 100644
--- a/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx
@@ -75,7 +75,7 @@ public:
 
     void    SetClip(double left, double right, double top, double bottom);
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     sal_Int32   m_nBrightness;
diff --git a/lotuswordpro/source/filter/xfilter/xfindex.hxx b/lotuswordpro/source/filter/xfilter/xfindex.hxx
index 3b4e2bd89985..1125afad2b70 100644
--- a/lotuswordpro/source/filter/xfilter/xfindex.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfindex.hxx
@@ -88,7 +88,7 @@ public:
     /**
      * @descr   Set style.
      */
-    void    SetStyleName(const OUString& style) SAL_OVERRIDE;
+    void    SetStyleName(const OUString& style) override;
     /**
      * @descr   Add a entry in the template.
      */
@@ -104,7 +104,7 @@ public:
      */
     void    AddTextEntry(const OUString& sSpan, const OUString& styleName = "");
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     /**
@@ -158,7 +158,7 @@ public:
      */
     void    SetSeparator(bool sep);
 
-    virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void ToXml(IXFStream *pStrm) override;
 
     void AddTocSource(sal_uInt16 nLevel, const OUString& sStyleName);
 
diff --git a/lotuswordpro/source/filter/xfilter/xfinputlist.hxx b/lotuswordpro/source/filter/xfilter/xfinputlist.hxx
index 8f19d4ada9a5..85323504db8e 100644
--- a/lotuswordpro/source/filter/xfilter/xfinputlist.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfinputlist.hxx
@@ -79,7 +79,7 @@ public:
         m_list=list;
     }
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 private:
     OUString m_strName;
     std::vector<OUString> m_list;
diff --git a/lotuswordpro/source/filter/xfilter/xflinebreak.hxx b/lotuswordpro/source/filter/xfilter/xflinebreak.hxx
index 1be4bb1e8a16..e7c7648087c2 100644
--- a/lotuswordpro/source/filter/xfilter/xflinebreak.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflinebreak.hxx
@@ -66,7 +66,7 @@
 class XFLineBreak : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 
 inline void XFLineBreak::ToXml(IXFStream *pStrm)
diff --git a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
index aef35c1e6b84..509699df3e52 100644
--- a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
@@ -78,7 +78,7 @@ public:
 
     void    SetCountEmptyLines(bool empty = true);
 
-    virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void ToXml(IXFStream *pStrm) override;
 
 private:
     enumXFLineNumberPos m_ePosition;
diff --git a/lotuswordpro/source/filter/xfilter/xflist.hxx b/lotuswordpro/source/filter/xfilter/xflist.hxx
index b8b065c96bf5..a897144cd431 100644
--- a/lotuswordpro/source/filter/xfilter/xflist.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflist.hxx
@@ -90,7 +90,7 @@ public:
     /**
      * @descr   Output list object.
      */
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     bool    m_bOrdered;
diff --git a/lotuswordpro/source/filter/xfilter/xflistitem.hxx b/lotuswordpro/source/filter/xfilter/xflistitem.hxx
index 25b318dfdb64..d0e1a075a6d4 100644
--- a/lotuswordpro/source/filter/xfilter/xflistitem.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflistitem.hxx
@@ -72,7 +72,7 @@ public:
 public:
     void    SetIsHeader(bool isHeader=true);
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     bool    m_bIsHeader;
diff --git a/lotuswordpro/source/filter/xfilter/xfliststyle.hxx b/lotuswordpro/source/filter/xfilter/xfliststyle.hxx
index a280c4445201..12324cbd5526 100644
--- a/lotuswordpro/source/filter/xfilter/xfliststyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfliststyle.hxx
@@ -132,7 +132,7 @@ public:
         m_aNumFmt.SetStartValue(start);
     }
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 private:
     XFNumFmt    m_aNumFmt;
 };
@@ -162,7 +162,7 @@ public:
         m_strFontName = name;
     }
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 private:
     XFNumFmt    m_aNumFmt;
     OUString m_chBullet;
@@ -173,7 +173,7 @@ private:
 class XFListLevelImage : public XFListLevel
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 private:
     sal_Int16       m_nWidth;
     sal_Int16       m_nHeight;
@@ -210,11 +210,11 @@ public:
 
     void    SetListNumber( sal_Int32 level, XFNumFmt& numFmt,   sal_Int16 nStartValue = 1 );
 
-    virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE
+    virtual enumXFStyle GetStyleFamily() override
     {
         return enumXFStyleList;
     }
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     XFListLevel     *m_pListLevels[10];
diff --git a/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx b/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx
index 0cc7b58c045e..ef9d1e4d5914 100644
--- a/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx
@@ -79,9 +79,9 @@ public:
 
     void    SetFooter(XFFooter *pFooter);
 
-    virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
+    virtual enumXFStyle GetStyleFamily() override;
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     OUString   m_strPageMaster;
diff --git a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx b/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx
index 4c32c41abbd2..39c4e757daf2 100644
--- a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx
@@ -86,11 +86,11 @@ public:
 
     void    SetNumberType(enumXFNumberType type);
 
-    virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
+    virtual enumXFStyle GetStyleFamily() override;
 
-    virtual bool Equal(IXFStyle *pStyle) SAL_OVERRIDE;
+    virtual bool Equal(IXFStyle *pStyle) override;
 
-    virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void ToXml(IXFStream *pStrm) override;
 
 protected:
     void    ToXml_StartElement(IXFStream *pStrm);
diff --git a/lotuswordpro/source/filter/xfilter/xfpagecount.hxx b/lotuswordpro/source/filter/xfilter/xfpagecount.hxx
index 8705cfa9638b..eaa6c073dd05 100644
--- a/lotuswordpro/source/filter/xfilter/xfpagecount.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfpagecount.hxx
@@ -71,7 +71,7 @@
 class XFPageCount : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 
 inline void XFPageCount::ToXml(IXFStream *pStrm)
diff --git a/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx b/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx
index 1173d2a26531..32b5b12c3525 100644
--- a/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx
@@ -113,9 +113,9 @@ public:
                                 XFColor color=XFColor(0,0,0)
                                 );
 
-    virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
+    virtual enumXFStyle GetStyleFamily() override;
 
-    virtual void    ToXml(IXFStream *pStream) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStream) override;
 
 private:
     double  m_fPageWidth;
diff --git a/lotuswordpro/source/filter/xfilter/xfpagenumber.hxx b/lotuswordpro/source/filter/xfilter/xfpagenumber.hxx
index c8b3d692f0fe..60a4c150e9ce 100644
--- a/lotuswordpro/source/filter/xfilter/xfpagenumber.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfpagenumber.hxx
@@ -73,7 +73,7 @@ class XFPageNumber : public XFContent
 public:
     void    SetNumFmt(const OUString& fmt);
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     XFNumFmt    m_aNumFmt;
diff --git a/lotuswordpro/source/filter/xfilter/xfparagraph.hxx b/lotuswordpro/source/filter/xfilter/xfparagraph.hxx
index 7c154d34022a..2e9a1e9e89ed 100644
--- a/lotuswordpro/source/filter/xfilter/xfparagraph.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfparagraph.hxx
@@ -81,9 +81,9 @@ public:
 public:
     bool    HasContents();
 
-    virtual enumXFContent   GetContentType() SAL_OVERRIDE;
+    virtual enumXFContent   GetContentType() override;
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 };
 
diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
index eca8d6d9fa6c..9144bff2c8ed 100644
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
@@ -208,11 +208,11 @@ public:
 
     XFMargins& GetMargins(){return m_aMargin;}
 
-    virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
+    virtual enumXFStyle GetStyleFamily() override;
 
-    virtual bool Equal(IXFStyle *pStyle) SAL_OVERRIDE;
+    virtual bool Equal(IXFStyle *pStyle) override;
 
-    virtual void    ToXml(IXFStream *strm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *strm) override;
 
     void SetNumberRight(bool bFlag){m_bNumberRight = bFlag;}
     bool GetNumberRight(){return m_bNumberRight;}
@@ -292,8 +292,8 @@ class XFDefaultParaStyle : public XFStyle
 public:
     XFDefaultParaStyle();
     void SetTabDistance(double len);
-    enumXFStyle GetStyleFamily() SAL_OVERRIDE;
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    enumXFStyle GetStyleFamily() override;
+    virtual void    ToXml(IXFStream *pStrm) override;
 private:
     double m_fTabDistance;
 };
diff --git a/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx b/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx
index e27c8dc2445d..8e57e35f53ab 100644
--- a/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx
@@ -74,7 +74,7 @@ public:
     void SetType(const OUString& sType);
     void SetDesc(const OUString& sDesc);
     void SetPrompt(const OUString& sText);
-    void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    void ToXml(IXFStream *pStrm) override;
 private:
     OUString m_strType;
     OUString m_strDesc;
@@ -121,7 +121,7 @@ class XFHolderEnd : public XFContent
 public:
     XFHolderEnd();
     virtual ~XFHolderEnd();
-    void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    void ToXml(IXFStream *pStrm) override;
 };
 
 XFHolderEnd::XFHolderEnd()
diff --git a/lotuswordpro/source/filter/xfilter/xfrow.hxx b/lotuswordpro/source/filter/xfilter/xfrow.hxx
index ec2c3bef12ae..7b4dee04fa46 100644
--- a/lotuswordpro/source/filter/xfilter/xfrow.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfrow.hxx
@@ -89,7 +89,7 @@ public:
 
     XFTable*    GetOwnerTable();
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
     void        RemoveCell(sal_Int32 cell);
 
diff --git a/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx b/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx
index e5cd6513feab..0d048917b80e 100644
--- a/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx
@@ -78,9 +78,9 @@ public:
 
     void    SetMinRowHeight(double height);
 
-    virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
+    virtual enumXFStyle GetStyleFamily() override;
 
-    virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void ToXml(IXFStream *pStrm) override;
 
 private:
     double  m_fHeight;
diff --git a/lotuswordpro/source/filter/xfilter/xfruby.hxx b/lotuswordpro/source/filter/xfilter/xfruby.hxx
index 91bc26ceeab1..52f728b4bbc1 100644
--- a/lotuswordpro/source/filter/xfilter/xfruby.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfruby.hxx
@@ -65,14 +65,14 @@
 class XFRubyStart : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 
 class XFRubyEnd : public XFContent
 {
 public:
     void SetText(const OUString& sText);
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 private:
     OUString m_strText;
 };
diff --git a/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx b/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx
index 6726eeb6d14b..7458d0618902 100644
--- a/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx
@@ -73,10 +73,10 @@ public:
     {
     }
     virtual ~XFRubyStyle(){}
-    virtual void ToXml(IXFStream *strm) SAL_OVERRIDE;
+    virtual void ToXml(IXFStream *strm) override;
     void SetPosition(enumXFRubyPosition ePosition);
     void SetAlignment(enumXFRubyPosition eAlignment);
-    enumXFStyle GetStyleFamily() SAL_OVERRIDE;
+    enumXFStyle GetStyleFamily() override;
 
 private:
     enumXFRubyPosition m_ePos;
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx
index 38d2908cf141..10879652f620 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx
@@ -73,9 +73,9 @@ public:
 
 public:
     //Interface ISaxAttributeList:
-    virtual void    AddAttribute(const OUString& name, const OUString& value) SAL_OVERRIDE;
+    virtual void    AddAttribute(const OUString& name, const OUString& value) override;
 
-    virtual void    Clear() SAL_OVERRIDE;
+    virtual void    Clear() override;
 
     css::uno::Reference<css::xml::sax::XAttributeList>   GetAttributeList() const;
 
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx b/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx
index f2fb10d69704..1312ddd17d7c 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx
@@ -89,32 +89,32 @@ public:
     /**
      * @descr   Start document callback.
      */
-    virtual void            StartDocument() SAL_OVERRIDE;
+    virtual void            StartDocument() override;
 
     /**
      * @descr   End document callback.
      */
-    virtual void            EndDocument() SAL_OVERRIDE;
+    virtual void            EndDocument() override;
 
     /**
      * @descr   Start output element.
      */
-    virtual void            StartElement(const OUString& oustr) SAL_OVERRIDE;
+    virtual void            StartElement(const OUString& oustr) override;
 
     /**
      * @descr   End output element.
      */
-    virtual void            EndElement(const OUString& oustr) SAL_OVERRIDE;
+    virtual void            EndElement(const OUString& oustr) override;
 
     /**
      * @descr   Output Character section.
      */
-    virtual void            Characters(const OUString& oustr) SAL_OVERRIDE;
+    virtual void            Characters(const OUString& oustr) override;
 
     /**
      * @descr   Get the attribute list interface.
      */
-    virtual IXFAttrList*    GetAttrList() SAL_OVERRIDE;
+    virtual IXFAttrList*    GetAttrList() override;
 
 public:
     css::uno::Reference<css::xml::sax::XDocumentHandler> m_aHandler;
diff --git a/lotuswordpro/source/filter/xfilter/xfsection.hxx b/lotuswordpro/source/filter/xfilter/xfsection.hxx
index 09733c65b7d7..232262e9bb9a 100644
--- a/lotuswordpro/source/filter/xfilter/xfsection.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsection.hxx
@@ -81,7 +81,7 @@ public:
     /**
      * @descr   Output section object.
      */
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     OUString   m_strSectionName;
diff --git a/lotuswordpro/source/filter/xfilter/xfsectionstyle.hxx b/lotuswordpro/source/filter/xfilter/xfsectionstyle.hxx
index aaa8474ba647..da7010b90061 100644
--- a/lotuswordpro/source/filter/xfilter/xfsectionstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsectionstyle.hxx
@@ -84,9 +84,9 @@ public:
 
     void    SetColumns(XFColumns *pColumns);
 
-    virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
+    virtual enumXFStyle GetStyleFamily() override;
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     double      m_fMarginLeft;
diff --git a/lotuswordpro/source/filter/xfilter/xfstyle.hxx b/lotuswordpro/source/filter/xfilter/xfstyle.hxx
index a573e1e2a537..d84001d71067 100644
--- a/lotuswordpro/source/filter/xfilter/xfstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfstyle.hxx
@@ -77,32 +77,32 @@ public:
     /**
      * @descr   get style name.
      */
-    virtual OUString   GetStyleName() SAL_OVERRIDE;
+    virtual OUString   GetStyleName() override;
 
     /**
      * @descr   set style name.
      */
-    virtual void            SetStyleName(const OUString& styleName) SAL_OVERRIDE;
+    virtual void            SetStyleName(const OUString& styleName) override;
 
     /**
      * @descr   set parent style name.
      */
-    virtual OUString   GetParentStyleName() SAL_OVERRIDE;
+    virtual OUString   GetParentStyleName() override;
 
     /**
      * @descr   return parent style name.
      */
-    virtual void            SetParentStyleName(const OUString& styleName) SAL_OVERRIDE;
+    virtual void            SetParentStyleName(const OUString& styleName) override;
 
     /**
      * @descr   get style family.
      */
-    virtual enumXFStyle     GetStyleFamily() SAL_OVERRIDE;
+    virtual enumXFStyle     GetStyleFamily() override;
 
     /**
      * @descr   decide whether two style are equal.
      */
-    virtual bool             Equal(IXFStyle *pStyle) SAL_OVERRIDE;
+    virtual bool             Equal(IXFStyle *pStyle) override;
 
 protected:
     OUString   m_strStyleName;
diff --git a/lotuswordpro/source/filter/xfilter/xftable.hxx b/lotuswordpro/source/filter/xfilter/xftable.hxx
index e5caaa3b4320..42656c88f323 100644
--- a/lotuswordpro/source/filter/xfilter/xftable.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftable.hxx
@@ -96,9 +96,9 @@ public:
 
     bool    IsSubTable();
 
-    enumXFContent   GetContentType() SAL_OVERRIDE;
+    enumXFContent   GetContentType() override;
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
     void RemoveRow(sal_uInt16 row)
     {
diff --git a/lotuswordpro/source/filter/xfilter/xftablestyle.hxx b/lotuswordpro/source/filter/xfilter/xftablestyle.hxx
index bf11c75120e0..af8f96d34585 100644
--- a/lotuswordpro/source/filter/xfilter/xftablestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftablestyle.hxx
@@ -85,9 +85,9 @@ public:
 
     void    SetBackImage(XFBGImage *pImage);
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
-    virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
+    virtual enumXFStyle GetStyleFamily() override;
 
 private:
     double  m_fWidth;
diff --git a/lotuswordpro/source/filter/xfilter/xftabstop.hxx b/lotuswordpro/source/filter/xfilter/xftabstop.hxx
index e2a5208fd40d..25003f9b4db3 100644
--- a/lotuswordpro/source/filter/xfilter/xftabstop.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftabstop.hxx
@@ -66,7 +66,7 @@
 class XFTabStop : public XFContent
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 
 inline void XFTabStop::ToXml(IXFStream *pStrm)
diff --git a/lotuswordpro/source/filter/xfilter/xftabstyle.hxx b/lotuswordpro/source/filter/xfilter/xftabstyle.hxx
index 00ded1e699ce..69b9e6dcf4ae 100644
--- a/lotuswordpro/source/filter/xfilter/xftabstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftabstyle.hxx
@@ -78,7 +78,7 @@ public:
 
     void    SetLeaderChar(sal_Unicode leader);
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 private:
     enumXFTab   m_eType;
diff --git a/lotuswordpro/source/filter/xfilter/xftextboxstyle.hxx b/lotuswordpro/source/filter/xfilter/xftextboxstyle.hxx
index 08005c591412..58c35d9e0e1d 100644
--- a/lotuswordpro/source/filter/xfilter/xftextboxstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftextboxstyle.hxx
@@ -75,9 +75,9 @@ public:
 
 public:
 
-    virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
+    virtual enumXFStyle GetStyleFamily() override;
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 protected:
 };
diff --git a/lotuswordpro/source/filter/xfilter/xftextcontent.hxx b/lotuswordpro/source/filter/xfilter/xftextcontent.hxx
index 319be67a27ef..52663caf36b4 100644
--- a/lotuswordpro/source/filter/xfilter/xftextcontent.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftextcontent.hxx
@@ -81,9 +81,9 @@ public:
      */
     void                SetText(const OUString& text);
 
-    virtual enumXFContent GetContentType() SAL_OVERRIDE;
+    virtual enumXFContent GetContentType() override;
 
-    virtual void        ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void        ToXml(IXFStream *pStrm) override;
 
 private:
     OUString       m_strText;
diff --git a/lotuswordpro/source/filter/xfilter/xftextspan.hxx b/lotuswordpro/source/filter/xfilter/xftextspan.hxx
index 535cd3d4fe74..f69970ddda99 100644
--- a/lotuswordpro/source/filter/xfilter/xftextspan.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftextspan.hxx
@@ -82,8 +82,8 @@ public:
     void            Add(XFContent *pContent);
     void            Add(const OUString& text);
 
-    virtual enumXFContent GetContentType() SAL_OVERRIDE;
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual enumXFContent GetContentType() override;
+    virtual void    ToXml(IXFStream *pStrm) override;
 protected:
     std::vector< rtl::Reference<XFContent> > m_aContents;
 };
@@ -91,12 +91,12 @@ protected:
 class XFTextSpanStart : public XFTextSpan //for adding style of power field
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 class XFTextSpanEnd : public XFTextSpan //for adding style of power field
 {
 public:
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 };
 
 #endif
diff --git a/lotuswordpro/source/filter/xfilter/xftextstyle.hxx b/lotuswordpro/source/filter/xfilter/xftextstyle.hxx
index 30d73e8e8812..361cca9952db 100644
--- a/lotuswordpro/source/filter/xfilter/xftextstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftextstyle.hxx
@@ -86,11 +86,11 @@ public:
 
     rtl::Reference<XFFont> GetFont(){ return m_pFont; }
 
-    virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
+    virtual enumXFStyle GetStyleFamily() override;
 
-    virtual bool        Equal(IXFStyle *pStyle) SAL_OVERRIDE;
+    virtual bool        Equal(IXFStyle *pStyle) override;
 
-    virtual void        ToXml(IXFStream *strm) SAL_OVERRIDE;
+    virtual void        ToXml(IXFStream *strm) override;
 
 private:
     rtl::Reference<XFFont> m_pFont;
diff --git a/lotuswordpro/source/filter/xfilter/xftimestyle.hxx b/lotuswordpro/source/filter/xfilter/xftimestyle.hxx
index 9d7baa0cc806..dfdbac033b3d 100644
--- a/lotuswordpro/source/filter/xfilter/xftimestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftimestyle.hxx
@@ -96,7 +96,7 @@ public:
 public:
     void    SetDecimalPos(sal_Int32 pos);
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
 protected:
     sal_Int32       m_nDecimalPos;
@@ -121,9 +121,9 @@ public:
 
     void    AddText( const OUString& part );
 
-    virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
+    virtual enumXFStyle GetStyleFamily() override;
 
-    virtual void    ToXml(IXFStream *pStrm) SAL_OVERRIDE;
+    virtual void    ToXml(IXFStream *pStrm) override;
 
     void    SetTruncate(bool bTrunc);
author	Stephan Bergmann <sbergman@redhat.com>	2015-10-12 16:04:04 +0200
committer	Stephan Bergmann <sbergman@redhat.com>	2015-10-12 17:52:29 +0200
commit	b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree	33e06dc8d227957cb31355277fb5cf20b9918628 /lotuswordpro/source
parent	b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)