Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code

Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274

34 files changed, 268 insertions, 268 deletions

diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx
index 6a34c2ea0ea5..ed844fbd2c46 100644
--- a/include/svl/aeitem.hxx
+++ b/include/svl/aeitem.hxx
@@ -47,14 +47,14 @@ public:
     void                    InsertValue( sal_uInt16 nValue, const OUString &rText );
     void                    RemoveValue( sal_uInt16 nValue );
 
-    sal_uInt16              GetPosByValue( sal_uInt16 nValue ) const SAL_OVERRIDE;
-
-    virtual sal_uInt16      GetValueCount() const SAL_OVERRIDE;
-    virtual sal_uInt16      GetValueByPos( sal_uInt16 nPos ) const SAL_OVERRIDE;
-    virtual OUString   GetValueTextByPos( sal_uInt16 nPos ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16 nVersion) const SAL_OVERRIDE;
-    virtual bool        IsEnabled( sal_uInt16 ) const SAL_OVERRIDE;
+    sal_uInt16              GetPosByValue( sal_uInt16 nValue ) const override;
+
+    virtual sal_uInt16      GetValueCount() const override;
+    virtual sal_uInt16      GetValueByPos( sal_uInt16 nPos ) const override;
+    virtual OUString   GetValueTextByPos( sal_uInt16 nPos ) const override;
+    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const override;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16 nVersion) const override;
+    virtual bool        IsEnabled( sal_uInt16 ) const override;
     void                    DisableValue( sal_uInt16 );
 };
 
diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx
index 6dc89a4c4648..52360c7a6524 100644
--- a/include/svl/cenumitm.hxx
+++ b/include/svl/cenumitm.hxx
@@ -34,17 +34,17 @@ protected:
 public:
     TYPEINFO_OVERRIDE();
 
-    virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE;
+    virtual bool operator ==(const SfxPoolItem & rItem) const override;
 
     virtual bool GetPresentation(SfxItemPresentation,
                                                 SfxMapUnit, SfxMapUnit,
                                                 OUString & rText,
                                                 const IntlWrapper * = 0)
-        const SAL_OVERRIDE;
+        const override;
 
-    virtual bool QueryValue(com::sun::star::uno::Any & rVal, sal_uInt8 = 0) const SAL_OVERRIDE;
+    virtual bool QueryValue(com::sun::star::uno::Any & rVal, sal_uInt8 = 0) const override;
 
-    virtual bool PutValue(const com::sun::star::uno::Any & rVal, sal_uInt8 ) SAL_OVERRIDE;
+    virtual bool PutValue(const com::sun::star::uno::Any & rVal, sal_uInt8 ) override;
 
     virtual sal_uInt16 GetValueCount() const = 0;
 
diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx
index ece6bc229b12..788c609e77d7 100644
--- a/include/svl/cintitem.hxx
+++ b/include/svl/cintitem.hxx
@@ -40,25 +40,25 @@ public:
 
     virtual ~CntByteItem() {}
 
-    virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE;
+    virtual bool operator ==(const SfxPoolItem & rItem) const override;
 
     virtual bool GetPresentation(SfxItemPresentation,
                                                 SfxMapUnit, SfxMapUnit,
                                                 OUString & rText,
                                                 const IntlWrapper * = 0)
-        const SAL_OVERRIDE;
+        const override;
 
     virtual bool QueryValue(com::sun::star::uno::Any& rVal,
-                            sal_uInt8 nMemberId = 0) const SAL_OVERRIDE;
+                            sal_uInt8 nMemberId = 0) const override;
 
     virtual bool PutValue(const com::sun::star::uno::Any& rVal,
-                          sal_uInt8 nMemberId) SAL_OVERRIDE;
+                          sal_uInt8 nMemberId) override;
 
-    virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE;
+    virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override;
 
-    virtual SvStream & Store(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE;
+    virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override;
 
-    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE;
+    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override;
 
     sal_uInt8 GetValue() const { return m_nValue; }
 
@@ -90,25 +90,25 @@ public:
 
     virtual ~CntUInt16Item() {}
 
-    virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE;
+    virtual bool operator ==(const SfxPoolItem & rItem) const override;
 
     virtual bool GetPresentation(SfxItemPresentation,
                                                 SfxMapUnit, SfxMapUnit,
                                                 OUString & rText,
                                                 const IntlWrapper * = 0)
-        const SAL_OVERRIDE;
+        const override;
 
     virtual bool QueryValue(com::sun::star::uno::Any& rVal,
-                            sal_uInt8 nMemberId = 0) const SAL_OVERRIDE;
+                            sal_uInt8 nMemberId = 0) const override;
 
     virtual bool PutValue(const com::sun::star::uno::Any& rVal,
-                          sal_uInt8 nMemberId) SAL_OVERRIDE;
+                          sal_uInt8 nMemberId) override;
 
-    virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE;
+    virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override;
 
-    virtual SvStream & Store(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE;
+    virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override;
 
-    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE;
+    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override;
 
     sal_uInt16 GetValue() const { return m_nValue; }
 
@@ -140,25 +140,25 @@ public:
 
     virtual ~CntInt32Item() {}
 
-    virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE;
+    virtual bool operator ==(const SfxPoolItem & rItem) const override;
 
     virtual bool GetPresentation(SfxItemPresentation,
                                                 SfxMapUnit, SfxMapUnit,
                                                 OUString & rText,
                                                 const IntlWrapper * = 0)
-        const SAL_OVERRIDE;
+        const override;
 
     virtual bool QueryValue(com::sun::star::uno::Any& rVal,
-                            sal_uInt8 nMemberId = 0) const SAL_OVERRIDE;
+                            sal_uInt8 nMemberId = 0) const override;
 
     virtual bool PutValue(const com::sun::star::uno::Any& rVal,
-                          sal_uInt8 nMemberId) SAL_OVERRIDE;
+                          sal_uInt8 nMemberId) override;
 
-    virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE;
+    virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override;
 
-    virtual SvStream & Store(SvStream &, sal_uInt16) const SAL_OVERRIDE;
+    virtual SvStream & Store(SvStream &, sal_uInt16) const override;
 
-    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE;
+    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override;
 
     sal_Int32 GetValue() const { return m_nValue; }
 
@@ -190,25 +190,25 @@ public:
 
     virtual ~CntUInt32Item() {}
 
