Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code

Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274

10 files changed, 168 insertions, 168 deletions

diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx
index 1b7fc3bb9025..be811a758300 100644
--- a/rsc/inc/rscarray.hxx
+++ b/rsc/inc/rscarray.hxx
@@ -35,7 +35,7 @@ public:
     RSCINST aInst;
     RscInstNode( sal_uInt32 nId );
     virtual ~RscInstNode();
-    virtual sal_uInt32  GetId() const SAL_OVERRIDE;
+    virtual sal_uInt32  GetId() const override;
     RscInstNode *   Left() const { return static_cast<RscInstNode *>(pLeft); };
     RscInstNode *   Right() const{ return static_cast<RscInstNode *>(pRight); };
     RscInstNode *   Search( sal_uInt32 nId ) const
@@ -62,33 +62,33 @@ public:
                     RscArray( Atom nId, sal_uInt32 nTypId,
                               RscTop * pSuper, RscEnum * pTypeClass );
                     virtual ~RscArray();
-    virtual RSCCLASS_TYPE   GetClassType() const SAL_OVERRIDE;
+    virtual RSCCLASS_TYPE   GetClassType() const override;
 
-    virtual RscTop *    GetTypeClass() const SAL_OVERRIDE;
-    RSCINST         Create( RSCINST * pInst, const RSCINST & rDflt, bool ) SAL_OVERRIDE;
-    void            Destroy( const RSCINST & rInst ) SAL_OVERRIDE;
+    virtual RscTop *    GetTypeClass() const override;
+    RSCINST         Create( RSCINST * pInst, const RSCINST & rDflt, bool ) override;
+    void            Destroy( const RSCINST & rInst ) override;
     virtual ERRTYPE GetValueEle( const RSCINST & rInst, sal_Int32 lValue,
                                  RscTop * pCreateClass,
-                                 RSCINST * pGetInst ) SAL_OVERRIDE;
+                                 RSCINST * pGetInst ) override;
     virtual ERRTYPE GetArrayEle( const RSCINST & rInst, Atom nId,
                                  RscTop * pCreateClass,
-                                 RSCINST * pGetInst ) SAL_OVERRIDE;
+                                 RSCINST * pGetInst ) override;
 
                     // gives the size of the class in bytes
-    sal_uInt32      Size() SAL_OVERRIDE { return nSize; }
+    sal_uInt32      Size() override { return nSize; }
 
-    bool            IsConsistent( const RSCINST & rInst ) SAL_OVERRIDE;
-    virtual void    SetToDefault( const RSCINST & rInst ) SAL_OVERRIDE;
-    bool            IsDefault( const RSCINST & rInst ) SAL_OVERRIDE;
-    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) SAL_OVERRIDE;
+    bool            IsConsistent( const RSCINST & rInst ) override;
+    virtual void    SetToDefault( const RSCINST & rInst ) override;
+    bool            IsDefault( const RSCINST & rInst ) override;
+    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override;
 
     virtual void    WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
                                     RscTypCont * pTC, sal_uInt32 nTab,
-                                    const RscId & aId, const char * ) SAL_OVERRIDE;
+                                    const RscId & aId, const char * ) override;
     void            WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE;
+                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
     ERRTYPE         WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
-                             RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE;
+                             RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
 };
 
 class RscClassArray : public RscArray
@@ -99,12 +99,12 @@ public:
                     virtual ~RscClassArray();
     virtual void    WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
                                     RscTypCont * pTC, sal_uInt32 nTab,
-                                    const RscId & aId, const char * ) SAL_OVERRIDE;
+                                    const RscId & aId, const char * ) override;
     void            WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE;
+                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
     virtual ERRTYPE WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem,
                                    RscTypCont * pTC, const RscId & aId,
-                                   sal_uInt32 nDeep, bool bExtra ) SAL_OVERRIDE;
+                                   sal_uInt32 nDeep, bool bExtra ) override;
 };
 
 
@@ -113,7 +113,7 @@ class RscLangArray : public RscArray
 public:
                     RscLangArray( Atom nId, sal_uInt32 nTypId,
                                   RscTop * pSuper, RscEnum * pTypeClass );
-    virtual RSCCLASS_TYPE   GetClassType() const SAL_OVERRIDE;
+    virtual RSCCLASS_TYPE   GetClassType() const override;
 };
 
 #endif // INCLUDED_RSC_INC_RSCARRAY_HXX
diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx
index e4d3523c31f1..fb240d073931 100644
--- a/rsc/inc/rscclass.hxx
+++ b/rsc/inc/rscclass.hxx
@@ -59,39 +59,39 @@ public:
                     RscClass( Atom nId, sal_uInt32 nTypId, RscTop * pSuperCl );
                     virtual ~RscClass();
 
