Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code

Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274

1 files changed, 44 insertions, 44 deletions

diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index 690beef2e4c9..3aa70cca7fd8 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -40,8 +40,8 @@ public:
     SwDBFieldType(SwDoc* pDocPtr, const OUString& rColumnName, const SwDBData& rDBData);
     virtual ~SwDBFieldType();
 
-    virtual OUString GetName() const SAL_OVERRIDE;
-    virtual SwFieldType*  Copy() const SAL_OVERRIDE;
+    virtual OUString GetName() const override;
+    virtual SwFieldType*  Copy() const override;
 
     inline void     AddRef() { nRefCnt++; }
     void            ReleaseRef();
@@ -49,8 +49,8 @@ public:
     OUString        GetColumnName() const {return sColumn;}
     const SwDBData& GetDBData() const {return aDBData;}
 
-    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
-    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
 };
 
 // Classes derived from SwFields. They overlay the expand-function.
@@ -64,22 +64,22 @@ class SW_DLLPUBLIC SwDBField : public SwValueField
     bool    bValidValue     : 1;
     bool    bInitialized    : 1;
 
-    virtual OUString    Expand() const SAL_OVERRIDE;
-    virtual SwField*    Copy() const SAL_OVERRIDE;
+    virtual OUString    Expand() const override;
+    virtual SwField*    Copy() const override;
 
 public:
     SwDBField(SwDBFieldType*, sal_uLong nFormat = 0);
     virtual ~SwDBField();
 
-    virtual SwFieldType*    ChgTyp( SwFieldType* ) SAL_OVERRIDE;
+    virtual SwFieldType*    ChgTyp( SwFieldType* ) override;
 
     /// Current text.
     inline  void        SetExpansion(const OUString& rStr);
 
-    virtual sal_uInt16      GetSubType() const SAL_OVERRIDE;
-    virtual void        SetSubType(sal_uInt16 nType) SAL_OVERRIDE;
+    virtual sal_uInt16      GetSubType() const override;
+    virtual void        SetSubType(sal_uInt16 nType) override;
 
-    virtual OUString    GetFieldName() const SAL_OVERRIDE;
+    virtual OUString    GetFieldName() const override;
 
     /// For calculations in expressions.
     void                ChgValue( double d, bool bVal );
@@ -98,15 +98,15 @@ public:
     inline void         SetInitialized()        { bInitialized = true; }
 
     /// Get name.
-    virtual OUString    GetPar1() const SAL_OVERRIDE;
+    virtual OUString    GetPar1() const override;
 
     /// access to the command string
     void                SetFieldCode(const OUString& rStr) { sFieldCode = rStr; }
 
     /// DBName
     inline const SwDBData&  GetDBData() const { return static_cast<SwDBFieldType*>(GetTyp())->GetDBData(); }
-    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
-    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
 
     static bool FormatValue( SvNumberFormatter* pDocFormatter, OUString &aString, sal_uInt32 nFormat,
                              double &aNumber, sal_Int32 nColumnType, SwDBField *pField = NULL );
@@ -139,12 +139,12 @@ public:
     SwDBData                GetDBData(SwDoc* pDoc);
     void                    SetDBData(const SwDBData& rDBData);
 
-    virtual OUString        GetFieldName() const SAL_OVERRIDE;
+    virtual OUString        GetFieldName() const override;
 
-    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
-    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
-    virtual sal_uInt16      GetSubType() const SAL_OVERRIDE;
-    virtual void            SetSubType(sal_uInt16 nType) SAL_OVERRIDE;
+    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
+    virtual sal_uInt16      GetSubType() const override;
+    virtual void            SetSubType(sal_uInt16 nType) override;
 };
 
 // Database field next record.
@@ -153,7 +153,7 @@ class SW_DLLPUBLIC SwDBNextSetFieldType : public SwFieldType
 public:
     SwDBNextSetFieldType();
 
-    virtual SwFieldType*    Copy() const SAL_OVERRIDE;
+    virtual SwFieldType*    Copy() const override;
 };
 
 // Next data record with condition.
@@ -166,18 +166,18 @@ public:
     SwDBNextSetField( SwDBNextSetFieldType*,
                       const OUString& rCond, const OUString& rDummy, const SwDBData& rDBData);
 