-    virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE;
+    virtual bool operator ==(const SfxPoolItem & rItem) const override;
 
     virtual bool GetPresentation(SfxItemPresentation,
                                                 SfxMapUnit, SfxMapUnit,
                                                 OUString & rText,
                                                 const IntlWrapper * = 0)
-        const SAL_OVERRIDE;
+        const override;
 
     virtual bool QueryValue(com::sun::star::uno::Any& rVal,
-                            sal_uInt8 nMemberId = 0) const SAL_OVERRIDE;
+                            sal_uInt8 nMemberId = 0) const override;
 
     virtual bool PutValue(const com::sun::star::uno::Any& rVal,
-                          sal_uInt8 nMemberId) SAL_OVERRIDE;
+                          sal_uInt8 nMemberId) override;
 
-    virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE;
+    virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override;
 
-    virtual SvStream & Store(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE;
+    virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override;
 
-    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE;
+    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override;
 
     sal_uInt32 GetValue() const { return m_nValue; }
 
diff --git a/include/svl/cntwall.hxx b/include/svl/cntwall.hxx
index 35462c3280c5..a7401fd84694 100644
--- a/include/svl/cntwall.hxx
+++ b/include/svl/cntwall.hxx
@@ -42,17 +42,17 @@ public:
                             CntWallpaperItem( const CntWallpaperItem& rCpy );
                             virtual ~CntWallpaperItem();
 
-    virtual sal_uInt16 GetVersion(sal_uInt16) const SAL_OVERRIDE;
+    virtual sal_uInt16 GetVersion(sal_uInt16) const override;
 
-    virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*    Create( SvStream&, sal_uInt16 nItemVersion ) const SAL_OVERRIDE;
-    virtual SvStream&       Store( SvStream&, sal_uInt16 nItemVersion ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
+    virtual bool            operator==( const SfxPoolItem& ) const override;
+    virtual SfxPoolItem*    Create( SvStream&, sal_uInt16 nItemVersion ) const override;
+    virtual SvStream&       Store( SvStream&, sal_uInt16 nItemVersion ) const override;
+    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const override;
 
     virtual bool            QueryValue( com::sun::star::uno::Any& rVal,
-                                         sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+                                         sal_uInt8 nMemberId = 0 ) const override;
     virtual bool            PutValue  ( const com::sun::star::uno::Any& rVal,
-                                         sal_uInt8 nMemberId ) SAL_OVERRIDE;
+                                         sal_uInt8 nMemberId ) override;
 
     void                    SetBitmapURL( const OUString& rURL ) { _aURL = rURL; }
     void                    SetColor( Color nColor ) { _nColor = nColor; }
diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx
index 302509ee3953..37d8bdc0028d 100644
--- a/include/svl/ctypeitm.hxx
+++ b/include/svl/ctypeitm.hxx
@@ -38,14 +38,14 @@ public:
     CntContentTypeItem( const CntContentTypeItem& rOrig );
 
     virtual SfxPoolItem* Create( SvStream& rStream,
-                                 sal_uInt16 nItemVersion ) const SAL_OVERRIDE;
-    virtual SvStream & Store(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE;
+                                 sal_uInt16 nItemVersion ) const override;
+    virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override;
 
-    virtual bool         operator==( const SfxPoolItem& rOrig ) const SAL_OVERRIDE;
+    virtual bool         operator==( const SfxPoolItem& rOrig ) const override;
 
-    virtual sal_uInt16 GetVersion(sal_uInt16) const SAL_OVERRIDE;
+    virtual sal_uInt16 GetVersion(sal_uInt16) const override;
 
-    virtual SfxPoolItem* Clone( SfxItemPool *pPool = NULL ) const SAL_OVERRIDE;
+    virtual SfxPoolItem* Clone( SfxItemPool *pPool = NULL ) const override;
 
     void SetValue( const OUString& rNewVal );
 
@@ -53,12 +53,12 @@ public:
                                                  SfxMapUnit eCoreMetric,
                                                  SfxMapUnit ePresMetric,
                                                  OUString & rText,
-                                                 const IntlWrapper* pIntlWrapper = 0 ) const SAL_OVERRIDE;
+                                                 const IntlWrapper* pIntlWrapper = 0 ) const override;
 
     virtual bool QueryValue( com::sun::star::uno::Any& rVal,
-                             sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+                             sal_uInt8 nMemberId = 0 ) const override;
     virtual bool PutValue  ( const com::sun::star::uno::Any& rVal,
-                             sal_uInt8 nMemberId ) SAL_OVERRIDE;
+                             sal_uInt8 nMemberId ) override;
 
     INetContentType GetEnumValue() const;
 
diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx
index 8c25c8bdb11f..ee365efb3aa4 100644
--- a/include/svl/custritm.hxx
+++ b/include/svl/custritm.hxx
@@ -44,20 +44,20 @@ public:
 
     virtual ~CntUnencodedStringItem() {}
 
-    virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE;
+    virtual bool operator ==(const SfxPoolItem & rItem) const override;
 
     virtual bool GetPresentation(SfxItemPresentation,
                                                 SfxMapUnit, SfxMapUnit,
                                                 OUString & rText,
                                                 const IntlWrapper * = 0)
-        const SAL_OVERRIDE;
+        const override;
 
     virtual bool QueryValue(com::sun::star::uno::Any& rVal,
-                            sal_uInt8 nMemberId = 0) const SAL_OVERRIDE;
+                            sal_uInt8 nMemberId = 0) const override;
 
-    virtual bool PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId) SAL_OVERRIDE;
+    virtual bool PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId) override;
 
-    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE;
+    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override;
 
     const OUString & GetValue() const { return m_aValue; }
 
diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx
index 8cfd82878117..7c0d8de411cb 100644
--- a/include/svl/eitem.hxx
+++ b/include/svl/eitem.hxx
@@ -51,11 +51,11 @@ public:
     void SetValue(sal_uInt16 nTheValue);
 
     // SfxPoolItem
-    virtual SvStream & Store(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE;
+    virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override;
 
-    virtual sal_uInt16 GetEnumValue() const SAL_OVERRIDE;
+    virtual sal_uInt16 GetEnumValue() const override;
 
-    virtual void SetEnumValue(sal_uInt16 nTheValue) SAL_OVERRIDE;
+    virtual void SetEnumValue(sal_uInt16 nTheValue) override;
 
 };
 
@@ -86,27 +86,27 @@ public:
     void SetValue(bool const bTheValue) { m_bValue = bTheValue; }
 
     // SfxPoolItem