-    virtual RSCCLASS_TYPE   GetClassType() const SAL_OVERRIDE;
+    virtual RSCCLASS_TYPE   GetClassType() const override;
 
-    void            Pre_dtor() SAL_OVERRIDE;
+    void            Pre_dtor() override;
     ERRTYPE         SetVariable( Atom nVarName, RscTop * pClass,
                                  RSCINST * pDflt,
                                  RSCVAR nVarType, sal_uInt32 nMask,
-                                 Atom nDataBaseName ) SAL_OVERRIDE;
-    virtual void    EnumVariables( void * pData, VarEnumCallbackProc ) SAL_OVERRIDE;
+                                 Atom nDataBaseName ) override;
+    virtual void    EnumVariables( void * pData, VarEnumCallbackProc ) override;
     RSCINST         GetVariable( const RSCINST & rInst, Atom nVarName,
                                  const RSCINST & rInitInst,
                                  bool bInitDflt = false,
-                                 RscTop * pCreateClass = NULL ) SAL_OVERRIDE;
-    RSCINST         GetCopyVar( const RSCINST & rInst, Atom nVarName ) SAL_OVERRIDE;
+                                 RscTop * pCreateClass = NULL ) override;
+    RSCINST         GetCopyVar( const RSCINST & rInst, Atom nVarName ) override;
 
                     // gives the class size in bytes
-    sal_uInt32      Size() SAL_OVERRIDE { return nSize; }
+    sal_uInt32      Size() override { return nSize; }
 
-    bool            IsConsistent( const RSCINST & rInst ) SAL_OVERRIDE;
-    void            SetToDefault( const RSCINST & rInst ) SAL_OVERRIDE;
-    bool            IsDefault( const RSCINST & rInst ) SAL_OVERRIDE;
-    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) SAL_OVERRIDE;
-    void            SetDefault( const RSCINST & rData, Atom nVarId ) SAL_OVERRIDE;
+    bool            IsConsistent( const RSCINST & rInst ) override;
+    void            SetToDefault( const RSCINST & rInst ) override;
+    bool            IsDefault( const RSCINST & rInst ) override;
+    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override;
+    void            SetDefault( const RSCINST & rData, Atom nVarId ) override;
     using RscTop::GetDefault;
-    RSCINST         GetDefault( Atom nVarId ) SAL_OVERRIDE;
+    RSCINST         GetDefault( Atom nVarId ) override;
 
-    RSCINST         Create( RSCINST * pInst, const RSCINST & rDflt, bool ) SAL_OVERRIDE;
-    void            Destroy( const RSCINST & rInst ) SAL_OVERRIDE;
+    RSCINST         Create( RSCINST * pInst, const RSCINST & rDflt, bool ) override;
+    void            Destroy( const RSCINST & rInst ) override;
     void            WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE;
+                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
     ERRTYPE         WriteInstRc( const RSCINST & rInst, RscWriteRc & aMem,
                                  RscTypCont * pTC, sal_uInt32, bool bExtra );
     ERRTYPE         WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
-                             RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE;
+                             RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
 };
 
 class RscSysDepend : public RscClass
@@ -102,7 +102,7 @@ public:
                                       RscTypCont * pTC, sal_uInt32, bool bExtra,
                                       bool bFirst = false );
     ERRTYPE         WriteRc( const RSCINST &, RscWriteRc & aMem,
-                             RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE;
+                             RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
 };
 
 class RscTupel : public RscClass
@@ -110,9 +110,9 @@ class RscTupel : public RscClass
 public:
     RscTupel( Atom nId, sal_uInt32 nTypId, RscTop * pSuper );
     RSCINST         GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos,
-                                 const RSCINST & rInitInst ) SAL_OVERRIDE;
+                                 const RSCINST & rInitInst ) override;
     void            WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE;
+                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
 };
 
 #endif // INCLUDED_RSC_INC_RSCCLASS_HXX
diff --git a/rsc/inc/rscclobj.hxx b/rsc/inc/rscclobj.hxx
index 2509e579d671..d7222a6d7e01 100644
--- a/rsc/inc/rscclobj.hxx
+++ b/rsc/inc/rscclobj.hxx
@@ -37,7 +37,7 @@ public:
 
                 ObjNode( const RscId & rId, CLASS_DATA pData, sal_uLong lKey );
     ObjNode *   DelObjNode( RscTop * pClass, sal_uLong lFileKey );
-    sal_uInt32  GetId() const SAL_OVERRIDE;
+    sal_uInt32  GetId() const override;
     RscId       GetRscId() const { return aRscId; }
     sal_uLong   GetFileKey() const { return lFileKey; };
     ObjNode*    Search( const RscId &rName ) const //< search the index in the b-tree