-    virtual OUString        Expand() const SAL_OVERRIDE;
-    virtual SwField*        Copy() const SAL_OVERRIDE;
+    virtual OUString        Expand() const override;
+    virtual SwField*        Copy() const override;
 
     void                    Evaluate(SwDoc*);
     inline void             SetCondValid(bool bCond);
     inline bool             IsCondValid() const;
 
     // Condition
-    virtual OUString    GetPar1() const SAL_OVERRIDE;
-    virtual void        SetPar1(const OUString& rStr) SAL_OVERRIDE;
-    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
-    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
+    virtual OUString    GetPar1() const override;
+    virtual void        SetPar1(const OUString& rStr) override;
+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
 };
 
 inline bool SwDBNextSetField::IsCondValid() const
@@ -192,7 +192,7 @@ class SwDBNumSetFieldType : public SwFieldType
 public:
     SwDBNumSetFieldType();
 
-    virtual SwFieldType*    Copy() const SAL_OVERRIDE;
+    virtual SwFieldType*    Copy() const override;
 };
 
 // Data record with number xxx.
@@ -206,24 +206,24 @@ class SwDBNumSetField : public SwDBNameInfField
 public:
     SwDBNumSetField(SwDBNumSetFieldType*, const OUString& rCond, const OUString& rDBNum, const SwDBData& rDBData);
 
-    virtual OUString        Expand() const SAL_OVERRIDE;
-    virtual SwField*        Copy() const SAL_OVERRIDE;
+    virtual OUString        Expand() const override;
+    virtual SwField*        Copy() const override;
 
     inline bool             IsCondValid() const;
     inline void             SetCondValid(bool bCond);
     void                    Evaluate(SwDoc*);
 
     // Condition
-    virtual OUString        GetPar1() const SAL_OVERRIDE;
-    virtual void            SetPar1(const OUString& rStr) SAL_OVERRIDE;
+    virtual OUString        GetPar1() const override;
+    virtual void            SetPar1(const OUString& rStr) override;
 
     // Number of data record.
-    virtual OUString   GetPar2()   const SAL_OVERRIDE;
-    virtual void            SetPar2(const OUString& rStr) SAL_OVERRIDE;
+    virtual OUString   GetPar2()   const override;
+    virtual void            SetPar2(const OUString& rStr) override;
 
     // Number of data record is in nFormat!!
-    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
-    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
 };
 
 inline bool SwDBNumSetField::IsCondValid() const
@@ -240,7 +240,7 @@ public:
     SwDBNameFieldType(SwDoc*);
 
     OUString                Expand(sal_uLong) const;
-    virtual SwFieldType*    Copy() const SAL_OVERRIDE;
+    virtual SwFieldType*    Copy() const override;
 };
 
 // Database field.
@@ -249,10 +249,10 @@ class SW_DLLPUBLIC SwDBNameField : public SwDBNameInfField
 public:
     SwDBNameField(SwDBNameFieldType*, const SwDBData& rDBData, sal_uLong nFormat = 0);
 
-    virtual OUString Expand() const SAL_OVERRIDE;
-    virtual SwField* Copy() const SAL_OVERRIDE;
-    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
-    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
+    virtual OUString Expand() const override;
+    virtual SwField* Copy() const override;
+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
 };
 
 // Number of data record.
@@ -261,7 +261,7 @@ class SW_DLLPUBLIC SwDBSetNumberFieldType : public SwFieldType
 public:
     SwDBSetNumberFieldType();
 
-    virtual SwFieldType*    Copy() const SAL_OVERRIDE;
+    virtual SwFieldType*    Copy() const override;
 };
 
 // Database field.
@@ -271,14 +271,14 @@ class SW_DLLPUBLIC SwDBSetNumberField : public SwDBNameInfField
 public:
     SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData, sal_uLong nFormat = 0);
 
-    virtual OUString Expand() const SAL_OVERRIDE;
-    virtual         SwField* Copy() const SAL_OVERRIDE;
+    virtual OUString Expand() const override;
+    virtual         SwField* Copy() const override;
     void            Evaluate(SwDoc*);
 
     inline long     GetSetNumber() const;
     inline void     SetSetNumber(long nNum);
-    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
-    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override;
+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override;
 };
 
 inline long SwDBSetNumberField::GetSetNumber() const