-    virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE;
+    virtual bool operator ==(const SfxPoolItem & rItem) const override;
 
     virtual bool GetPresentation(SfxItemPresentation,
                                                 SfxMapUnit, SfxMapUnit,
                                                 OUString & rText,
                                                 const IntlWrapper * = 0)
-        const SAL_OVERRIDE;
+        const override;
 
     virtual bool QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8 = 0)
-        const SAL_OVERRIDE;
+        const override;
 
     virtual bool PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8)
-        SAL_OVERRIDE;
+        override;
 
 
     virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const
-        SAL_OVERRIDE;
+        override;
 
-    virtual SvStream & Store(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE;
+    virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override;
 
-    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE;
+    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override;
 
     virtual OUString GetValueTextByVal(bool bTheValue) const;
 };
diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx
index 0271f2353427..71324d81510c 100644
--- a/include/svl/flagitem.hxx
+++ b/include/svl/flagitem.hxx
@@ -39,16 +39,16 @@ public:
 
     virtual sal_uInt8            GetFlagCount() const;
 
-    virtual bool             operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16 nVersion) const SAL_OVERRIDE;
-    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE;
+    virtual bool             operator==( const SfxPoolItem& ) const override;
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16 nVersion) const override;
+    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion) const override;
 
-    virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+    virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const override;
     virtual bool GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     OUString & rText,
-                                    const IntlWrapper * = 0 ) const SAL_OVERRIDE;
+                                    const IntlWrapper * = 0 ) const override;
             sal_uInt16           GetValue() const { return nVal; }
             void             SetValue( sal_uInt16 nNewVal ) {
                                  DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
diff --git a/include/svl/globalnameitem.hxx b/include/svl/globalnameitem.hxx
index fc69cc651640..4144e05bc1dc 100644
--- a/include/svl/globalnameitem.hxx
+++ b/include/svl/globalnameitem.hxx
@@ -34,14 +34,14 @@ public:
                             SfxGlobalNameItem( sal_uInt16 nWhich, const SvGlobalName& );
                             virtual ~SfxGlobalNameItem();
 
-    virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+    virtual bool            operator==( const SfxPoolItem& ) const override;
+    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const override;
     SvGlobalName            GetValue() const { return m_aName; }
 
     virtual bool            PutValue  ( const com::sun::star::uno::Any& rVal,
-                                        sal_uInt8 nMemberId ) SAL_OVERRIDE;
+                                        sal_uInt8 nMemberId ) override;
     virtual bool            QueryValue( com::sun::star::uno::Any& rVal,
-                                        sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+                                        sal_uInt8 nMemberId = 0 ) const override;
 };
 
 #endif
diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx
index 8acdd547ac54..9fc6949eb69c 100644
--- a/include/svl/grabbagitem.hxx
+++ b/include/svl/grabbagitem.hxx
@@ -40,11 +40,11 @@ public:
         return m_aMap;
     }
 
-    virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE;
-    virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE;
+    virtual bool operator==(const SfxPoolItem&) const override;
+    virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override;
 
-    virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) SAL_OVERRIDE;
-    virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const SAL_OVERRIDE;
+    virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override;
+    virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override;
 };
 #endif
 
diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx
index 67b4a3cb4215..9b9e9375bd9f 100644
--- a/include/svl/ilstitem.hxx
+++ b/include/svl/ilstitem.hxx
@@ -45,10 +45,10 @@ public:
 
     void                    GetList( ::std::vector < sal_Int32 >& rList ) const;
 
-    virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
-    virtual bool            PutValue  ( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
-    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+    virtual bool            operator==( const SfxPoolItem& ) const override;
+    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const override;
+    virtual bool            PutValue  ( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
 };
 
 #endif // INCLUDED_SVL_ILSTITEM_HXX
diff --git a/include/svl/imageitm.hxx b/include/svl/imageitm.hxx
index 9be3c456011f..0ec2b775a47e 100644
--- a/include/svl/imageitm.hxx
+++ b/include/svl/imageitm.hxx
@@ -33,10 +33,10 @@ public:
                             SfxImageItem( const SfxImageItem& );
     virtual                 ~SfxImageItem();
 
-    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
-    virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
-    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
-    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
+    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const override;
+    virtual bool            operator==( const SfxPoolItem& ) const override;
+    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     void                    SetRotation( long nValue );
     long                    GetRotation() const;
diff --git a/include/svl/instrm.hxx b/include/svl/instrm.hxx
index 210c0eedc47d..07188cdf49b3 100644
--- a/include/svl/instrm.hxx
+++ b/include/svl/instrm.hxx
@@ -43,15 +43,15 @@ class SVL_DLLPUBLIC SvInputStream: public SvStream
 
     SVL_DLLPRIVATE bool open();
 
-    SVL_DLLPRIVATE virtual sal_uLong GetData(void * pData, sal_uLong nSize) SAL_OVERRIDE;
+    SVL_DLLPRIVATE virtual sal_uLong GetData(void * pData, sal_uLong nSize) override;
 
-    SVL_DLLPRIVATE virtual sal_uLong PutData(void const *, sal_uLong) SAL_OVERRIDE;
+    SVL_DLLPRIVATE virtual sal_uLong PutData(void const *, sal_uLong) override;
 
-    SVL_DLLPRIVATE virtual sal_uInt64 SeekPos(sal_uInt64 nPos) SAL_OVERRIDE;
+    SVL_DLLPRIVATE virtual sal_uInt64 SeekPos(sal_uInt64 nPos) override;
 
-    SVL_DLLPRIVATE virtual void FlushData() SAL_OVERRIDE;
+    SVL_DLLPRIVATE virtual void FlushData() override;
 
-    SVL_DLLPRIVATE virtual void SetSize(sal_uInt64) SAL_OVERRIDE;
+    SVL_DLLPRIVATE virtual void SetSize(sal_uInt64) override;
 
 public:
     SvInputStream(
diff --git a/include/svl/int64item.hxx b/include/svl/int64item.hxx
index d962ae399091..b5f36c0564e7 100644
--- a/include/svl/int64item.hxx
+++ b/include/svl/int64item.hxx
@@ -24,23 +24,23 @@ public:
 
     virtual ~SfxInt64Item();
 
-    virtual bool operator== ( const SfxPoolItem& rItem ) const SAL_OVERRIDE;
+    virtual bool operator== ( const SfxPoolItem& rItem ) const override;
 
     virtual bool GetPresentation(
         SfxItemPresentation, SfxMapUnit, SfxMapUnit,
-        OUString& rText, const IntlWrapper* pIntlWrapper = NULL ) const SAL_OVERRIDE;
+        OUString& rText, const IntlWrapper* pIntlWrapper = NULL ) const override;
 
     virtual bool QueryValue(
-        com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+        com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
 
     virtual bool PutValue(
-        const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
+        const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
-    virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nItemVersion ) const SAL_OVERRIDE;
+    virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nItemVersion ) const override;
 
-    virtual SvStream& Store( SvStream& rStream, sal_uInt16 nItemVersion ) const SAL_OVERRIDE;
+    virtual SvStream& Store( SvStream& rStream, sal_uInt16 nItemVersion ) const override;
 
-    virtual SfxPoolItem* Clone( SfxItemPool* pOther = NULL ) const SAL_OVERRIDE;
+    virtual SfxPoolItem* Clone( SfxItemPool* pOther = NULL ) const override;
 
     sal_Int64 GetValue() const { return mnValue;}
 
diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx
index 3021f0ef9f64..3b9d4bf37f80 100644
--- a/include/svl/intitem.hxx
+++ b/include/svl/intitem.hxx
@@ -32,9 +32,9 @@ public:
     explicit SfxByteItem(sal_uInt16 which = 0, sal_uInt8 nValue = 0):
         CntByteItem(which, nValue) {}
 
-    virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE;
+    virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override;
 
-    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE
+    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override
     { return new SfxByteItem(*this); }
 };
 