@@ -69,7 +69,7 @@ public:
 
     ObjNode*    pObjBiTree; // Zeiger auf Objektbaum
                 RefNode( Atom nTyp );
-    sal_uInt32  GetId() const SAL_OVERRIDE;
+    sal_uInt32  GetId() const override;
     bool        Insert( RefNode* pTN ) //< insert a new node in the b-tree
                     {
                         return IdNode::Insert( static_cast<IdNode *>(pTN) );
diff --git a/rsc/inc/rscconst.hxx b/rsc/inc/rscconst.hxx
index 201d3f2037a5..df2b16ff56d5 100644
--- a/rsc/inc/rscconst.hxx
+++ b/rsc/inc/rscconst.hxx
@@ -37,7 +37,7 @@ protected:
 public:
                     RscConst( Atom nId, sal_uInt32 nTypId );
                     virtual ~RscConst();
-    virtual RSCCLASS_TYPE   GetClassType() const SAL_OVERRIDE;
+    virtual RSCCLASS_TYPE   GetClassType() const override;
                     // sets the allowed values
     ERRTYPE         SetConstant( Atom nVarName, sal_Int32 lValue );
     bool            GetConstValue( Atom nConstId, sal_Int32 * pVal ) const;
@@ -55,29 +55,29 @@ class RscEnum : public RscConst
     sal_uInt32      nSize;
 public:
                     RscEnum( Atom nId, sal_uInt32 nTypId );
-    RSCINST         Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) SAL_OVERRIDE;
-    sal_uInt32      Size() SAL_OVERRIDE { return nSize; }
+    RSCINST         Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) override;
+    sal_uInt32      Size() override { return nSize; }
 
-    virtual void    SetToDefault( const RSCINST & rInst ) SAL_OVERRIDE
+    virtual void    SetToDefault( const RSCINST & rInst ) override
                     {
                         reinterpret_cast<RscEnumInst*>(rInst.pData)->bDflt = true;
                     }
-    bool            IsDefault( const RSCINST & rInst ) SAL_OVERRIDE
+    bool            IsDefault( const RSCINST & rInst ) override
                     {
                         return reinterpret_cast<RscEnumInst*>(rInst.pData)->bDflt;
                     };
                     // sets as default
-    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) SAL_OVERRIDE;
+    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override;
 
     ERRTYPE         SetConst( const RSCINST & rInst, Atom nValueId,
-                              sal_Int32 nValue ) SAL_OVERRIDE;
-    ERRTYPE         SetNumber( const RSCINST & rInst, sal_Int32 nValue ) SAL_OVERRIDE;
-    ERRTYPE         GetConst( const RSCINST & rInst, Atom * ) SAL_OVERRIDE;
-    ERRTYPE         GetNumber( const RSCINST & rInst, sal_Int32 * nValue ) SAL_OVERRIDE;
+                              sal_Int32 nValue ) override;
+    ERRTYPE         SetNumber( const RSCINST & rInst, sal_Int32 nValue ) override;
+    ERRTYPE         GetConst( const RSCINST & rInst, Atom * ) override;
+    ERRTYPE         GetNumber( const RSCINST & rInst, sal_Int32 * nValue ) override;
     void            WriteSrc( const RSCINST &rInst, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE;
+                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
     ERRTYPE         WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
-                             RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE;
+                             RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
 };
 
 class RscNameTable;
diff --git a/rsc/inc/rsccont.hxx b/rsc/inc/rsccont.hxx
index dd0830f116a7..e6095c36f9a6 100644
--- a/rsc/inc/rsccont.hxx
+++ b/rsc/inc/rsccont.hxx
@@ -58,49 +58,49 @@ public:
                                  RscTop * pSuper = NULL,
                                  bool bNoId = true );
                     virtual ~RscBaseCont();
-    virtual RSCCLASS_TYPE   GetClassType() const SAL_OVERRIDE;
+    virtual RSCCLASS_TYPE   GetClassType() const override;
     void            SetTypeClass( RscTop * pClass, RscTop * pClass1 = NULL )
                         {
                             pTypeClass = pClass;
                             pTypeClass1 = pClass1;
                         }
-    RSCINST         Create( RSCINST * pInst, const RSCINST & rDflt, bool ) SAL_OVERRIDE;
-    void            Destroy( const RSCINST & rInst ) SAL_OVERRIDE;
+    RSCINST         Create( RSCINST * pInst, const RSCINST & rDflt, bool ) override;
+    void            Destroy( const RSCINST & rInst ) override;
     ERRTYPE         GetElement( const RSCINST & rInst, const RscId & rEleName,
                                 RscTop * pCreateClass, const RSCINST & rCreateInst,
-                                RSCINST * pGetInst ) SAL_OVERRIDE;
+                                RSCINST * pGetInst ) override;
     RSCINST         SearchEle( const RSCINST & rInst, const RscId & rEleName,
-                               RscTop * pClass ) SAL_OVERRIDE;
-    sal_uInt32          GetCount( const RSCINST & rInst ) SAL_OVERRIDE;
-    RSCINST         GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ) SAL_OVERRIDE;
+                               RscTop * pClass ) override;
+    sal_uInt32          GetCount( const RSCINST & rInst ) override;
+    RSCINST         GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ) override;
     ERRTYPE         MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos,
