Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code

Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274

8 files changed, 131 insertions, 131 deletions

diff --git a/vcl/inc/osx/a11ylistener.hxx b/vcl/inc/osx/a11ylistener.hxx
index c20f42363efc..647333cf561e 100644
--- a/vcl/inc/osx/a11ylistener.hxx
+++ b/vcl/inc/osx/a11ylistener.hxx
@@ -40,11 +40,11 @@ public:
 
     // XEventListener
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
     // XAccessibleEventListener
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
 private:
     const id m_wrapperObject;
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index 1e8a61eb3a57..4e483f8defc1 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -106,59 +106,59 @@ public:
 
     virtual ~AquaSalFrame();
 
-    virtual SalGraphics*        AcquireGraphics() SAL_OVERRIDE;
-    virtual void                ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
-    virtual bool                PostEvent(ImplSVEvent* pData) SAL_OVERRIDE;
-    virtual void                SetTitle( const OUString& rTitle ) SAL_OVERRIDE;
-    virtual void                SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE;
-    virtual void                SetRepresentedURL( const OUString& ) SAL_OVERRIDE;
-    virtual void                SetMenu( SalMenu* pSalMenu ) SAL_OVERRIDE;
-    virtual void                DrawMenuBar() SAL_OVERRIDE;
-    virtual void                Show( bool bVisible, bool bNoActivate = false ) SAL_OVERRIDE;
-    virtual void                SetMinClientSize( long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                SetMaxClientSize( long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) SAL_OVERRIDE;
-    virtual void                GetClientSize( long& rWidth, long& rHeight ) SAL_OVERRIDE;
-    virtual void                GetWorkArea( Rectangle& rRect ) SAL_OVERRIDE;
-    virtual SalFrame*           GetParent() const SAL_OVERRIDE;
-    virtual void                SetWindowState( const SalFrameState* pState ) SAL_OVERRIDE;
-    virtual bool                GetWindowState( SalFrameState* pState ) SAL_OVERRIDE;
-    virtual void                ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) SAL_OVERRIDE;
-    virtual void                StartPresentation( bool bStart ) SAL_OVERRIDE;
-    virtual void                SetAlwaysOnTop( bool bOnTop ) SAL_OVERRIDE;
-    virtual void                ToTop( sal_uInt16 nFlags ) SAL_OVERRIDE;
-    virtual void                SetPointer( PointerStyle ePointerStyle ) SAL_OVERRIDE;
-    virtual void                CaptureMouse( bool bMouse ) SAL_OVERRIDE;
-    virtual void                SetPointerPos( long nX, long nY ) SAL_OVERRIDE;
-    virtual void                Flush( void ) SAL_OVERRIDE;
-    virtual void                Flush( const Rectangle& ) SAL_OVERRIDE;
-    virtual void                Sync() SAL_OVERRIDE;
-    virtual void                SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE;
-    virtual void                EndExtTextInput( EndExtTextInputFlags nFlags ) SAL_OVERRIDE;
-    virtual OUString            GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
-    virtual bool                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) SAL_OVERRIDE;
-    virtual LanguageType        GetInputLanguage() SAL_OVERRIDE;
-    virtual void                UpdateSettings( AllSettings& rSettings ) SAL_OVERRIDE;
-    virtual void                Beep() SAL_OVERRIDE;
-    virtual const SystemEnvData*    GetSystemData() const SAL_OVERRIDE;
-    virtual SalPointerState     GetPointerState() SAL_OVERRIDE;
-    virtual KeyIndicatorState   GetIndicatorState() SAL_OVERRIDE;
-    virtual void                SimulateKeyPress( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
-    virtual void                SetParent( SalFrame* pNewParent ) SAL_OVERRIDE;
-    virtual bool                SetPluginParent( SystemParentData* pNewParent ) SAL_OVERRIDE;
-    virtual void                SetExtendedFrameStyle( SalExtStyle ) SAL_OVERRIDE;
-    virtual void                SetScreenNumber(unsigned int) SAL_OVERRIDE;
-    virtual void                SetApplicationID( const OUString &rApplicationID ) SAL_OVERRIDE;
+    virtual SalGraphics*        AcquireGraphics() override;
+    virtual void                ReleaseGraphics( SalGraphics* pGraphics ) override;
+    virtual bool                PostEvent(ImplSVEvent* pData) override;
+    virtual void                SetTitle( const OUString& rTitle ) override;
+    virtual void                SetIcon( sal_uInt16 nIcon ) override;
+    virtual void                SetRepresentedURL( const OUString& ) override;
+    virtual void                SetMenu( SalMenu* pSalMenu ) override;
+    virtual void                DrawMenuBar() override;
+    virtual void                Show( bool bVisible, bool bNoActivate = false ) override;
+    virtual void                SetMinClientSize( long nWidth, long nHeight ) override;
+    virtual void                SetMaxClientSize( long nWidth, long nHeight ) override;
+    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) override;
+    virtual void                GetClientSize( long& rWidth, long& rHeight ) override;
+    virtual void                GetWorkArea( Rectangle& rRect ) override;
+    virtual SalFrame*           GetParent() const override;
+    virtual void                SetWindowState( const SalFrameState* pState ) override;
+    virtual bool                GetWindowState( SalFrameState* pState ) override;
+    virtual void                ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) override;
+    virtual void                StartPresentation( bool bStart ) override;
+    virtual void                SetAlwaysOnTop( bool bOnTop ) override;
+    virtual void                ToTop( sal_uInt16 nFlags ) override;
+    virtual void                SetPointer( PointerStyle ePointerStyle ) override;
+    virtual void                CaptureMouse( bool bMouse ) override;
+    virtual void                SetPointerPos( long nX, long nY ) override;
+    virtual void                Flush( void ) override;
+    virtual void                Flush( const Rectangle& ) override;
+    virtual void                Sync() override;
+    virtual void                SetInputContext( SalInputContext* pContext ) override;
+    virtual void                EndExtTextInput( EndExtTextInputFlags nFlags ) override;
+    virtual OUString            GetKeyName( sal_uInt16 nKeyCode ) override;
+    virtual bool                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) override;
+    virtual LanguageType        GetInputLanguage() override;
+    virtual void                UpdateSettings( AllSettings& rSettings ) override;
+    virtual void                Beep() override;
+    virtual const SystemEnvData*    GetSystemData() const override;
+    virtual SalPointerState     GetPointerState() override;
+    virtual KeyIndicatorState   GetIndicatorState() override;
+    virtual void                SimulateKeyPress( sal_uInt16 nKeyCode ) override;
+    virtual void                SetParent( SalFrame* pNewParent ) override;
+    virtual bool                SetPluginParent( SystemParentData* pNewParent ) override;
+    virtual void                SetExtendedFrameStyle( SalExtStyle ) override;
+    virtual void                SetScreenNumber(unsigned int) override;
+    virtual void                SetApplicationID( const OUString &rApplicationID ) override;
 
     // shaped system windows
     // set clip region to none (-> rectangular windows, normal state)