@@ -57,25 +57,25 @@ public:
 
     virtual ~SfxInt16Item() {}
 
-    virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE;
+    virtual bool operator ==(const SfxPoolItem & rItem) const override;
 
     virtual bool GetPresentation(SfxItemPresentation,
                                                 SfxMapUnit, SfxMapUnit,
                                                 OUString & rText,
                                                 const IntlWrapper * = 0)
-        const SAL_OVERRIDE;
+        const override;
 
     virtual bool QueryValue( com::sun::star::uno::Any& rVal,
-                             sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+                             sal_uInt8 nMemberId = 0 ) const override;
 
     virtual bool PutValue( const com::sun::star::uno::Any& rVal,
-                           sal_uInt8 nMemberId ) SAL_OVERRIDE;
+                           sal_uInt8 nMemberId ) override;
 
-    virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE;
+    virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override;
 
-    virtual SvStream & Store(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE;
+    virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override;
 
-    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE;
+    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override;
 
     sal_Int16 GetValue() const { return m_nValue; }
 
@@ -100,13 +100,13 @@ public:
     SfxUInt16Item(sal_uInt16 which, SvStream & rStream):
         CntUInt16Item(which, rStream) {}
 
-    virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE
+    virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override
     { return new SfxUInt16Item(Which(), rStream); }
 
-    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE
+    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override
     { return new SfxUInt16Item(*this); }
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
+    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
 };
 
 
@@ -121,10 +121,10 @@ public:
     SfxInt32Item(sal_uInt16 which, SvStream & rStream):
         CntInt32Item(which, rStream) {}
 
-    virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE
+    virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override
     { return new SfxInt32Item(Which(), rStream); }
 
-    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE
+    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override
     { return new SfxInt32Item(*this); }
 
 };
@@ -141,10 +141,10 @@ public:
     SfxUInt32Item(sal_uInt16 which, SvStream & rStream):
         CntUInt32Item(which, rStream) {}
 
-    virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE
+    virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override
     { return new SfxUInt32Item(Which(), rStream); }
 
-    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE
+    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override
     { return new SfxUInt32Item(*this); }
 };
 
diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx
index ea5d7e590c91..2c68dfa7718e 100644
--- a/include/svl/itemprop.hxx
+++ b/include/svl/itemprop.hxx
@@ -166,16 +166,16 @@ public:
 
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL
         getProperties(  )
-            throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
 
     virtual ::com::sun::star::beans::Property SAL_CALL
         getPropertyByName( const OUString& aName )
             throw(::com::sun::star::beans::UnknownPropertyException,
-                    ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                    ::com::sun::star::uno::RuntimeException, std::exception) override;
 
     virtual sal_Bool SAL_CALL
         hasPropertyByName( const OUString& Name )
-            throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
 
 };
 
@@ -190,15 +190,15 @@ public:
 
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL
         getProperties(  )
-            throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
 
     virtual ::com::sun::star::beans::Property SAL_CALL
         getPropertyByName( const OUString& aName )
-            throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;
 
     virtual sal_Bool SAL_CALL
         hasPropertyByName( const OUString& Name )
-            throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
 };
 
 #endif
diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index 7203a5eaa876..02ded794613d 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -157,8 +157,8 @@ public:
                                 SfxAllItemSet( const SfxItemSet & );
                                 SfxAllItemSet( const SfxAllItemSet & );
 
-    virtual SfxItemSet *        Clone( bool bItems = true, SfxItemPool *pToPool = 0 ) const SAL_OVERRIDE;
-    virtual const SfxPoolItem*  Put( const SfxPoolItem&, sal_uInt16 nWhich ) SAL_OVERRIDE;
+    virtual SfxItemSet *        Clone( bool bItems = true, SfxItemPool *pToPool = 0 ) const override;
+    virtual const SfxPoolItem*  Put( const SfxPoolItem&, sal_uInt16 nWhich ) override;
     using SfxItemSet::Put;
 };
 
diff --git a/include/svl/languageoptions.hxx b/include/svl/languageoptions.hxx
index 693a12407d00..0064395b9cac 100644
--- a/include/svl/languageoptions.hxx
+++ b/include/svl/languageoptions.hxx
@@ -118,13 +118,13 @@ private:
 
     bool            isKeyboardLayoutTypeInstalled(sal_Int16 scriptType) const;
 
-    virtual void    ImplCommit() SAL_OVERRIDE;
+    virtual void    ImplCommit() override;
 
 public:
     SvtSystemLanguageOptions();
     virtual ~SvtSystemLanguageOptions();
 
-    virtual void    Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ) SAL_OVERRIDE;
+    virtual void    Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ) override;
 
     LanguageType    GetWin16SystemLanguage() const;
 
