Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code

Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274

70 files changed, 158 insertions, 158 deletions

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);