-    virtual void ResetClipRegion() SAL_OVERRIDE;
+    virtual void ResetClipRegion() override;
     // start setting the clipregion consisting of nRects rectangles
-    virtual void BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE;
+    virtual void BeginSetClipRegion( sal_uLong nRects ) override;
     // add a rectangle to the clip region
-    virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
+    virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override;
     // done setting up the clipregion
-    virtual void EndSetClipRegion() SAL_OVERRIDE;
+    virtual void EndSetClipRegion() override;
 
     void UpdateFrameGeometry();
 
diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h
index 2d9895778cb4..b8d45f0f2903 100644
--- a/vcl/inc/osx/salinst.h
+++ b/vcl/inc/osx/salinst.h
@@ -43,9 +43,9 @@ class SalYieldMutex : public comphelper::SolarMutex
 
 public:
                                                 SalYieldMutex();
-    virtual void                                acquire() SAL_OVERRIDE;
-    virtual void                                release() SAL_OVERRIDE;
-    virtual bool                                tryToAcquire() SAL_OVERRIDE;
+    virtual void                                acquire() override;
+    virtual void                                release() override;
+    virtual bool                                tryToAcquire() override;
     sal_uLong                                   GetAcquireCount() const { return mnCount; }
     oslThreadIdentifier                         GetThreadId() const { return mnThreadId; }
 };