diff --git a/include/svl/lckbitem.hxx b/include/svl/lckbitem.hxx
index 60f3ac2a3f37..f60d359e9d25 100644
--- a/include/svl/lckbitem.hxx
+++ b/include/svl/lckbitem.hxx
@@ -35,17 +35,17 @@ public:
                             SfxLockBytesItem( const SfxLockBytesItem& );
                             virtual ~SfxLockBytesItem();
 
-    virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE;
-    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE;
+    virtual bool            operator==( const SfxPoolItem& ) const override;
+    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const override;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16 nItemVersion) const override;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion ) const override;
 
     SvLockBytes*            GetValue() const { return _xVal; }
 
     virtual bool            PutValue  ( const com::sun::star::uno::Any& rVal,
-                                        sal_uInt8 nMemberId ) SAL_OVERRIDE;
+                                        sal_uInt8 nMemberId ) override;
     virtual bool            QueryValue( com::sun::star::uno::Any& rVal,
-                                        sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+                                        sal_uInt8 nMemberId = 0 ) const override;
 };
 
 #endif
diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx
index b60c2be13f4f..fbded02af880 100644
--- a/include/svl/macitem.hxx
+++ b/include/svl/macitem.hxx
@@ -125,16 +125,16 @@ public:
     explicit inline SvxMacroItem ( const sal_uInt16 nId );
 
     // "pure virtual methods" of SfxPoolItem
-    virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+    virtual bool            operator==( const SfxPoolItem& ) const override;
     virtual bool GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     OUString &rText,
-                                    const IntlWrapper * = 0 ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const SAL_OVERRIDE;
-    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE;
-    virtual sal_uInt16          GetVersion( sal_uInt16 nFileFormatVersion ) const SAL_OVERRIDE;
+                                    const IntlWrapper * = 0 ) const override;
+    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const override;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const override;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion ) const override;
+    virtual sal_uInt16          GetVersion( sal_uInt16 nFileFormatVersion ) const override;
 
     inline const SvxMacroTableDtor& GetMacroTable() const { return aMacroTable;}
     inline void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aMacroTable = rTbl; }
diff --git a/include/svl/metitem.hxx b/include/svl/metitem.hxx
index 070b9319f3a6..d594e523d168 100644
--- a/include/svl/metitem.hxx
+++ b/include/svl/metitem.hxx
@@ -31,8 +31,8 @@ public:
                              SfxMetricItem( const SfxMetricItem& );
                              virtual ~SfxMetricItem() {}
 
-    virtual bool             ScaleMetrics( long lMult, long lDiv ) SAL_OVERRIDE;
-    virtual bool             HasMetrics() const SAL_OVERRIDE;
+    virtual bool             ScaleMetrics( long lMult, long lDiv ) override;
+    virtual bool             HasMetrics() const override;
 
 };
 
diff --git a/include/svl/numuno.hxx b/include/svl/numuno.hxx
index 57ad15d420db..059ead4f6ec7 100644
--- a/include/svl/numuno.hxx
+++ b/include/svl/numuno.hxx
@@ -65,15 +65,15 @@ public:
                                 // XNumberFormatsSupplier
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL
                                 getNumberFormatSettings()
-                                    throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                    throw(::com::sun::star::uno::RuntimeException, std::exception) override;
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > SAL_CALL
                                 getNumberFormats()
-                                    throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                    throw(::com::sun::star::uno::RuntimeException, std::exception) override;
 
                                 // XUnoTunnel
     virtual sal_Int64 SAL_CALL  getSomething( const ::com::sun::star::uno::Sequence<
                                     sal_Int8 >& aIdentifier )
-                                        throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                        throw(::com::sun::star::uno::RuntimeException, std::exception) override;
 
     static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId();
     static SvNumberFormatsSupplierObj* getImplementation( const com::sun::star::uno::Reference<
diff --git a/include/svl/outstrm.hxx b/include/svl/outstrm.hxx
index f41b9ac015c2..0239a2f19428 100644
--- a/include/svl/outstrm.hxx
+++ b/include/svl/outstrm.hxx
@@ -34,15 +34,15 @@ class SVL_DLLPUBLIC SvOutputStream: public SvStream
     com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >
         m_xStream;
 
-    SVL_DLLPRIVATE virtual sal_uLong GetData(void *, sal_uLong) SAL_OVERRIDE;
+    SVL_DLLPRIVATE virtual sal_uLong GetData(void *, sal_uLong) override;
 
-    SVL_DLLPRIVATE virtual sal_uLong PutData(void const * pData, sal_uLong nSize) SAL_OVERRIDE;
+    SVL_DLLPRIVATE virtual sal_uLong PutData(void const * pData, sal_uLong nSize) override;
 
-    SVL_DLLPRIVATE virtual sal_uInt64 SeekPos(sal_uInt64) SAL_OVERRIDE;
+    SVL_DLLPRIVATE virtual sal_uInt64 SeekPos(sal_uInt64) override;
 
-    SVL_DLLPRIVATE virtual void FlushData() SAL_OVERRIDE;
+    SVL_DLLPRIVATE virtual void FlushData() override;
 
-    SVL_DLLPRIVATE virtual void SetSize(sal_uInt64) SAL_OVERRIDE;
+    SVL_DLLPRIVATE virtual void SetSize(sal_uInt64) override;
 
 public:
     SvOutputStream(com::sun::star::uno::Reference<
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index edd9e2e91136..1ea63b91e8b3 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -258,16 +258,16 @@ public:
                             SfxVoidItem( const SfxVoidItem& );
                             virtual ~SfxVoidItem();
 
-    virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+    virtual bool            operator==( const SfxPoolItem& ) const override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     OUString &rText,
-                                    const IntlWrapper * = 0 ) const SAL_OVERRIDE;
+                                    const IntlWrapper * = 0 ) const override;
 
     // create a copy of itself
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const override;
 };
 
 class SVL_DLLPUBLIC SfxSetItem: public SfxPoolItem
@@ -283,18 +283,18 @@ public:
                             SfxSetItem( const SfxSetItem&, SfxItemPool *pPool = 0 );
                             virtual ~SfxSetItem();
 
-    virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+    virtual bool            operator==( const SfxPoolItem& ) const override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     OUString &rText,
-                                    const IntlWrapper * = 0 ) const SAL_OVERRIDE;
+                                    const IntlWrapper * = 0 ) const override;
 
     // create a copy of itself
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE = 0;
-    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16 nVersion) const SAL_OVERRIDE = 0;
-    virtual SvStream&       Store(SvStream &, sal_uInt16 nVer) const SAL_OVERRIDE;
+    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const override = 0;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16 nVersion) const override = 0;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nVer) const override;
 
     const SfxItemSet&       GetItemSet() const
                             { return *pSet; }
diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx
index 558f475e01a9..27375140415f 100644
--- a/include/svl/ptitem.hxx
+++ b/include/svl/ptitem.hxx
@@ -40,13 +40,13 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     OUString &rText,
-                                    const IntlWrapper * = 0 ) const SAL_OVERRIDE;
+                                    const IntlWrapper * = 0 ) const override;
 
-    virtual bool             operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+    virtual bool             operator==( const SfxPoolItem& ) const override;
 
-    virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE;
-    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE;
+    virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const override;
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16 nItemVersion) const override;
+    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion) const override;
 
     const Point&             GetValue() const { return aVal; }
             void             SetValue( const Point& rNewVal ) {
@@ -55,9 +55,9 @@ public:
                              }
 
     virtual bool             QueryValue( com::sun::star::uno::Any& rVal,
-                                          sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+                                          sal_uInt8 nMemberId = 0 ) const override;
     virtual bool             PutValue( const com::sun::star::uno::Any& rVal,
-                                          sal_uInt8 nMemberId ) SAL_OVERRIDE;
+                                          sal_uInt8 nMemberId ) override;
 };
 
 #endif
diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx
index 83ad815e27fe..f94215b94d8e 100644
--- a/include/svl/rectitem.hxx
+++ b/include/svl/rectitem.hxx
@@ -41,18 +41,18 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     OUString &rText,
-                                    const IntlWrapper * = 0 ) const SAL_OVERRIDE;
+                                    const IntlWrapper * = 0 ) const override;
 
-    virtual bool             operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE;
-    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE;
+    virtual bool             operator==( const SfxPoolItem& ) const override;
+    virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const override;
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16 nItemVersion) const override;
+    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion) const override;
 
     const Rectangle&         GetValue() const { return aVal; }
     virtual bool             QueryValue( com::sun::star::uno::Any& rVal,
-                                          sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+                                          sal_uInt8 nMemberId = 0 ) const override;
     virtual bool             PutValue( const com::sun::star::uno::Any& rVal,
-                                          sal_uInt8 nMemberId ) SAL_OVERRIDE;
+                                          sal_uInt8 nMemberId ) override;
 };
 
 #endif
diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx
index 1fc7692edd43..a449a9339b47 100644
--- a/include/svl/rngitem.hxx
+++ b/include/svl/rngitem.hxx
@@ -37,16 +37,16 @@ public:
                                 SfxRangeItem();
                                 SfxRangeItem( sal_uInt16 nWID, sal_uInt16 nFrom, sal_uInt16 nTo );
                                 SfxRangeItem( const SfxRangeItem& rItem );
-    virtual bool                operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+    virtual bool                operator==( const SfxPoolItem& ) const override;
     virtual bool GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     OUString &rText,
-                                    const IntlWrapper * = 0 ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*        Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+                                    const IntlWrapper * = 0 ) const override;
+    virtual SfxPoolItem*        Clone( SfxItemPool *pPool = 0 ) const override;
     inline sal_uInt16&          From() { return nFrom; }
-    virtual SfxPoolItem*        Create( SvStream &, sal_uInt16 nVersion ) const SAL_OVERRIDE;
-    virtual SvStream&           Store( SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE;
+    virtual SfxPoolItem*        Create( SvStream &, sal_uInt16 nVersion ) const override;
+    virtual SvStream&           Store( SvStream &, sal_uInt16 nItemVersion ) const override;
 };
 
 
@@ -62,15 +62,15 @@ public:
                                 SfxUShortRangesItem( sal_uInt16 nWID, SvStream &rStream );
                                 SfxUShortRangesItem( const SfxUShortRangesItem& rItem );
     virtual                     ~SfxUShortRangesItem();
-    virtual bool                operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+    virtual bool                operator==( const SfxPoolItem& ) const override;
     virtual bool GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     OUString &rText,
-                                    const IntlWrapper * = 0 ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*        Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*        Create( SvStream &, sal_uInt16 nVersion ) const SAL_OVERRIDE;
-    virtual SvStream&           Store( SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE;
+                                    const IntlWrapper * = 0 ) const override;
+    virtual SfxPoolItem*        Clone( SfxItemPool *pPool = 0 ) const override;
+    virtual SfxPoolItem*        Create( SvStream &, sal_uInt16 nVersion ) const override;
+    virtual SvStream&           Store( SvStream &, sal_uInt16 nItemVersion ) const override;
 };
 
 #endif
diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx
index b4b493424f11..1e7e4a5891cf 100644
--- a/include/svl/slstitm.hxx
+++ b/include/svl/slstitm.hxx
@@ -53,20 +53,20 @@ public:
     void                    SetStringList( const com::sun::star::uno::Sequence< OUString >& rList );
     void                    GetStringList( com::sun::star::uno::Sequence< OUString >& rList ) const;
 
-    virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+    virtual bool            operator==( const SfxPoolItem& ) const override;
     virtual bool            GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     OUString &rText,
-                                    const IntlWrapper * = 0 ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*    Create( SvStream &, sal_uInt16 nVersion ) const SAL_OVERRIDE;
-    virtual SvStream&       Store( SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE;
+                                    const IntlWrapper * = 0 ) const override;
+    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const override;
+    virtual SfxPoolItem*    Create( SvStream &, sal_uInt16 nVersion ) const override;
+    virtual SvStream&       Store( SvStream &, sal_uInt16 nItemVersion ) const override;
 
     virtual bool            PutValue  ( const com::sun::star::uno::Any& rVal,
-                                         sal_uInt8 nMemberId ) SAL_OVERRIDE;
+                                         sal_uInt8 nMemberId ) override;
     virtual bool            QueryValue( com::sun::star::uno::Any& rVal,
-                                         sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+                                         sal_uInt8 nMemberId = 0 ) const override;
 };
 #endif
 
diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx
index 0d12e2300419..70b54103a96b 100644
--- a/include/svl/srchitem.hxx
+++ b/include/svl/srchitem.hxx
@@ -88,7 +88,7 @@ class SVL_DLLPUBLIC SvxSearchItem :
     sal_Int32       m_nStartPointX;
     sal_Int32       m_nStartPointY;
 
-    virtual void    ImplCommit() SAL_OVERRIDE;
+    virtual void    ImplCommit() override;
 
 public:
     TYPEINFO_OVERRIDE();