-                                sal_uInt32 nSourcePos ) SAL_OVERRIDE;
+                                sal_uInt32 nSourcePos ) override;
     virtual ERRTYPE SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos,
-                                 const RscId & rRscId) SAL_OVERRIDE;
-    SUBINFO_STRUCT  GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ) SAL_OVERRIDE;
-    ERRTYPE         SetString( const RSCINST &, const char * pStr ) SAL_OVERRIDE;
-    ERRTYPE         SetNumber( const RSCINST &, sal_Int32 lValue ) SAL_OVERRIDE;
-    ERRTYPE         SetBool( const RSCINST & rInst, bool bValue ) SAL_OVERRIDE;
+                                 const RscId & rRscId) override;
+    SUBINFO_STRUCT  GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ) override;
+    ERRTYPE         SetString( const RSCINST &, const char * pStr ) override;
+    ERRTYPE         SetNumber( const RSCINST &, sal_Int32 lValue ) override;
+    ERRTYPE         SetBool( const RSCINST & rInst, bool bValue ) override;
     ERRTYPE         SetConst( const RSCINST & rInst, Atom nValueId,
-                              sal_Int32 nValue ) SAL_OVERRIDE;
-    ERRTYPE         SetRef( const RSCINST & rInst, const RscId & rRefId ) SAL_OVERRIDE;
+                              sal_Int32 nValue ) override;
+    ERRTYPE         SetRef( const RSCINST & rInst, const RscId & rRefId ) override;
 
                     // returns the class size in bytes
-    sal_uInt32      Size() SAL_OVERRIDE { return nSize; }
+    sal_uInt32      Size() override { return nSize; }
 
-    bool            IsConsistent( const RSCINST & rInst ) SAL_OVERRIDE;
-    void            SetToDefault( const RSCINST & rInst ) SAL_OVERRIDE;
-    bool            IsDefault( const RSCINST & rInst ) SAL_OVERRIDE;
-    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) SAL_OVERRIDE;
+    bool            IsConsistent( const RSCINST & rInst ) override;
+    void            SetToDefault( const RSCINST & rInst ) override;
+    bool            IsDefault( const RSCINST & rInst ) override;
+    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override;
 
     void            Delete( const RSCINST & rInst, RscTop * pClass,
-                            const RscId & rId ) SAL_OVERRIDE;
-    void            DeletePos( const RSCINST & rInst, sal_uInt32 nPos ) SAL_OVERRIDE;
+                            const RscId & rId ) override;
+    void            DeletePos( const RSCINST & rInst, sal_uInt32 nPos ) override;
 
     void            WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE;
+                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
     ERRTYPE         WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
-                             RscTypCont * pTC, sal_uInt32 , bool bExtra) SAL_OVERRIDE;
+                             RscTypCont * pTC, sal_uInt32 , bool bExtra) override;
 };
 
 class RscContWriteSrc : public RscBaseCont
@@ -110,7 +110,7 @@ public:
                                      RscTop * pSuper = NULL,
                                      bool bNoId = true );
     void            WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE;
+                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
 };
 
 class RscCont : public RscContWriteSrc
@@ -120,7 +120,7 @@ public:
                              RscTop * pSuper = NULL,
                              bool bNoId = true );
     ERRTYPE         WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
-                             RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE;
+                             RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
 };
 
 class RscContExtraData : public RscContWriteSrc
@@ -130,7 +130,7 @@ public:
                                       RscTop * pSuper = NULL,
                                       bool bNoId = true );
     ERRTYPE         WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
-                             RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE;
+                             RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
 };
 
 #endif // INCLUDED_RSC_INC_RSCCONT_HXX
diff --git a/rsc/inc/rscflag.hxx b/rsc/inc/rscflag.hxx
index 8d48d06d7d3a..26fe709f8925 100644
--- a/rsc/inc/rscflag.hxx
+++ b/rsc/inc/rscflag.hxx
@@ -35,30 +35,30 @@ class RscFlag : public RscConst
     RSCINST         CreateBasic( RSCINST * pInst );
 public:
                     RscFlag( Atom nId, sal_uInt32 nTypId );
-    RSCINST         Create( RSCINST * pInst, const RSCINST & rDflt, bool ) SAL_OVERRIDE;
+    RSCINST         Create( RSCINST * pInst, const RSCINST & rDflt, bool ) override;
     RSCINST         CreateClient( RSCINST * pInst, const RSCINST & rDflt,
                                   bool bOwnClass, Atom nConsId );