@@ -80,51 +80,51 @@ public:
     AquaSalInstance();
     virtual ~AquaSalInstance();
 
-    virtual SalFrame*       CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
-    virtual SalFrame*       CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
-    virtual void            DestroyFrame( SalFrame* pFrame ) SAL_OVERRIDE;
+    virtual SalFrame*       CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) override;
+    virtual SalFrame*       CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) override;
+    virtual void            DestroyFrame( SalFrame* pFrame ) override;
     virtual SalObject*      CreateObject( SalFrame* pParent, SystemWindowData* pWindowData,
-                                          bool bShow = true ) SAL_OVERRIDE;
-    virtual void            DestroyObject( SalObject* pObject ) SAL_OVERRIDE;
+                                          bool bShow = true ) override;
+    virtual void            DestroyObject( SalObject* pObject ) override;
     virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics,
                                                    long &nDX, long &nDY,
                                                    sal_uInt16 nBitCount,
-                                                   const SystemGraphicsData *pData ) SAL_OVERRIDE;
+                                                   const SystemGraphicsData *pData ) override;
     virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
-                                               ImplJobSetup* pSetupData ) SAL_OVERRIDE;
-    virtual void            DestroyInfoPrinter( SalInfoPrinter* pPrinter ) SAL_OVERRIDE;
-    virtual SalPrinter*     CreatePrinter( SalInfoPrinter* pInfoPrinter ) SAL_OVERRIDE;
-    virtual void            DestroyPrinter( SalPrinter* pPrinter ) SAL_OVERRIDE;
-    virtual void            GetPrinterQueueInfo( ImplPrnQueueList* pList ) SAL_OVERRIDE;
-    virtual void            GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) SAL_OVERRIDE;
-    virtual void            DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) SAL_OVERRIDE;
-    virtual OUString        GetDefaultPrinter() SAL_OVERRIDE;
-    virtual SalTimer*       CreateSalTimer() SAL_OVERRIDE;
-    virtual SalI18NImeStatus* CreateI18NImeStatus() SAL_OVERRIDE;
-    virtual SalSystem*      CreateSalSystem() SAL_OVERRIDE;
-    virtual SalBitmap*      CreateSalBitmap() SAL_OVERRIDE;
-    virtual comphelper::SolarMutex* GetYieldMutex() SAL_OVERRIDE;
-    virtual sal_uLong       ReleaseYieldMutex() SAL_OVERRIDE;
-    virtual void            AcquireYieldMutex( sal_uLong nCount ) SAL_OVERRIDE;
-    virtual bool            CheckYieldMutex() SAL_OVERRIDE;
+                                               ImplJobSetup* pSetupData ) override;
+    virtual void            DestroyInfoPrinter( SalInfoPrinter* pPrinter ) override;
+    virtual SalPrinter*     CreatePrinter( SalInfoPrinter* pInfoPrinter ) override;
+    virtual void            DestroyPrinter( SalPrinter* pPrinter ) override;
+    virtual void            GetPrinterQueueInfo( ImplPrnQueueList* pList ) override;
+    virtual void            GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) override;
+    virtual void            DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) override;
+    virtual OUString        GetDefaultPrinter() override;
+    virtual SalTimer*       CreateSalTimer() override;
+    virtual SalI18NImeStatus* CreateI18NImeStatus() override;
+    virtual SalSystem*      CreateSalSystem() override;
+    virtual SalBitmap*      CreateSalBitmap() override;
+    virtual comphelper::SolarMutex* GetYieldMutex() override;
+    virtual sal_uLong       ReleaseYieldMutex() override;
+    virtual void            AcquireYieldMutex( sal_uLong nCount ) override;
+    virtual bool            CheckYieldMutex() override;
     virtual void            DoYield(bool bWait, bool bHandleAllCurrentEvents,
-                                    sal_uLong nReleased) SAL_OVERRIDE;
-    virtual bool            AnyInput( VclInputFlags nType ) SAL_OVERRIDE;
-    virtual SalMenu*        CreateMenu( bool bMenuBar, Menu* pVCLMenu ) SAL_OVERRIDE;
-    virtual void            DestroyMenu( SalMenu* ) SAL_OVERRIDE;
-    virtual SalMenuItem*    CreateMenuItem( const SalItemParams* pItemData ) SAL_OVERRIDE;
-    virtual void            DestroyMenuItem( SalMenuItem* ) SAL_OVERRIDE;
-    virtual SalSession*     CreateSalSession() SAL_OVERRIDE;
+                                    sal_uLong nReleased) override;
+    virtual bool            AnyInput( VclInputFlags nType ) override;
+    virtual SalMenu*        CreateMenu( bool bMenuBar, Menu* pVCLMenu ) override;
+    virtual void            DestroyMenu( SalMenu* ) override;
+    virtual SalMenuItem*    CreateMenuItem( const SalItemParams* pItemData ) override;
+    virtual void            DestroyMenuItem( SalMenuItem* ) override;
+    virtual SalSession*     CreateSalSession() override;
     virtual void*           GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType,