@@ -97,17 +97,17 @@ public:
     SvxSearchItem( const SvxSearchItem& rItem );
     virtual ~SvxSearchItem();
 
-    virtual bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
-    virtual bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
-    virtual bool             operator == ( const SfxPoolItem& ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+    virtual bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+    virtual bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+    virtual bool             operator == ( const SfxPoolItem& ) const override;
+    virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const override;
     virtual bool GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE;
+                                    OUString &rText, const IntlWrapper * = 0 ) const override;
 
     // ConfigItem
-    virtual void            Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) SAL_OVERRIDE;
+    virtual void            Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) override;
 
             SvxSearchCmd    GetCommand() const { return m_nCommand; }
             void            SetCommand(SvxSearchCmd nNewCommand) { m_nCommand = nNewCommand; }
diff --git a/include/svl/stritem.hxx b/include/svl/stritem.hxx
index d2df1e42a158..ad775c5f5424 100644
--- a/include/svl/stritem.hxx
+++ b/include/svl/stritem.hxx
@@ -36,13 +36,13 @@ public:
 
     SfxStringItem(sal_uInt16 nWhich, SvStream & rStream);
 
-    virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE;
+    virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override;
 
-    virtual SvStream & Store(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE;
+    virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override;
 
-    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE;
+    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override;
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
+    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
 };
 
 #endif // INCLUDED_SVL_STRITEM_HXX
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index 3451312bfd53..da82d7ba6cf1 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -272,11 +272,11 @@ public:
                         SfxStyleSheet( const OUString&, const SfxStyleSheetBasePool&, SfxStyleFamily, sal_uInt16 );
                         SfxStyleSheet( const SfxStyleSheet& );
 
-    virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
+    virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
-    virtual bool        isUsedByModel() const SAL_OVERRIDE;
+    virtual bool        isUsedByModel() const override;
 
-    virtual bool        SetParent( const OUString& ) SAL_OVERRIDE;
+    virtual bool        SetParent( const OUString& ) override;
 
 protected:
     SfxStyleSheet() // do not use! needed by MSVC at compile time to satisfy ImplInheritanceHelper2
@@ -292,7 +292,7 @@ class SVL_DLLPUBLIC SfxStyleSheetPool: public SfxStyleSheetBasePool
 {
 protected:
     using SfxStyleSheetBasePool::Create;
-    virtual SfxStyleSheetBase* Create(const OUString&, SfxStyleFamily, sal_uInt16 mask) SAL_OVERRIDE;
+    virtual SfxStyleSheetBase* Create(const OUString&, SfxStyleFamily, sal_uInt16 mask) override;
 
 public:
     SfxStyleSheetPool( SfxItemPool const& );
@@ -348,7 +348,7 @@ public:
     static SfxUnoStyleSheet* getUnoStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle >& xStyle );
 
     // XUnoTunnel
-    virtual ::sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual ::sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
 private:
     SfxUnoStyleSheet(); // not implemented
diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx
index d6aa91c072b7..ef2e1bc436b4 100644
--- a/include/svl/szitem.hxx
+++ b/include/svl/szitem.hxx
@@ -41,17 +41,17 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     OUString &rText,
-                                    const IntlWrapper * = 0 ) const SAL_OVERRIDE;
+                                    const IntlWrapper * = 0 ) const override;
 
-    virtual bool             operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+    virtual bool             operator==( const SfxPoolItem& ) const override;
     virtual bool             QueryValue( com::sun::star::uno::Any& rVal,
-                                          sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+                                          sal_uInt8 nMemberId = 0 ) const override;
     virtual bool             PutValue( const com::sun::star::uno::Any& rVal,
-                                          sal_uInt8 nMemberId ) SAL_OVERRIDE;
+                                          sal_uInt8 nMemberId ) override;
 
-    virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE;
-    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE;
+    virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const override;
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16 nItemVersion) const override;
+    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion) const override;
 };
 
 #endif
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index bfb7f617de71..aacc127d13e3 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -145,21 +145,21 @@ public:
         const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId, SfxUndoArray *pFather );
     virtual ~SfxListUndoAction();
 
-    virtual void            Undo() SAL_OVERRIDE;
-    virtual void            UndoWithContext( SfxUndoContext& i_context ) SAL_OVERRIDE;
-    virtual void            Redo() SAL_OVERRIDE;
-    virtual void            RedoWithContext( SfxUndoContext& i_context ) SAL_OVERRIDE;
-    virtual void            Repeat(SfxRepeatTarget&) SAL_OVERRIDE;
-    virtual bool            CanRepeat(SfxRepeatTarget&) const SAL_OVERRIDE;
+    virtual void            Undo() override;
+    virtual void            UndoWithContext( SfxUndoContext& i_context ) override;
+    virtual void            Redo() override;
+    virtual void            RedoWithContext( SfxUndoContext& i_context ) override;
+    virtual void            Repeat(SfxRepeatTarget&) override;
+    virtual bool            CanRepeat(SfxRepeatTarget&) const override;
 
-    virtual bool            Merge( SfxUndoAction *pNextAction ) SAL_OVERRIDE;
+    virtual bool            Merge( SfxUndoAction *pNextAction ) override;
 
-    virtual OUString        GetComment() const SAL_OVERRIDE;
-    virtual OUString        GetRepeatComment(SfxRepeatTarget&) const SAL_OVERRIDE;
-    virtual sal_uInt16      GetId() const SAL_OVERRIDE;
+    virtual OUString        GetComment() const override;
+    virtual OUString        GetRepeatComment(SfxRepeatTarget&) const override;
+    virtual sal_uInt16      GetId() const override;
 
     void SetComment(const OUString& rComment);
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
+    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
 };
 
 
@@ -318,36 +318,36 @@ public:
     virtual                 ~SfxUndoManager();
 
     // IUndoManager overridables
