Replace SAL_OVERRIDE with override in internal code

Change-Id: Ifa446647b11fd1f1b0dc6a991b752480545634db
Reviewed-on: https://gerrit.libreoffice.org/60788
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

7 files changed, 27 insertions, 27 deletions

diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx
index bce078a487c3..1758d708c455 100644
--- a/include/sfx2/controlwrapper.hxx
+++ b/include/sfx2/controlwrapper.hxx
@@ -254,11 +254,11 @@ public:
     explicit     MetricFieldWrapper( MetricField& rField, FieldUnit eUnit ) :
                             SingleControlWrapper< MetricField, ValueT >( rField ), meUnit( eUnit ) {}
 
-    virtual bool        IsControlDontKnow() const SAL_OVERRIDE;
-    virtual void        SetControlDontKnow( bool bSet ) SAL_OVERRIDE;
+    virtual bool        IsControlDontKnow() const override;
+    virtual void        SetControlDontKnow( bool bSet ) override;
 
-    virtual ValueT      GetControlValue() const SAL_OVERRIDE;
-    virtual void        SetControlValue( ValueT nValue ) SAL_OVERRIDE;
+    virtual ValueT      GetControlValue() const override;
+    virtual void        SetControlValue( ValueT nValue ) override;
 
 private:
     FieldUnit           meUnit;
@@ -288,13 +288,13 @@ public:
     explicit     ListBoxWrapper( ListBox& rListBox, const MapEntryType* pMap ) :
                             SingleControlWrapper< ListBox, ValueT >( rListBox ), MapperType( WRAPPER_LISTBOX_ENTRY_NOTFOUND, pMap ) {}
 
-    virtual bool        IsControlDontKnow() const SAL_OVERRIDE
+    virtual bool        IsControlDontKnow() const override
                             { return this->GetControl().GetSelectedEntryCount() == 0; }
-    virtual void        SetControlDontKnow( bool bSet ) SAL_OVERRIDE
+    virtual void        SetControlDontKnow( bool bSet ) override
                             { if( bSet ) this->GetControl().SetNoSelection(); }
 
-    virtual ValueT      GetControlValue() const SAL_OVERRIDE;
-    virtual void        SetControlValue( ValueT nValue ) SAL_OVERRIDE;
+    virtual ValueT      GetControlValue() const override;
+    virtual void        SetControlValue( ValueT nValue ) override;
 };
 
 
@@ -321,13 +321,13 @@ public:
     explicit     ValueSetWrapper( ValueSet& rValueSet, const MapEntryType* pMap ) :
                             SingleControlWrapper< ValueSet, ValueT >( rValueSet ), MapperType( WRAPPER_VALUESET_ITEM_NOTFOUND, pMap ) {}
 
-    virtual bool        IsControlDontKnow() const SAL_OVERRIDE
+    virtual bool        IsControlDontKnow() const override
                             { return this->GetControl().IsNoSelection(); }
-    virtual void        SetControlDontKnow( bool bSet ) SAL_OVERRIDE
+    virtual void        SetControlDontKnow( bool bSet ) override
                             { if( bSet ) this->GetControl().SetNoSelection(); }
 
-    virtual ValueT      GetControlValue() const SAL_OVERRIDE;
-    virtual void        SetControlValue( ValueT nValue ) SAL_OVERRIDE;
+    virtual ValueT      GetControlValue() const override;
+    virtual void        SetControlValue( ValueT nValue ) override;
 };
 
 
diff --git a/include/sfx2/itemwrapper.hxx b/include/sfx2/itemwrapper.hxx
index 3f1bf7c5eb9f..7907da7ad6af 100644
--- a/include/sfx2/itemwrapper.hxx
+++ b/include/sfx2/itemwrapper.hxx
@@ -133,9 +133,9 @@ public:
     explicit     ValueItemWrapper( sal_uInt16 nSlot ) :
                             SingleItemWrapper< ItemT, ValueT >( nSlot ) {}
 
-    virtual ValueT      GetItemValue( const ItemT& rItem ) const SAL_OVERRIDE
+    virtual ValueT      GetItemValue( const ItemT& rItem ) const override
                             { return static_cast< ValueT >( rItem.GetValue() ); }
-    virtual void        SetItemValue( ItemT& rItem, ValueT aValue ) const SAL_OVERRIDE
+    virtual void        SetItemValue( ItemT& rItem, ValueT aValue ) const override
                             { rItem.SetValue( static_cast< InternalValueT >( aValue ) ); }
 };
 