-                                                     int& rReturnedBytes ) SAL_OVERRIDE;
+                                                     int& rReturnedBytes ) override;
     virtual void            AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType,
-                                                    const OUString& rDocumentService) SAL_OVERRIDE;
+                                                    const OUString& rDocumentService) override;
 
     // dtrans implementation
     virtual css::uno::Reference< css::uno::XInterface > CreateClipboard(
-            const css::uno::Sequence< css::uno::Any >& i_rArguments ) SAL_OVERRIDE;
-    virtual css::uno::Reference< css::uno::XInterface > CreateDragSource() SAL_OVERRIDE;
-    virtual css::uno::Reference< css::uno::XInterface > CreateDropTarget() SAL_OVERRIDE;
+            const css::uno::Sequence< css::uno::Any >& i_rArguments ) override;
+    virtual css::uno::Reference< css::uno::XInterface > CreateDragSource() override;
+    virtual css::uno::Reference< css::uno::XInterface > CreateDropTarget() override;
 
     static void handleAppDefinedEvent( NSEvent* pEvent );
 
diff --git a/vcl/inc/osx/salmenu.h b/vcl/inc/osx/salmenu.h
index 941a1b235463..ad1b29e9cb6f 100644
--- a/vcl/inc/osx/salmenu.h
+++ b/vcl/inc/osx/salmenu.h
@@ -55,24 +55,24 @@ public:
     AquaSalMenu( bool bMenuBar );
     virtual ~AquaSalMenu();
 
-    virtual bool VisibleMenuBar() SAL_OVERRIDE;
+    virtual bool VisibleMenuBar() override;
     // must return true to actually display native menu bars
     // otherwise only menu messages are processed (eg, OLE on Windows)
 
-    virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) SAL_OVERRIDE;
-    virtual void RemoveItem( unsigned nPos ) SAL_OVERRIDE;
-    virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) SAL_OVERRIDE;
-    virtual void SetFrame( const SalFrame* pFrame ) SAL_OVERRIDE;
-    virtual void CheckItem( unsigned nPos, bool bCheck ) SAL_OVERRIDE;
-    virtual void EnableItem( unsigned nPos, bool bEnable ) SAL_OVERRIDE;
-    virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ) SAL_OVERRIDE;
-    virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage) SAL_OVERRIDE;
-    virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) SAL_OVERRIDE;
-    virtual void GetSystemMenuData( SystemMenuData* pData ) SAL_OVERRIDE;
-    virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, FloatWinPopupFlags nFlags) SAL_OVERRIDE;
-    virtual bool AddMenuBarButton( const SalMenuButtonItem& ) SAL_OVERRIDE;
-    virtual void RemoveMenuBarButton( sal_uInt16 nId ) SAL_OVERRIDE;
-    virtual Rectangle GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame* i_pReferenceFrame ) SAL_OVERRIDE;
+    virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) override;
+    virtual void RemoveItem( unsigned nPos ) override;
+    virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) override;
+    virtual void SetFrame( const SalFrame* pFrame ) override;
+    virtual void CheckItem( unsigned nPos, bool bCheck ) override;
+    virtual void EnableItem( unsigned nPos, bool bEnable ) override;
+    virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ) override;
+    virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage) override;
+    virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) override;
+    virtual void GetSystemMenuData( SystemMenuData* pData ) override;
+    virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, FloatWinPopupFlags nFlags) override;
+    virtual bool AddMenuBarButton( const SalMenuButtonItem& ) override;
+    virtual void RemoveMenuBarButton( sal_uInt16 nId ) override;
+    virtual Rectangle GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame* i_pReferenceFrame ) override;
 
     int getItemIndexByPos( sal_uInt16 nPos ) const;
     const AquaSalFrame* getFrame() const;