-    sal_uInt32      Size() SAL_OVERRIDE;
+    sal_uInt32      Size() override;
 
-    virtual void    SetToDefault( const RSCINST & rInst ) SAL_OVERRIDE;
-    bool            IsDefault( const RSCINST & rInst ) SAL_OVERRIDE;
+    virtual void    SetToDefault( const RSCINST & rInst ) override;
+    bool            IsDefault( const RSCINST & rInst ) override;
     bool            IsDefault( const RSCINST & rInst, Atom nConstId );
 
                     // whether the flag is set
     bool            IsSet( const RSCINST & rInst, Atom nConstId );
 
                     // sets as default
-    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) SAL_OVERRIDE;
+    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override;
     bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef,
                                     Atom nConstId );
 
     ERRTYPE         SetConst( const RSCINST & rInst, Atom nValueId,
-                              sal_Int32 nValue ) SAL_OVERRIDE;
-    ERRTYPE         SetNotConst( const RSCINST & rInst, Atom nConstId ) SAL_OVERRIDE;
+                              sal_Int32 nValue ) override;
+    ERRTYPE         SetNotConst( const RSCINST & rInst, Atom nConstId ) override;
     void            WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE;
+                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
     ERRTYPE         WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
-                             RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE;
+                             RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
 };
 
 /******************* R s c C l i e n t ***********************************/
@@ -69,34 +69,34 @@ class RscClient : public RscTop
 public:
                     RscClient( Atom nId, sal_uInt32 nTypId, RscFlag * pClass,
                                Atom nConstantId );
-    virtual RSCCLASS_TYPE   GetClassType() const SAL_OVERRIDE;
-    RSCINST         Create( RSCINST * pInst, const RSCINST & rDflt, bool ) SAL_OVERRIDE;
-    sal_uInt32      Size() SAL_OVERRIDE { return pRefClass->Size(); }
+    virtual RSCCLASS_TYPE   GetClassType() const override;
+    RSCINST         Create( RSCINST * pInst, const RSCINST & rDflt, bool ) override;
+    sal_uInt32      Size() override { return pRefClass->Size(); }
 
                     // an assignment to a variable
-    bool            IsDefault( const RSCINST & rInst ) SAL_OVERRIDE {
+    bool            IsDefault( const RSCINST & rInst ) override {
                         return pRefClass->IsDefault( rInst, nConstId );
                     };
                     // sets as default
-    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) SAL_OVERRIDE
+    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override
                         {
                             return pRefClass->IsValueDefault( rInst,
                                                               pDef, nConstId );
                         }
-    ERRTYPE         SetBool( const RSCINST & rInst, bool bValue ) SAL_OVERRIDE
+    ERRTYPE         SetBool( const RSCINST & rInst, bool bValue ) override
                         {
                             if( bValue )
                                 return pRefClass->SetConst( rInst, nConstId, sal_Int32(bValue) );
                             else
                                 return pRefClass->SetNotConst( rInst, nConstId );
                         }
-    ERRTYPE         GetBool( const RSCINST & rInst, bool * pB ) SAL_OVERRIDE
+    ERRTYPE         GetBool( const RSCINST & rInst, bool * pB ) override
                         {
                             *pB = pRefClass->IsSet( rInst, nConstId );
                             return ERR_OK;
                         }
     void            WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE;
+                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
 };
 
 #endif // INCLUDED_RSC_INC_RSCFLAG_HXX
diff --git a/rsc/inc/rscmgr.hxx b/rsc/inc/rscmgr.hxx
index 48f09becf533..2a99492314e2 100644
--- a/rsc/inc/rscmgr.hxx
+++ b/rsc/inc/rscmgr.hxx
@@ -39,27 +39,27 @@ class RscMgr : public RscClass
 public:
                     RscMgr( Atom nId, sal_uInt32 nTypId, RscTop * pSuperCl );
 
-    void            SetToDefault( const RSCINST & rInst ) SAL_OVERRIDE;
-    bool            IsDefault( const RSCINST & rInst ) SAL_OVERRIDE;
-    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) SAL_OVERRIDE;
+    void            SetToDefault( const RSCINST & rInst ) override;
+    bool            IsDefault( const RSCINST & rInst ) override;
+    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override;
 