diff --git a/include/svtools/iconview.hxx b/include/svtools/iconview.hxx
index 2865f6c54bc4..0bc974051f0d 100644
--- a/include/svtools/iconview.hxx
+++ b/include/svtools/iconview.hxx
@@ -28,9 +28,9 @@ class IconView : public SvTreeListBox
 public:
     IconView( vcl::Window* pParent, WinBits nBits );
 
-    virtual void Resize() SAL_OVERRIDE;
+    virtual void Resize() override;
 
-    virtual tools::Rectangle GetFocusRect( SvTreeListEntry*, long nEntryPos ) SAL_OVERRIDE;
+    virtual tools::Rectangle GetFocusRect( SvTreeListEntry*, long nEntryPos ) override;
 
     void ClearAll();
 
diff --git a/include/svx/fmdmod.hxx b/include/svx/fmdmod.hxx
index d05d2983598f..667a259d02e4 100644
--- a/include/svx/fmdmod.hxx
+++ b/include/svx/fmdmod.hxx
@@ -30,8 +30,8 @@ public:
 
     virtual ~SvxFmMSFactory() {}
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance(const OUString& ServiceSpecifier) SAL_OVERRIDE;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() SAL_OVERRIDE;
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance(const OUString& ServiceSpecifier) override;
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override;
 };
 
 #endif // INCLUDED_SVX_FMDMOD_HXX
diff --git a/include/vbahelper/vbareturntypes.hxx b/include/vbahelper/vbareturntypes.hxx
index 47d74bc51530..8a500ff24f94 100644
--- a/include/vbahelper/vbareturntypes.hxx
+++ b/include/vbahelper/vbareturntypes.hxx
@@ -37,9 +37,9 @@ namespace ooo
             T1 mnValue;
             public:
             DefaultReturnHelper( const T1& nValue ) : mnValue( nValue ) {}
-            virtual void  SAL_CALL setValue( T1 nValue ) SAL_OVERRIDE { mnValue = nValue; }
-            virtual T1  SAL_CALL getValue() SAL_OVERRIDE { return mnValue; }
-            OUString SAL_CALL getDefaultPropertyName(  ) SAL_OVERRIDE { return OUString("Value"); }
+            virtual void  SAL_CALL setValue( T1 nValue ) override { mnValue = nValue; }
+            virtual T1  SAL_CALL getValue() override { return mnValue; }
+            OUString SAL_CALL getDefaultPropertyName(  ) override { return OUString("Value"); }
         };
 
         typedef DefaultReturnHelper< sal_Int32, ov::msforms::XReturnInteger > ReturnInteger_BASE;
diff --git a/include/vcl/notebookbar.hxx b/include/vcl/notebookbar.hxx
index 535f157e7810..1e9ab288d9b4 100644
--- a/include/vcl/notebookbar.hxx
+++ b/include/vcl/notebookbar.hxx
@@ -26,11 +26,11 @@ friend class NotebookBarContextChangeEventListener;
 public:
     NotebookBar(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame);
     virtual ~NotebookBar() override;
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     virtual bool PreNotify( NotifyEvent& rNEvt ) override;
-    virtual Size GetOptimalSize() const SAL_OVERRIDE;
-    virtual void setPosSizePixel(long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All) SAL_OVERRIDE;
+    virtual Size GetOptimalSize() const override;
+    virtual void setPosSizePixel(long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All) override;
     virtual void Resize() override;
 
     void SetSystemWindow(SystemWindow* pSystemWindow);
diff --git a/include/xmloff/fasttokenhandler.hxx b/include/xmloff/fasttokenhandler.hxx
index 8c926457179d..a95b3506a5f1 100644
--- a/include/xmloff/fasttokenhandler.hxx
+++ b/include/xmloff/fasttokenhandler.hxx
@@ -68,11 +68,11 @@ public:
     virtual ~FastTokenHandler() override;
 
     // XFastTokenHandler
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken ) SAL_OVERRIDE;
-    virtual sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) SAL_OVERRIDE;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken ) override;
+    virtual sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) override;
 
     // Much faster direct C++ shortcut to the method that matters
-    virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength ) const SAL_OVERRIDE;
+    virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength ) const override;
 
 private:
     TokenMap& mrTokenMap;