diff --git a/vcl/inc/osx/salobj.h b/vcl/inc/osx/salobj.h
index 5db9d3e2ad1f..be7f84417047 100644
--- a/vcl/inc/osx/salobj.h
+++ b/vcl/inc/osx/salobj.h
@@ -55,14 +55,14 @@ public:
     AquaSalObject( AquaSalFrame* pFrame, SystemWindowData* pWinData );
     virtual ~AquaSalObject();
 
-    virtual void                    ResetClipRegion() SAL_OVERRIDE;
-    virtual sal_uInt16              GetClipRegionType() SAL_OVERRIDE;
-    virtual void                    BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE;
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                    EndSetClipRegion() SAL_OVERRIDE;
-    virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                    Show( bool bVisible ) SAL_OVERRIDE;
-    virtual const SystemEnvData*    GetSystemData() const SAL_OVERRIDE;
+    virtual void                    ResetClipRegion() override;
+    virtual sal_uInt16              GetClipRegionType() override;
+    virtual void                    BeginSetClipRegion( sal_uLong nRects ) override;
+    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual void                    EndSetClipRegion() override;
+    virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual void                    Show( bool bVisible ) override;
+    virtual const SystemEnvData*    GetSystemData() const override;
 };
 
 #endif // INCLUDED_VCL_INC_OSX_SALOBJ_H
diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h
index 20ac58189fbb..03c41f0a7fbd 100644
--- a/vcl/inc/osx/salprn.h
+++ b/vcl/inc/osx/salprn.h
@@ -68,20 +68,20 @@ class AquaSalInfoPrinter : public SalInfoPrinter
 
     void                        SetupPrinterGraphics( CGContextRef i_xContext ) const;
 
-    virtual SalGraphics*        AcquireGraphics() SAL_OVERRIDE;
-    virtual void                ReleaseGraphics( SalGraphics* i_pGraphics ) SAL_OVERRIDE;
-    virtual bool                Setup( SalFrame* i_pFrame, ImplJobSetup* i_pSetupData ) SAL_OVERRIDE;
-    virtual bool                SetPrinterData( ImplJobSetup* pSetupData ) SAL_OVERRIDE;
-    virtual bool                SetData( sal_uLong i_nFlags, ImplJobSetup* i_pSetupData ) SAL_OVERRIDE;
+    virtual SalGraphics*        AcquireGraphics() override;
+    virtual void                ReleaseGraphics( SalGraphics* i_pGraphics ) override;
+    virtual bool                Setup( SalFrame* i_pFrame, ImplJobSetup* i_pSetupData ) override;
+    virtual bool                SetPrinterData( ImplJobSetup* pSetupData ) override;
+    virtual bool                SetData( sal_uLong i_nFlags, ImplJobSetup* i_pSetupData ) override;
     virtual void                GetPageInfo( const ImplJobSetup* i_pSetupData,
                                              long& o_rOutWidth, long& o_rOutHeight,
                                              long& o_rPageOffX, long& o_rPageOffY,
-                                             long& o_rPageWidth, long& o_rPageHeight ) SAL_OVERRIDE;
-    virtual sal_uLong           GetCapabilities( const ImplJobSetup* i_pSetupData, PrinterCapType i_nType ) SAL_OVERRIDE;
-    virtual sal_uLong           GetPaperBinCount( const ImplJobSetup* i_pSetupData ) SAL_OVERRIDE;
-    virtual OUString            GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin ) SAL_OVERRIDE;
-    virtual void                InitPaperFormats( const ImplJobSetup* i_pSetupData ) SAL_OVERRIDE;
-    virtual int                 GetLandscapeAngle( const ImplJobSetup* i_pSetupData ) SAL_OVERRIDE;
+                                             long& o_rPageWidth, long& o_rPageHeight ) override;
+    virtual sal_uLong           GetCapabilities( const ImplJobSetup* i_pSetupData, PrinterCapType i_nType ) override;
+    virtual sal_uLong           GetPaperBinCount( const ImplJobSetup* i_pSetupData ) override;
+    virtual OUString            GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin ) override;
+    virtual void                InitPaperFormats( const ImplJobSetup* i_pSetupData ) override;
+    virtual int                 GetLandscapeAngle( const ImplJobSetup* i_pSetupData ) override;
 
     // the artificial separation between InfoPrinter and Printer
     // is not really useful for us