-    virtual void            SetMaxUndoActionCount( size_t nMaxUndoActionCount ) SAL_OVERRIDE;
-    virtual size_t          GetMaxUndoActionCount() const SAL_OVERRIDE;
-    virtual void            AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false ) SAL_OVERRIDE;
-    virtual size_t          GetUndoActionCount( bool const i_currentLevel = CurrentLevel ) const SAL_OVERRIDE;
-    virtual sal_uInt16      GetUndoActionId() const SAL_OVERRIDE;
-    virtual OUString        GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const SAL_OVERRIDE;
-    virtual SfxUndoAction*  GetUndoAction( size_t nNo=0 ) const SAL_OVERRIDE;
-    virtual size_t          GetRedoActionCount( bool const i_currentLevel = CurrentLevel ) const SAL_OVERRIDE;
-    virtual OUString        GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const SAL_OVERRIDE;
-    virtual SfxUndoAction*  GetRedoAction( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const SAL_OVERRIDE;
-    virtual bool            Undo() SAL_OVERRIDE;
-    virtual bool            Redo() SAL_OVERRIDE;
-    virtual void            Clear() SAL_OVERRIDE;
-    virtual void            ClearRedo() SAL_OVERRIDE;
-    virtual void            Reset() SAL_OVERRIDE;
-    virtual bool            IsDoing() const SAL_OVERRIDE;
-    virtual size_t          GetRepeatActionCount() const SAL_OVERRIDE;
-    virtual OUString        GetRepeatActionComment( SfxRepeatTarget &rTarget) const SAL_OVERRIDE;
-    virtual bool            Repeat( SfxRepeatTarget &rTarget ) SAL_OVERRIDE;
-    virtual bool            CanRepeat( SfxRepeatTarget &rTarget ) const SAL_OVERRIDE;
-    virtual void            EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0) SAL_OVERRIDE;
-    virtual size_t          LeaveListAction() SAL_OVERRIDE;
-    virtual size_t          LeaveAndMergeListAction() SAL_OVERRIDE;
-    virtual bool            IsInListAction() const SAL_OVERRIDE;
-    virtual size_t          GetListActionDepth() const SAL_OVERRIDE;
-    virtual void            RemoveLastUndoAction() SAL_OVERRIDE;
-    virtual void            EnableUndo( bool bEnable ) SAL_OVERRIDE;
-    virtual bool            IsUndoEnabled() const SAL_OVERRIDE;
-    virtual void            AddUndoListener( SfxUndoListener& i_listener ) SAL_OVERRIDE;
-    virtual void            RemoveUndoListener( SfxUndoListener& i_listener ) SAL_OVERRIDE;
+    virtual void            SetMaxUndoActionCount( size_t nMaxUndoActionCount ) override;
+    virtual size_t          GetMaxUndoActionCount() const override;
+    virtual void            AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false ) override;
+    virtual size_t          GetUndoActionCount( bool const i_currentLevel = CurrentLevel ) const override;
+    virtual sal_uInt16      GetUndoActionId() const override;
+    virtual OUString        GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const override;
+    virtual SfxUndoAction*  GetUndoAction( size_t nNo=0 ) const override;
+    virtual size_t          GetRedoActionCount( bool const i_currentLevel = CurrentLevel ) const override;
+    virtual OUString        GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const override;
+    virtual SfxUndoAction*  GetRedoAction( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const override;
+    virtual bool            Undo() override;
+    virtual bool            Redo() override;
+    virtual void            Clear() override;
+    virtual void            ClearRedo() override;
+    virtual void            Reset() override;
+    virtual bool            IsDoing() const override;
+    virtual size_t          GetRepeatActionCount() const override;
+    virtual OUString        GetRepeatActionComment( SfxRepeatTarget &rTarget) const override;
+    virtual bool            Repeat( SfxRepeatTarget &rTarget ) override;
+    virtual bool            CanRepeat( SfxRepeatTarget &rTarget ) const override;
+    virtual void            EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0) override;
+    virtual size_t          LeaveListAction() override;
+    virtual size_t          LeaveAndMergeListAction() override;
+    virtual bool            IsInListAction() const override;
+    virtual size_t          GetListActionDepth() const override;
+    virtual void            RemoveLastUndoAction() override;
+    virtual void            EnableUndo( bool bEnable ) override;
+    virtual bool            IsUndoEnabled() const override;
+    virtual void            AddUndoListener( SfxUndoListener& i_listener ) override;
+    virtual void            RemoveUndoListener( SfxUndoListener& i_listener ) override;
 
     /** marks the current top-level element of the Undo stack, and returns a unique ID for it
     */
@@ -428,15 +428,15 @@ public:
                             SfxLinkUndoAction(::svl::IUndoManager *pManager);
                             virtual ~SfxLinkUndoAction();
 
-    virtual void            Undo() SAL_OVERRIDE;
-    virtual void            Redo() SAL_OVERRIDE;
-    virtual bool            CanRepeat(SfxRepeatTarget& r) const SAL_OVERRIDE;
+    virtual void            Undo() override;
+    virtual void            Redo() override;
+    virtual bool            CanRepeat(SfxRepeatTarget& r) const override;
 
-    virtual void            Repeat(SfxRepeatTarget&r) SAL_OVERRIDE;
+    virtual void            Repeat(SfxRepeatTarget&r) override;
 
-    virtual OUString        GetComment() const SAL_OVERRIDE;
-    virtual OUString        GetRepeatComment(SfxRepeatTarget&r) const SAL_OVERRIDE;
-    virtual sal_uInt16      GetId() const SAL_OVERRIDE;
+    virtual OUString        GetComment() const override;
+    virtual OUString        GetRepeatComment(SfxRepeatTarget&r) const override;
+    virtual sal_uInt16      GetId() const override;
 
     SfxUndoAction*          GetAction() const { return pAction; }
 
diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx
index cc7c7888a39a..3ef6b0002af1 100644
--- a/include/svl/visitem.hxx
+++ b/include/svl/visitem.hxx
@@ -45,25 +45,25 @@ public:
 
     virtual ~SfxVisibilityItem() {}
 
-    virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE;
+    virtual bool operator ==(const SfxPoolItem & rItem) const override;
 
     virtual bool GetPresentation(SfxItemPresentation,
                                                 SfxMapUnit, SfxMapUnit,
                                                 OUString & rText,
                                                 const IntlWrapper * = 0)
-        const SAL_OVERRIDE;
+        const override;
 
     virtual bool QueryValue( com::sun::star::uno::Any& rVal,
-                             sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+                             sal_uInt8 nMemberId = 0 ) const override;
 
     virtual bool PutValue( const com::sun::star::uno::Any& rVal,
-                           sal_uInt8 nMemberId ) SAL_OVERRIDE;
+                           sal_uInt8 nMemberId ) override;
 
-    virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE;
+    virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override;
 
-    virtual SvStream & Store(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE;
+    virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override;
 
-    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE;
+    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override;
 
     OUString GetValueTextByVal(bool bTheValue) const;