-    RSCINST         Create( RSCINST * pInst, const RSCINST & rDflt, bool ) SAL_OVERRIDE;
-    void            Destroy( const RSCINST & rInst ) SAL_OVERRIDE;
-    sal_uInt32      Size() SAL_OVERRIDE;
+    RSCINST         Create( RSCINST * pInst, const RSCINST & rDflt, bool ) override;
+    void            Destroy( const RSCINST & rInst ) override;
+    sal_uInt32      Size() override;
     void            WriteSrcHeader( const RSCINST & aInst, FILE * fOutput,
                                     RscTypCont * pTC, sal_uInt32 nTab,
-                                    const RscId & rId, const char * ) SAL_OVERRIDE;
+                                    const RscId & rId, const char * ) override;
 
     void            WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE;
+                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
     ERRTYPE         WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem,
                                    RscTypCont * pTC, const RscId & rId,
-                                   sal_uInt32, bool bExtra ) SAL_OVERRIDE;
+                                   sal_uInt32, bool bExtra ) override;
     ERRTYPE         WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
-                             RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE;
-    bool            IsConsistent( const RSCINST & rInst ) SAL_OVERRIDE;
-    ERRTYPE         GetRef( const RSCINST & rInst, RscId * ) SAL_OVERRIDE;
-    ERRTYPE         SetRef( const RSCINST & rInst, const RscId & rRefId ) SAL_OVERRIDE;
+                             RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
+    bool            IsConsistent( const RSCINST & rInst ) override;
+    ERRTYPE         GetRef( const RSCINST & rInst, RscId * ) override;
+    ERRTYPE         SetRef( const RSCINST & rInst, const RscId & rRefId ) override;
 };
 
 #endif // INCLUDED_RSC_INC_RSCMGR_HXX
diff --git a/rsc/inc/rscrange.hxx b/rsc/inc/rscrange.hxx
index e34533beef68..360edaa63b87 100644
--- a/rsc/inc/rscrange.hxx
+++ b/rsc/inc/rscrange.hxx
@@ -37,29 +37,29 @@ protected:
     sal_uInt32      nSize;
 public:
                     RscRange( Atom nId, sal_uInt32 nTypId );
-    virtual RSCCLASS_TYPE   GetClassType() const SAL_OVERRIDE;
-    RSCINST         Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) SAL_OVERRIDE;
+    virtual RSCCLASS_TYPE   GetClassType() const override;
+    RSCINST         Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) override;
                     // sets the allowed range
     ERRTYPE         SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum );
                     // returns the class size in bytes
-    sal_uInt32      Size() SAL_OVERRIDE { return nSize; }
+    sal_uInt32      Size() override { return nSize; }
                     // an assignment to a variable
-    virtual void    SetToDefault( const RSCINST & rInst ) SAL_OVERRIDE
+    virtual void    SetToDefault( const RSCINST & rInst ) override
                         {
                             reinterpret_cast<RscRangeInst*>(rInst.pData)->bDflt = true;
                         }
-    bool            IsDefault( const RSCINST & rInst) SAL_OVERRIDE
+    bool            IsDefault( const RSCINST & rInst) override
                         {
                             return reinterpret_cast<RscRangeInst*>(rInst.pData)->bDflt;
                         };
                     // sets as default
-    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) SAL_OVERRIDE;
-    ERRTYPE         SetNumber( const RSCINST &, sal_Int32 ) SAL_OVERRIDE;
-    ERRTYPE         GetNumber( const RSCINST &, sal_Int32 * ) SAL_OVERRIDE;
+    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override;
+    ERRTYPE         SetNumber( const RSCINST &, sal_Int32 ) override;
+    ERRTYPE         GetNumber( const RSCINST &, sal_Int32 * ) override;
     void            WriteSrc( const RSCINST &, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE;
+                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
     ERRTYPE         WriteRc( const RSCINST &, RscWriteRc & aMem,
-                             RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE;
+                             RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
 };
 
 class RscLongRange : public RscTop
@@ -75,29 +75,29 @@ protected:
     sal_uInt32  nSize;
 public:
                     RscLongRange( Atom nId, sal_uInt32 nTypId );
-    virtual RSCCLASS_TYPE   GetClassType() const SAL_OVERRIDE;
-    RSCINST         Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) SAL_OVERRIDE;
+    virtual RSCCLASS_TYPE   GetClassType() const override;
+    RSCINST         Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) override;
                     // sets the allowed range
     ERRTYPE         SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum );
                     // returns the class size in bytes
-    sal_uInt32      Size() SAL_OVERRIDE { return nSize; }
+    sal_uInt32      Size() override { return nSize; }
                     // an assignment to a variable
-    virtual void    SetToDefault( const RSCINST & rInst ) SAL_OVERRIDE
+    virtual void    SetToDefault( const RSCINST & rInst ) override
                         {
                             reinterpret_cast<RscLongRangeInst*>(rInst.pData)->bDflt = true;
                         }
-    bool            IsDefault( const RSCINST & rInst) SAL_OVERRIDE
+    bool            IsDefault( const RSCINST & rInst) override
                         {
                             return reinterpret_cast<RscLongRangeInst*>(rInst.pData)->bDflt;
                         };
                     // sets as default