@@ -128,18 +128,18 @@ class AquaSalPrinter : public SalPrinter
                                               sal_uLong i_nCopies,
                                               bool i_bCollate,
                                               bool i_bDirect,
-                                              ImplJobSetup* i_pSetupData ) SAL_OVERRIDE;
+                                              ImplJobSetup* i_pSetupData ) override;
     // implement pull model print system
     virtual bool                    StartJob( const OUString* i_pFileName,
                                               const OUString& rJobName,
                                               const OUString& i_rAppName,
                                               ImplJobSetup* i_pSetupData,
-                                              vcl::PrinterController& i_rListener ) SAL_OVERRIDE;
+                                              vcl::PrinterController& i_rListener ) override;
 
-    virtual bool                    EndJob() SAL_OVERRIDE;
-    virtual SalGraphics*            StartPage( ImplJobSetup* i_pSetupData, bool i_bNewJobData ) SAL_OVERRIDE;
-    virtual bool                    EndPage() SAL_OVERRIDE;
-    virtual sal_uLong               GetErrorCode() SAL_OVERRIDE;
+    virtual bool                    EndJob() override;
+    virtual SalGraphics*            StartPage( ImplJobSetup* i_pSetupData, bool i_bNewJobData ) override;
+    virtual bool                    EndPage() override;
+    virtual sal_uLong               GetErrorCode() override;
 
     private:
     AquaSalPrinter( const AquaSalPrinter& ) = delete;
diff --git a/vcl/inc/osx/salsys.h b/vcl/inc/osx/salsys.h
index 74832c7d7a66..863c73e4635c 100644
--- a/vcl/inc/osx/salsys.h
+++ b/vcl/inc/osx/salsys.h
@@ -33,13 +33,13 @@ public:
     virtual ~AquaSalSystem();
 
     // get info about the display
-    virtual unsigned int GetDisplayScreenCount() SAL_OVERRIDE;
-    virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) SAL_OVERRIDE;
+    virtual unsigned int GetDisplayScreenCount() override;
+    virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) override;
 
     virtual int ShowNativeMessageBox( const OUString& rTitle,
                                       const OUString& rMessage,
                                       int nButtonCombination,
-                                      int nDefaultButton, bool bUseResources) SAL_OVERRIDE;
+                                      int nDefaultButton, bool bUseResources) override;
 };
 
 #endif // INCLUDED_VCL_INC_OSX_SALSYS_H
diff --git a/vcl/inc/osx/saltimer.h b/vcl/inc/osx/saltimer.h
index b751a81c7778..9d8926bba3e3 100644
--- a/vcl/inc/osx/saltimer.h
+++ b/vcl/inc/osx/saltimer.h
@@ -33,8 +33,8 @@ class AquaSalTimer : public SalTimer
     AquaSalTimer();
     virtual ~AquaSalTimer();
 
-    void Start( sal_uLong nMS ) SAL_OVERRIDE;
-    void Stop() SAL_OVERRIDE;
+    void Start( sal_uLong nMS ) override;
+    void Stop() override;
 
     static void handleStartTimerEvent( NSEvent* pEvent );