-    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) SAL_OVERRIDE;
-    ERRTYPE         SetNumber( const RSCINST &, sal_Int32 ) SAL_OVERRIDE;
-    ERRTYPE         GetNumber( const RSCINST &, sal_Int32 * ) SAL_OVERRIDE;
+    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override;
+    ERRTYPE         SetNumber( const RSCINST &, sal_Int32 ) override;
+    ERRTYPE         GetNumber( const RSCINST &, sal_Int32 * ) override;
     void            WriteSrc( const RSCINST &, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE;
+                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
     ERRTYPE         WriteRc( const RSCINST &, RscWriteRc & aMem,
-                             RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE;
+                             RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
 
 };
 
@@ -107,7 +107,7 @@ public:
                     RscLongEnumRange( Atom nId, sal_uInt32 nTypId );
 
     ERRTYPE         SetConst( const RSCINST & rInst, Atom nValueId,
-                              sal_Int32 nValue ) SAL_OVERRIDE;
+                              sal_Int32 nValue ) override;
 };
 
 class RscIdRange : public RscTop
@@ -118,7 +118,7 @@ protected:
     sal_Int32    nMax;   // range maximum value
 public:
                     RscIdRange( Atom nId, sal_uInt32 nTypId );
-    virtual RSCCLASS_TYPE   GetClassType() const SAL_OVERRIDE;
+    virtual RSCCLASS_TYPE   GetClassType() const override;
                     // sets the allowed range
     ERRTYPE         SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum )
                         {
@@ -126,41 +126,41 @@ public:
                             nMax = nMaximum;
                             return ERR_OK;
                         }
-    RSCINST         Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) SAL_OVERRIDE;
-    void            Destroy( const RSCINST & rInst ) SAL_OVERRIDE;
-    sal_uInt32          Size() SAL_OVERRIDE { return nSize; }
-    virtual void    SetToDefault( const RSCINST & rInst ) SAL_OVERRIDE
+    RSCINST         Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) override;
+    void            Destroy( const RSCINST & rInst ) override;
+    sal_uInt32          Size() override { return nSize; }
+    virtual void    SetToDefault( const RSCINST & rInst ) override
                         {
                             reinterpret_cast<RscId*>(rInst.pData)->aExp.cUnused = true;
                         }
-    bool            IsDefault( const RSCINST & rInst) SAL_OVERRIDE
+    bool            IsDefault( const RSCINST & rInst) override
                         {
                             //cUnused is used as default identifier
                             return reinterpret_cast<RscId*>(rInst.pData)->aExp.cUnused;
                         }
                     // sets as default
-    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) SAL_OVERRIDE;
-    ERRTYPE         SetNumber( const RSCINST &, sal_Int32 ) SAL_OVERRIDE;
-    ERRTYPE         GetNumber( const RSCINST &, sal_Int32 * ) SAL_OVERRIDE;
-    ERRTYPE         SetRef( const RSCINST &, const RscId & rRscId ) SAL_OVERRIDE;
-    ERRTYPE         GetRef( const RSCINST & rInst, RscId * ) SAL_OVERRIDE;
+    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override;
+    ERRTYPE         SetNumber( const RSCINST &, sal_Int32 ) override;
+    ERRTYPE         GetNumber( const RSCINST &, sal_Int32 * ) override;
+    ERRTYPE         SetRef( const RSCINST &, const RscId & rRscId ) override;
+    ERRTYPE         GetRef( const RSCINST & rInst, RscId * ) override;
     void            WriteSrc( const RSCINST &, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE;
+                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
     ERRTYPE         WriteRc( const RSCINST &, RscWriteRc & aMem,
-                             RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE;
-    bool            IsConsistent( const RSCINST & rInst ) SAL_OVERRIDE;
+                             RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
+    bool            IsConsistent( const RSCINST & rInst ) override;
 };
 
 class RscBool : public RscRange
 {
 public:
                     RscBool( Atom nId, sal_uInt32 nTypId );
-    virtual RSCCLASS_TYPE   GetClassType() const SAL_OVERRIDE;
-    ERRTYPE         SetBool( const RSCINST & rInst, bool b ) SAL_OVERRIDE
+    virtual RSCCLASS_TYPE   GetClassType() const override;
+    ERRTYPE         SetBool( const RSCINST & rInst, bool b ) override
                         {
                             return SetNumber( rInst, (sal_Int32)b );
                         };
-    ERRTYPE         GetBool( const RSCINST & rInst, bool * pB) SAL_OVERRIDE
+    ERRTYPE         GetBool( const RSCINST & rInst, bool * pB) override
                         {
                             sal_Int32 l;
                             GetNumber( rInst, &l );
@@ -168,7 +168,7 @@ public:
                             return ERR_OK;
                         };
     void            WriteSrc( const RSCINST &, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE;
+                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
 };
 
 class RscBreakRange : public RscRange
@@ -177,8 +177,8 @@ class RscBreakRange : public RscRange
 public:
                     RscBreakRange( Atom nId, sal_uInt32 nTypId );
     void            SetOutRange( sal_Int32 nNumber ) { nOutRange = nNumber; }
-    RSCINST         Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) SAL_OVERRIDE;
-    ERRTYPE         SetNumber( const RSCINST &, sal_Int32 ) SAL_OVERRIDE;
+    RSCINST         Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) override;
+    ERRTYPE         SetNumber( const RSCINST &, sal_Int32 ) override;
 };
 
 #endif // INCLUDED_RSC_INC_RSCRANGE_HXX
diff --git a/rsc/inc/rscstr.hxx b/rsc/inc/rscstr.hxx
index 32440238fda0..280477cee5f9 100644
--- a/rsc/inc/rscstr.hxx
+++ b/rsc/inc/rscstr.hxx
@@ -36,31 +36,31 @@ class RscString : public RscTop
     sal_uInt32  nSize;
 public:
                     RscString( Atom nId, sal_uInt32 nTypId );
-    virtual RSCCLASS_TYPE   GetClassType() const SAL_OVERRIDE;
+    virtual RSCCLASS_TYPE   GetClassType() const override;
 
     void            SetRefClass( RscTop * pClass ) { pRefClass = pClass; }
-    RSCINST         Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) SAL_OVERRIDE;
+    RSCINST         Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) override;
                     // sets the allowed range
-    void            Destroy( const RSCINST & rInst ) SAL_OVERRIDE;
-    sal_uInt32      Size() SAL_OVERRIDE { return nSize; }
-    void            SetToDefault( const RSCINST & rInst ) SAL_OVERRIDE
+    void            Destroy( const RSCINST & rInst ) override;
+    sal_uInt32      Size() override { return nSize; }
+    void            SetToDefault( const RSCINST & rInst ) override
                         {
                             reinterpret_cast<RscStringInst*>(rInst.pData)->bDflt = true;
                         }
-    bool            IsDefault( const RSCINST & rInst) SAL_OVERRIDE
+    bool            IsDefault( const RSCINST & rInst) override
                         {
                             return reinterpret_cast<RscStringInst*>(rInst.pData)->bDflt;
                         }
                     // sets as default
-    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) SAL_OVERRIDE;
-    ERRTYPE         SetString( const RSCINST &, const char * pStr ) SAL_OVERRIDE;
-    ERRTYPE         GetString( const RSCINST &, char ** ppStr ) SAL_OVERRIDE;
-    ERRTYPE         GetRef( const RSCINST & rInst, RscId * ) SAL_OVERRIDE;
-    ERRTYPE         SetRef( const RSCINST & rInst, const RscId & rRefId ) SAL_OVERRIDE;
+    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override;
+    ERRTYPE         SetString( const RSCINST &, const char * pStr ) override;
+    ERRTYPE         GetString( const RSCINST &, char ** ppStr ) override;
+    ERRTYPE         GetRef( const RSCINST & rInst, RscId * ) override;
+    ERRTYPE         SetRef( const RSCINST & rInst, const RscId & rRefId ) override;
     void            WriteSrc( const RSCINST &, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE;
+                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
     ERRTYPE         WriteRc( const RSCINST &, RscWriteRc & aMem,
-                             RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE;
+                             RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
 };
 
 #endif // INCLUDED_RSC_INC_RSCSTR_HXX
diff --git a/rsc/inc/rsctree.hxx b/rsc/inc/rsctree.hxx
index 209c4225d80c..2fbd36575583 100644
--- a/rsc/inc/rsctree.hxx
+++ b/rsc/inc/rsctree.hxx
@@ -60,8 +60,8 @@ public:
 
 class IdNode : public NameNode
 {
-    virtual COMPARE Compare( const NameNode * ) const SAL_OVERRIDE;
-    virtual COMPARE Compare( const void * ) const SAL_OVERRIDE;
+    virtual COMPARE Compare( const NameNode * ) const override;
+    virtual COMPARE Compare( const void * ) const override;
 protected:
     using NameNode::Search;
 
@@ -73,8 +73,8 @@ public:
 
 class StringNode : public NameNode
 {
-    virtual COMPARE Compare( const NameNode * ) const SAL_OVERRIDE;
-    virtual COMPARE Compare( const void * ) const SAL_OVERRIDE;
+    virtual COMPARE Compare( const NameNode * ) const override;
+    virtual COMPARE Compare( const void * ) const override;
 
 protected:
     using NameNode::Search;