First batch of adding SAL_OVERRRIDE to overriding function declarations

...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.

Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a

21 files changed, 271 insertions, 267 deletions

diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 85c664ac4e2a..36196de95439 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -87,8 +87,8 @@ class GtkSalTimer : public SalTimer
 public:
     GtkSalTimer();
     ~GtkSalTimer();
-    virtual void Start( sal_uLong nMS );
-    virtual void Stop();
+    virtual void Start( sal_uLong nMS ) SAL_OVERRIDE;
+    virtual void Stop() SAL_OVERRIDE;
     bool         Expired();
 
     sal_uLong    m_nTimeoutMS;
@@ -105,7 +105,7 @@ public:
     virtual ~GtkData();
 
     virtual void Init();
-    virtual void Dispose();
+    virtual void Dispose() SAL_OVERRIDE;
 
     virtual void initNWF();
     virtual void deInitNWF();
@@ -116,8 +116,8 @@ public:
     void Yield( bool bWait, bool bHandleAllCurrentEvents );
     inline GdkDisplay *GetGdkDisplay();
 
-    virtual void ErrorTrapPush();
-    virtual bool ErrorTrapPop( bool bIgnoreError );
+    virtual void ErrorTrapPush() SAL_OVERRIDE;
+    virtual bool ErrorTrapPop( bool bIgnoreError ) SAL_OVERRIDE;
 };
 
 class GtkSalFrame;
@@ -145,9 +145,13 @@ public:
 
     GtkSalSystem* getSystem() const { return m_pSys; }
 
-    virtual void deregisterFrame( SalFrame* pFrame );
+    virtual void deregisterFrame( SalFrame* pFrame ) SAL_OVERRIDE;
     GdkCursor *getCursor( PointerStyle ePointerStyle );
+#if GTK_CHECK_VERSION(3,0,0)
     virtual int CaptureMouse( SalFrame* pFrame );
+#else
+    virtual int CaptureMouse( SalFrame* pFrame ) SAL_OVERRIDE;
+#endif
 
     int          GetDefaultScreen() { return m_pSys->GetDisplayBuiltInScreen(); }
     SalX11Screen GetDefaultXScreen() { return m_pSys->GetDisplayDefaultXScreen(); }
@@ -156,7 +160,7 @@ public:
 #if GTK_CHECK_VERSION(3,0,0)
 //    int          GetScreenCount() { return m_pSys->GetDisplayScreenCount(); }
 #else
-    virtual ScreenData *initScreen( SalX11Screen nXScreen ) const;
+    virtual ScreenData *initScreen( SalX11Screen nXScreen ) const SAL_OVERRIDE;
 #endif
 
     GdkFilterReturn filterGdkEvent( GdkXEvent* sys_event,
@@ -166,12 +170,12 @@ public:
     void screenSizeChanged( GdkScreen* );
     void monitorsChanged( GdkScreen* );
 
-    virtual void PostUserEvent();
+    virtual void PostUserEvent() SAL_OVERRIDE;
 
 #if GTK_CHECK_VERSION(3,0,0)
     guint32 GetLastUserEventTime( bool /* b */ ) { return GDK_CURRENT_TIME; } // horrible hack
 #else
-    virtual bool Dispatch( XEvent *pEvent );
+    virtual bool Dispatch( XEvent *pEvent ) SAL_OVERRIDE;
 #endif
 };
 
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 76a8ec5f83b4..4466ca6dc155 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -351,100 +351,100 @@ public:
 
     // SalGraphics or NULL, but two Graphics for all SalFrames
     // must be returned
-    virtual SalGraphics*        AcquireGraphics();
-    virtual void                ReleaseGraphics( SalGraphics* pGraphics );
+    virtual SalGraphics*        AcquireGraphics() SAL_OVERRIDE;
+    virtual void                ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
 
     // Event must be destroyed, when Frame is destroyed
     // When Event is called, SalInstance::Yield() must be returned
-    virtual bool                PostEvent( void* pData );
+    virtual bool                PostEvent( void* pData ) SAL_OVERRIDE;
 
-    virtual void                SetTitle( const OUString& rTitle );
-    virtual void                SetIcon( sal_uInt16 nIcon );
-    virtual void                SetMenu( SalMenu *pSalMenu );
+    virtual void                SetTitle( const OUString& rTitle ) SAL_OVERRIDE;
+    virtual void                SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE;
+    virtual void                SetMenu( SalMenu *pSalMenu ) SAL_OVERRIDE;
     virtual SalMenu*            GetMenu( void );
-    virtual void                DrawMenuBar();
+    virtual void                DrawMenuBar() SAL_OVERRIDE;
     void                        EnsureAppMenuWatch();
 
-    virtual void                SetExtendedFrameStyle( SalExtStyle nExtStyle );
+    virtual void                SetExtendedFrameStyle( SalExtStyle nExtStyle ) SAL_OVERRIDE;
     // Before the window is visible, a resize event
     // must be sent with the correct size
-    virtual void                Show( bool bVisible, bool bNoActivate = false );
-    virtual void                Enable( bool bEnable );
+    virtual void                Show( bool bVisible, bool bNoActivate = false ) SAL_OVERRIDE;
+    virtual void                Enable( bool bEnable ) SAL_OVERRIDE;
     // Set ClientSize and Center the Window to the desktop
     // and send/post a resize message
-    virtual void                SetMinClientSize( long nWidth, long nHeight );
-    virtual void                SetMaxClientSize( long nWidth, long nHeight );
-    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags );
-    virtual void                GetClientSize( long& rWidth, long& rHeight );
-    virtual void                GetWorkArea( Rectangle& rRect );
-    virtual SalFrame*           GetParent() const;
-    virtual void                SetWindowState( const SalFrameState* pState );
-    virtual bool            GetWindowState( SalFrameState* pState );
-    virtual void                ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay );
+    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;
     // Enable/Disable ScreenSaver, SystemAgents, ...
-    virtual void                StartPresentation( bool bStart );
+    virtual void                StartPresentation( bool bStart ) SAL_OVERRIDE;
     // Show Window over all other Windows
-    virtual void                SetAlwaysOnTop( bool bOnTop );
+    virtual void                SetAlwaysOnTop( bool bOnTop ) SAL_OVERRIDE;
 
     // Window to top and grab focus
-    virtual void                ToTop( sal_uInt16 nFlags );
+    virtual void                ToTop( sal_uInt16 nFlags ) SAL_OVERRIDE;
 
     // this function can call with the same
     // pointer style
-    virtual void                SetPointer( PointerStyle ePointerStyle );
-    virtual void                CaptureMouse( bool bMouse );
-    virtual void                SetPointerPos( long nX, long nY );
+    virtual void                SetPointer( PointerStyle ePointerStyle ) SAL_OVERRIDE;
+    virtual void                CaptureMouse( bool bMouse ) SAL_OVERRIDE;
+    virtual void                SetPointerPos( long nX, long nY ) SAL_OVERRIDE;
 
     // flush output buffer
     using SalFrame::Flush;
-    virtual void                Flush();
+    virtual void                Flush() SAL_OVERRIDE;
     // flush output buffer, wait till outstanding operations are done
-    virtual void                Sync();
+    virtual void                Sync() SAL_OVERRIDE;
 
-    virtual void                SetInputContext( SalInputContext* pContext );
-    virtual void                EndExtTextInput( sal_uInt16 nFlags );
+    virtual void                SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE;
+    virtual void                EndExtTextInput( sal_uInt16 nFlags ) SAL_OVERRIDE;
 
-    virtual OUString              GetKeyName( sal_uInt16 nKeyCode );
-    virtual bool            MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
+    virtual OUString              GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
+    virtual bool            MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) SAL_OVERRIDE;
 
     // returns the input language used for the last key stroke
     // may be LANGUAGE_DONTKNOW if not supported by the OS
-    virtual LanguageType        GetInputLanguage();
+    virtual LanguageType        GetInputLanguage() SAL_OVERRIDE;
 
-    virtual void                UpdateSettings( AllSettings& rSettings );
+    virtual void                UpdateSettings( AllSettings& rSettings ) SAL_OVERRIDE;
 
-    virtual void                Beep();
+    virtual void                Beep() SAL_OVERRIDE;
 
     // returns system data (most prominent: window handle)
-    virtual const SystemEnvData*    GetSystemData() const;
+    virtual const SystemEnvData*    GetSystemData() const SAL_OVERRIDE;
 
 
     // get current modifier and button mask
-    virtual SalPointerState     GetPointerState();
+    virtual SalPointerState     GetPointerState() SAL_OVERRIDE;
 
-    virtual SalIndicatorState   GetIndicatorState();
+    virtual SalIndicatorState   GetIndicatorState() SAL_OVERRIDE;
 
-    virtual void                SimulateKeyPress( sal_uInt16 nKeyCode );
+    virtual void                SimulateKeyPress( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
 
     // set new parent window
-    virtual void                SetParent( SalFrame* pNewParent );
+    virtual void                SetParent( SalFrame* pNewParent ) SAL_OVERRIDE;
     // reparent window to act as a plugin; implementation
     // may choose to use a new system window internally
     // return false to indicate failure
-    virtual bool                SetPluginParent( SystemParentData* pNewParent );
+    virtual bool                SetPluginParent( SystemParentData* pNewParent ) SAL_OVERRIDE;
 
-    virtual void                SetScreenNumber( unsigned int );
-    virtual void                SetApplicationID( const OUString &rWMClass );
+    virtual void                SetScreenNumber( unsigned int ) SAL_OVERRIDE;
+    virtual void                SetApplicationID( const OUString &rWMClass ) SAL_OVERRIDE;
 
     // shaped system windows
     // set clip region to none (-> rectangular windows, normal state)
-    virtual void                    ResetClipRegion();
+    virtual void                    ResetClipRegion() SAL_OVERRIDE;
     // start setting the clipregion consisting of nRects rectangles
-    virtual void                    BeginSetClipRegion( sal_uLong nRects );
+    virtual void                    BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE;
     // add a rectangle to the clip region
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
     // done setting up the clipregion
-    virtual void                    EndSetClipRegion();
+    virtual void                    EndSetClipRegion() SAL_OVERRIDE;
 
     static GtkSalFrame             *getFromWindow( GtkWindow *pWindow );
 
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index d3c540b0307f..d13ad94aa785 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -134,30 +134,30 @@ public:
     static  bool        bNeedPixmapPaint;
 
     // native widget methods
-    virtual bool        IsNativeControlSupported( ControlType nType, ControlPart nPart );
+    virtual bool        IsNativeControlSupported( ControlType nType, ControlPart nPart ) SAL_OVERRIDE;
     virtual bool        hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                               const Point& aPos, bool& rIsInside ) SAL_OVERRIDE;
     virtual bool        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                            ControlState nState, const ImplControlValue& aValue,
-                                           const OUString& rCaption );
+                                           const OUString& rCaption ) SAL_OVERRIDE;
     virtual bool        getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
                                                 const ImplControlValue& aValue, const OUString& rCaption,
-                                                Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
+                                                Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) SAL_OVERRIDE;
 
     //helper methods for frame's UpdateSettings
     void updateSettings( AllSettings& rSettings );
     static void refreshFontconfig( GtkSettings *pSettings );
     static void signalSettingsNotify( GObject*, GParamSpec *pSpec, gpointer );
 
-    virtual bool            setClipRegion( const Region& );
-    virtual void            ResetClipRegion();
+    virtual bool            setClipRegion( const Region& ) SAL_OVERRIDE;
+    virtual void            ResetClipRegion() SAL_OVERRIDE;
 
     // some themes set the background pixmap of our window EVERY time
     // a control is painted; but presentation effects need
     // the background set to None; workaround: set the background
     // before copyBits
     virtual void            copyBits( const SalTwoRect& rPosAry,
-                                      SalGraphics* pSrcGraphics );
+                                      SalGraphics* pSrcGraphics ) SAL_OVERRIDE;
 
 protected:
     typedef std::list< Rectangle > clipList;
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 750382073935..259611112651 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -42,8 +42,8 @@ class GtkYieldMutex : public SalYieldMutex
 
 public:
                         GtkYieldMutex();
-    virtual void        acquire();
-    virtual void        release();
+    virtual void        acquire() SAL_OVERRIDE;
+    virtual void        release() SAL_OVERRIDE;
 
     void ThreadsEnter();
     void ThreadsLeave();
diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx
index 34710ff87f64..11a38e940b34 100644
--- a/vcl/inc/unx/gtk/gtkobject.hxx
+++ b/vcl/inc/unx/gtk/gtkobject.hxx
@@ -44,18 +44,18 @@ public:
     virtual ~GtkSalObject();
 
     // overload all pure virtual methods
-     virtual void                   ResetClipRegion();
-    virtual sal_uInt16              GetClipRegionType();
-    virtual void                    BeginSetClipRegion( sal_uLong nRects );
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
-    virtual void                    EndSetClipRegion();
+     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 );
-    virtual void                    Show( bool bVisible );
+    virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
+    virtual void                    Show( bool bVisible ) SAL_OVERRIDE;
 
-    virtual void                                    SetForwardKey( bool bEnable );
+    virtual void                                    SetForwardKey( bool bEnable ) SAL_OVERRIDE;
 
-    virtual const SystemEnvData*    GetSystemData() const;
+    virtual const SystemEnvData*    GetSystemData() const SAL_OVERRIDE;
 };
 
 #endif // INCLUDED_VCL_INC_UNX_GTK_GTKOBJECT_HXX
diff --git a/vcl/inc/unx/gtk/gtkprn.hxx b/vcl/inc/unx/gtk/gtkprn.hxx
index 8e955a32d1d7..56dfe8bfb1cb 100644
--- a/vcl/inc/unx/gtk/gtkprn.hxx
+++ b/vcl/inc/unx/gtk/gtkprn.hxx
@@ -27,8 +27,8 @@ public:
     virtual bool StartJob(
             const OUString* i_pFileName, const OUString& i_rJobName,
             const OUString& i_rAppName, ImplJobSetup* io_pSetupData,
-            vcl::PrinterController& io_rController);
-    virtual bool EndJob();
+            vcl::PrinterController& io_rController) SAL_OVERRIDE;
+    virtual bool EndJob() SAL_OVERRIDE;
 
 private:
     bool impl_doJob(
@@ -44,7 +44,7 @@ private:
 class VCL_DLLPUBLIC GtkSalInfoPrinter : public PspSalInfoPrinter
 {
 public:
-    sal_uLong GetCapabilities(const ImplJobSetup* i_pSetupData, sal_uInt16 i_nType);
+    sal_uLong GetCapabilities(const ImplJobSetup* i_pSetupData, sal_uInt16 i_nType) SAL_OVERRIDE;
 };
 
 
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index a2e59e77fb4f..c9df33c7bb76 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -58,21 +58,21 @@ public:
     GtkSalMenu( bool bMenuBar );
     virtual ~GtkSalMenu();
 
-    virtual bool            VisibleMenuBar();   // must return TRUE to actually DISPLAY native menu bars
+    virtual bool            VisibleMenuBar() SAL_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 );
-    virtual void                RemoveItem( unsigned nPos );
-    virtual void                SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos );
-    virtual void                SetFrame( const SalFrame* pFrame );
+    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 const GtkSalFrame*  GetFrame() const;
-    virtual void                CheckItem( unsigned nPos, bool bCheck );
-    virtual void                EnableItem( unsigned nPos, bool bEnable );
-    virtual void                ShowItem( unsigned nPos, bool bShow );
-    virtual void                SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText );
-    virtual void                SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage);
-    virtual void                SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName );
-    virtual void                GetSystemMenuData( SystemMenuData* pData );
+    virtual void                CheckItem( unsigned nPos, bool bCheck ) SAL_OVERRIDE;
+    virtual void                EnableItem( unsigned nPos, bool bEnable ) SAL_OVERRIDE;
+    virtual void                ShowItem( unsigned nPos, bool bShow ) 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 KeyCode& rKeyCode, const OUString& rKeyName ) SAL_OVERRIDE;
+    virtual void                GetSystemMenuData( SystemMenuData* pData ) SAL_OVERRIDE;
 
     virtual void                SetMenu( Menu* pMenu ) { mpVCLMenu = pMenu; }
     virtual Menu*               GetMenu() { return mpVCLMenu; }
diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx
index 46c6402e357d..1c6a7621bc0c 100644
--- a/vcl/inc/unx/gtk/gtksys.hxx
+++ b/vcl/inc/unx/gtk/gtksys.hxx
@@ -26,15 +26,15 @@ public:
     virtual ~GtkSalSystem();
     static   GtkSalSystem *GetSingleton();
 
-    virtual bool          IsUnifiedDisplay();
-    virtual unsigned int  GetDisplayScreenCount();
-    virtual unsigned int  GetDisplayBuiltInScreen();
-    virtual OUString GetDisplayScreenName                  (unsigned int nScreen);
-    virtual Rectangle     GetDisplayScreenPosSizePixel   (unsigned int nScreen);
+    virtual bool          IsUnifiedDisplay() SAL_OVERRIDE;
+    virtual unsigned int  GetDisplayScreenCount() SAL_OVERRIDE;
+    virtual unsigned int  GetDisplayBuiltInScreen() SAL_OVERRIDE;
+    virtual OUString GetDisplayScreenName                  (unsigned int nScreen) SAL_OVERRIDE;
+    virtual Rectangle     GetDisplayScreenPosSizePixel   (unsigned int nScreen) SAL_OVERRIDE;
     virtual int           ShowNativeDialog (const OUString&              rTitle,
                                             const OUString&              rMessage,
                                             const std::list< OUString >& rButtons,
-                                            int                        nDefButton);
+                                            int                        nDefButton) SAL_OVERRIDE;
     SalX11Screen      GetDisplayDefaultXScreen()
             { return getXScreenFromDisplayScreen( GetDisplayBuiltInScreen() ); }
     int               GetDisplayXScreenCount();
diff --git a/vcl/inc/unx/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx
index bec53de9f708..4bb50d0ad473 100644
--- a/vcl/inc/unx/i18n_status.hxx
+++ b/vcl/inc/unx/i18n_status.hxx
@@ -43,8 +43,8 @@ public:
     X11ImeStatus() {}
     virtual ~X11ImeStatus();
 
-    virtual bool canToggle();
-    virtual void toggle();
+    virtual bool canToggle() SAL_OVERRIDE;
+    virtual void toggle() SAL_OVERRIDE;
 };
 
 class I18NStatus
diff --git a/vcl/inc/unx/kde/kdedata.hxx b/vcl/inc/unx/kde/kdedata.hxx
index 53537afd66db..e2d28dee7f62 100644
--- a/vcl/inc/unx/kde/kdedata.hxx
+++ b/vcl/inc/unx/kde/kdedata.hxx
@@ -30,9 +30,9 @@ public:
     KDEData( SalInstance *pInstance ) : X11SalData( SAL_DATA_KDE3, pInstance ) {}
     virtual ~KDEData();
 
-    virtual void Init();
-    virtual void initNWF();
-    virtual void deInitNWF();
+    virtual void Init() SAL_OVERRIDE;
+    virtual void initNWF() SAL_OVERRIDE;
+    virtual void deInitNWF() SAL_OVERRIDE;
 };
 
 class SalKDEDisplay : public SalX11Display
@@ -62,11 +62,11 @@ public:
     KDESalFrame( SalFrame* pParent, sal_uLong );
     virtual ~KDESalFrame();
 
-    virtual SalGraphics* AcquireGraphics();
-    virtual void ReleaseGraphics( SalGraphics *pGraphics );
-    virtual void updateGraphics( bool bClear );
-    virtual void UpdateSettings( AllSettings& rSettings );
-    virtual void Show( bool bVisible, bool bNoActivate );
+    virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE;
+    virtual void ReleaseGraphics( SalGraphics *pGraphics ) SAL_OVERRIDE;
+    virtual void updateGraphics( bool bClear ) SAL_OVERRIDE;
+    virtual void UpdateSettings( AllSettings& rSettings ) SAL_OVERRIDE;
+    virtual void Show( bool bVisible, bool bNoActivate ) SAL_OVERRIDE;
 };
 
 class KDESalInstance : public X11SalInstance
@@ -75,13 +75,13 @@ public:
     KDESalInstance( SalYieldMutex* pMutex )
             : X11SalInstance( pMutex ) {}
     virtual ~KDESalInstance() {}
-    virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle );
+    virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ) SAL_OVERRIDE;
 
-    virtual bool hasNativeFileSelection() const { return true; }
+    virtual bool hasNativeFileSelection() const SAL_OVERRIDE { return true; }
 
     virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFilePicker2 >
         createFilePicker( const com::sun::star::uno::Reference<
-                              com::sun::star::uno::XComponentContext >& );
+                              com::sun::star::uno::XComponentContext >& ) SAL_OVERRIDE;
 };
 
 class KDEXLib : public SalXLib
@@ -100,7 +100,7 @@ public:
         m_nFakeCmdLineArgs( 0 )
         {}
     virtual ~KDEXLib();
-    virtual void Init();
+    virtual void Init() SAL_OVERRIDE;
 
     void doStartup();
 };
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index 1d22fbd4e2dc..f472d51e834f 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -118,18 +118,18 @@ public:
                                     const Size& rSize,
                                     sal_uInt16 nBitCount,
                                     const BitmapPalette& rPal
-                                );
+                                ) SAL_OVERRIDE;
 
-    virtual bool                Create( const SalBitmap& rSalBmp );
+    virtual bool                Create( const SalBitmap& rSalBmp ) SAL_OVERRIDE;
     virtual bool                Create(
                                     const SalBitmap& rSalBmp,
                                     SalGraphics* pGraphics
-                                );
+                                ) SAL_OVERRIDE;
 
     virtual bool                Create(
                                     const SalBitmap& rSalBmp,
                                     sal_uInt16 nNewBitCount
-                                );
+                                ) SAL_OVERRIDE;
 
     virtual bool                Create(
                                     const ::com::sun::star::uno::Reference<
@@ -137,16 +137,16 @@ public:
                                     > xBitmapCanvas,
                                     Size& rSize,
                                     bool bMask = false
-                                );
+                                ) SAL_OVERRIDE;
 
-    virtual void                Destroy();
+    virtual void                Destroy() SAL_OVERRIDE;
 
-    virtual Size                GetSize() const;
-    virtual sal_uInt16          GetBitCount() const;
+    virtual Size                GetSize() const SAL_OVERRIDE;
+    virtual sal_uInt16          GetBitCount() const SAL_OVERRIDE;
 
-    virtual BitmapBuffer*       AcquireBuffer( bool bReadOnly );
-    virtual void                ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly );
-    virtual bool                GetSystemData( BitmapSystemData& rData );
+    virtual BitmapBuffer*       AcquireBuffer( bool bReadOnly ) SAL_OVERRIDE;
+    virtual void                ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) SAL_OVERRIDE;
+    virtual bool                GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE;
 };
 
 
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index f5890bc06e53..f2f7b1e8cc15 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -63,7 +63,7 @@ public:
     virtual ~X11SalData();
 
     virtual void            Init();
-    virtual void            Dispose();
+    virtual void            Dispose() SAL_OVERRIDE;
 
     virtual void            initNWF();
     virtual void            deInitNWF();
@@ -78,8 +78,8 @@ public:
     void                    Timeout() const;
 
     // X errors
-    virtual void            ErrorTrapPush();
-    virtual bool            ErrorTrapPop( bool bIgnoreError );
+    virtual void            ErrorTrapPush() SAL_OVERRIDE;
+    virtual bool            ErrorTrapPop( bool bIgnoreError ) SAL_OVERRIDE;
     void                    XError( Display *pDisp, XErrorEvent *pEvent );
     bool                    HasXErrorOccurred() const
                                 { return m_aXErrorHandlerStack.back().m_bWas; }
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 5d179e71b89a..564f78f7286f 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -378,7 +378,7 @@ public:
 
     std::list< SalObject* >& getSalObjects() { return m_aSalObjects; }
 
-    virtual void    PostUserEvent() = 0;
+    virtual void    PostUserEvent() SAL_OVERRIDE = 0;
 };
 
 inline GC SalDisplay::GetGC( sal_uInt16 nDepth, SalX11Screen nXScreen ) const
@@ -397,9 +397,9 @@ public:
              SalX11Display( Display* pDisp );
     virtual ~SalX11Display();
 
-    virtual bool        Dispatch( XEvent *pEvent );
+    virtual bool        Dispatch( XEvent *pEvent ) SAL_OVERRIDE;
     virtual void        Yield();
-    virtual void        PostUserEvent();
+    virtual void        PostUserEvent() SAL_OVERRIDE;
 
     bool            IsEvent();
     void                SetupInput( SalI18N_InputMethod *pInputMethod );
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 931764170861..8b0d0fa67028 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -210,67 +210,67 @@ public:
     bool                    appendUnicodeSequence( sal_Unicode );
     bool                    endUnicodeSequence();
 
-    virtual SalGraphics*        AcquireGraphics();
-    virtual void                ReleaseGraphics( SalGraphics* pGraphics );
+    virtual SalGraphics*        AcquireGraphics() SAL_OVERRIDE;
+    virtual void                ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
 
     // call with true to clear graphics (setting None as drawable)
     // call with false to setup graphics with window (GetWindow())
     virtual void                updateGraphics( bool bClear );
 
-    virtual bool                PostEvent( void* pData );
-
-    virtual void                SetTitle( const OUString& rTitle );
-    virtual void                SetIcon( sal_uInt16 nIcon );
-    virtual void                SetMenu( SalMenu* pMenu );
-    virtual void                                DrawMenuBar();
-
-    virtual void                SetExtendedFrameStyle( SalExtStyle nExtStyle );
-    virtual void                Show( bool bVisible, bool bNoActivate = false );
-    virtual void                Enable( bool bEnable );
-    virtual void                SetMinClientSize( long nWidth, long nHeight );
-    virtual void                SetMaxClientSize( long nWidth, long nHeight );
-    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags );
-    virtual void                GetClientSize( long& rWidth, long& rHeight );
-    virtual void                GetWorkArea( Rectangle& rRect );
-    virtual SalFrame*           GetParent() const;
-    virtual void                SetWindowState( const SalFrameState* pState );
-    virtual bool                GetWindowState( SalFrameState* pState );
-    virtual void                ShowFullScreen( bool bFullScreen, sal_Int32 nMonitor );
-    virtual void                StartPresentation( bool bStart );
-    virtual void                SetAlwaysOnTop( bool bOnTop );
-    virtual void                ToTop( sal_uInt16 nFlags );
-    virtual void                SetPointer( PointerStyle ePointerStyle );
-    virtual void                CaptureMouse( bool bMouse );
-    virtual void                SetPointerPos( long nX, long nY );
+    virtual bool                PostEvent( void* pData ) SAL_OVERRIDE;
+
+    virtual void                SetTitle( const OUString& rTitle ) SAL_OVERRIDE;
+    virtual void                SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE;
+    virtual void                SetMenu( SalMenu* pMenu ) SAL_OVERRIDE;
+    virtual void                                DrawMenuBar() SAL_OVERRIDE;
+
+    virtual void                SetExtendedFrameStyle( SalExtStyle nExtStyle ) SAL_OVERRIDE;
+    virtual void                Show( bool bVisible, bool bNoActivate = false ) SAL_OVERRIDE;
+    virtual void                Enable( bool bEnable ) 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 nMonitor ) 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;
     using SalFrame::Flush;
-    virtual void                Flush();
-    virtual void                Sync();
-    virtual void                SetInputContext( SalInputContext* pContext );
-    virtual void                EndExtTextInput( sal_uInt16 nFlags );
-    virtual OUString              GetKeyName( sal_uInt16 nKeyCode );
-    virtual bool                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
-    virtual LanguageType        GetInputLanguage();
-    virtual void                UpdateSettings( AllSettings& rSettings );
-    virtual void                Beep();
-    virtual const SystemEnvData*    GetSystemData() const;
-    virtual SalPointerState     GetPointerState();
-    virtual SalIndicatorState   GetIndicatorState();
-    virtual void                SimulateKeyPress( sal_uInt16 nKeyCode );
-    virtual void                SetParent( SalFrame* pNewParent );
-    virtual bool                SetPluginParent( SystemParentData* pNewParent );
-
-    virtual void                SetScreenNumber( unsigned int );
-    virtual void                SetApplicationID( const OUString &rWMClass );
+    virtual void                Flush() SAL_OVERRIDE;
+    virtual void                Sync() SAL_OVERRIDE;
+    virtual void                SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE;
+    virtual void                EndExtTextInput( sal_uInt16 nFlags ) SAL_OVERRIDE;
+    virtual OUString              GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
+    virtual bool                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, 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 SalIndicatorState   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                SetScreenNumber( unsigned int ) SAL_OVERRIDE;
+    virtual void                SetApplicationID( const OUString &rWMClass ) SAL_OVERRIDE;
 
     // shaped system windows
     // set clip region to none (-> rectangular windows, normal state)
-    virtual void                    ResetClipRegion();
+    virtual void                    ResetClipRegion() SAL_OVERRIDE;
     // start setting the clipregion consisting of nRects rectangles
-    virtual void                    BeginSetClipRegion( sal_uIntPtr nRects );
+    virtual void                    BeginSetClipRegion( sal_uIntPtr nRects ) SAL_OVERRIDE;
     // add a rectangle to the clip region
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
     // done setting up the clipregion
-    virtual void                    EndSetClipRegion();
+    virtual void                    EndSetClipRegion() SAL_OVERRIDE;
 
     static Bool checkKeyReleaseForRepeat( Display*, XEvent*, XPointer pX11SalFrame );
 
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index dc7a46ab8967..527aa87406b0 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -207,33 +207,33 @@ public:
     SalX11Screen            GetScreenNumber() const { return m_nXScreen; }
 
     // overload all pure virtual methods
-    virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY );
-    virtual sal_uInt16          GetBitCount() const;
-    virtual long            GetGraphicsWidth() const;
+    virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) SAL_OVERRIDE;
+    virtual sal_uInt16          GetBitCount() const SAL_OVERRIDE;
+    virtual long            GetGraphicsWidth() const SAL_OVERRIDE;
     virtual long            GetGraphicsHeight() const;
 
-    virtual void            ResetClipRegion();
-    virtual bool            setClipRegion( const Region& );
+    virtual void            ResetClipRegion() SAL_OVERRIDE;
+    virtual bool            setClipRegion( const Region& ) SAL_OVERRIDE;
 
-    virtual void            SetLineColor();
-    virtual void            SetLineColor( SalColor nSalColor );
-    virtual void            SetFillColor();
+    virtual void            SetLineColor() SAL_OVERRIDE;
+    virtual void            SetLineColor( SalColor nSalColor ) SAL_OVERRIDE;
+    virtual void            SetFillColor() SAL_OVERRIDE;
 
-    virtual void            SetFillColor( SalColor nSalColor );
+    virtual void            SetFillColor( SalColor nSalColor ) SAL_OVERRIDE;
 
-    virtual void            SetXORMode( bool bSet, bool );
+    virtual void            SetXORMode( bool bSet, bool ) SAL_OVERRIDE;
 
-    virtual void            SetROPLineColor( SalROPColor nROPColor );
-    virtual void            SetROPFillColor( SalROPColor nROPColor );
+    virtual void            SetROPLineColor( SalROPColor nROPColor ) SAL_OVERRIDE;
+    virtual void            SetROPFillColor( SalROPColor nROPColor ) SAL_OVERRIDE;
 
-    virtual void            SetTextColor( SalColor nSalColor );
-    virtual sal_uInt16          SetFont( FontSelectPattern*, int nFallbackLevel );
-    virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel );
-    virtual const ImplFontCharMap* GetImplFontCharMap() const;
-    virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
-    virtual void            GetDevFontList( PhysicalFontCollection* );
-    virtual void ClearDevFontCache();
-    virtual bool            AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName );
+    virtual void            SetTextColor( SalColor nSalColor ) SAL_OVERRIDE;
+    virtual sal_uInt16          SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE;
+    virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE;
+    virtual const ImplFontCharMap* GetImplFontCharMap() const SAL_OVERRIDE;
+    virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE;
+    virtual void            GetDevFontList( PhysicalFontCollection* ) SAL_OVERRIDE;
+    virtual void ClearDevFontCache() SAL_OVERRIDE;
+    virtual bool            AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) SAL_OVERRIDE;
     virtual bool            CreateFontSubset( const OUString& rToFile,
                                               const PhysicalFontFace*,
                                               sal_GlyphId* pGlyphIDs,
@@ -241,53 +241,53 @@ public:
                                               sal_Int32* pWidths,
                                               int nGlyphs,
                                               FontSubsetInfo& rInfo
-                                              );
-    virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded );
+                                              ) SAL_OVERRIDE;
+    virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded ) SAL_OVERRIDE;
     virtual const void* GetEmbedFontData( const PhysicalFontFace*,
                                           const sal_Ucs* pUnicodes,
                                           sal_Int32* pWidths,
                                           FontSubsetInfo& rInfo,
-                                          long* pDataLen );
-    virtual void            FreeEmbedFontData( const void* pData, long nDataLen );
+                                          long* pDataLen ) SAL_OVERRIDE;
+    virtual void            FreeEmbedFontData( const void* pData, long nDataLen ) SAL_OVERRIDE;
     virtual void            GetGlyphWidths( const PhysicalFontFace*,
                                             bool bVertical,
                                             Int32Vector& rWidths,
-                                            Ucs2UIntMap& rUnicodeEnc );
-    virtual bool            GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& );
-    virtual bool            GetGlyphOutline( sal_GlyphId nIndex, ::basegfx::B2DPolyPolygon& );
-    virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
-    virtual void            DrawServerFontLayout( const ServerFontLayout& );
-    virtual bool            supportsOperation( OutDevSupportType ) const;
-    virtual void            drawPixel( long nX, long nY );
-    virtual void            drawPixel( long nX, long nY, SalColor nSalColor );
-    virtual void            drawLine( long nX1, long nY1, long nX2, long nY2 );
-    virtual void            drawRect( long nX, long nY, long nWidth, long nHeight );
+                                            Ucs2UIntMap& rUnicodeEnc ) SAL_OVERRIDE;
+    virtual bool            GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ) SAL_OVERRIDE;
+    virtual bool            GetGlyphOutline( sal_GlyphId nIndex, ::basegfx::B2DPolyPolygon& ) SAL_OVERRIDE;
+    virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) SAL_OVERRIDE;
+    virtual void            DrawServerFontLayout( const ServerFontLayout& ) SAL_OVERRIDE;
+    virtual bool            supportsOperation( OutDevSupportType ) const SAL_OVERRIDE;
+    virtual void            drawPixel( long nX, long nY ) SAL_OVERRIDE;
+    virtual void            drawPixel( long nX, long nY, SalColor nSalColor ) SAL_OVERRIDE;
+    virtual void            drawLine( long nX1, long nY1, long nX2, long nY2 ) SAL_OVERRIDE;
+    virtual void            drawRect( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
     void                    drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry, bool bClose );
-    virtual void            drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry );
-    virtual void            drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry );
+    virtual void            drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE;
+    virtual void            drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE;
     virtual void            drawPolyPolygon( sal_uInt32 nPoly,
                                              const sal_uInt32* pPoints,
-                                             PCONSTSALPOINT* pPtAry );
-    virtual bool            drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
+                                             PCONSTSALPOINT* pPtAry ) SAL_OVERRIDE;
+    virtual bool            drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) SAL_OVERRIDE;
     virtual bool            drawPolyLine(
         const ::basegfx::B2DPolygon&,
         double fTransparency,
         const ::basegfx::B2DVector& rLineWidth,
         basegfx::B2DLineJoin,
-        com::sun::star::drawing::LineCap);
+        com::sun::star::drawing::LineCap) SAL_OVERRIDE;
     virtual bool            drawFilledTrapezoids( const ::basegfx::B2DTrapezoid*, int nTrapCount, double fTransparency );
 
 #if 1 // TODO: remove these obselete methods
     virtual bool        drawPolyLineBezier( sal_uInt32 nPoints,
                                                 const SalPoint* pPtAry,
-                                                const sal_uInt8* pFlgAry );
+                                                const sal_uInt8* pFlgAry ) SAL_OVERRIDE;
     virtual bool        drawPolygonBezier( sal_uInt32 nPoints,
                                                const SalPoint* pPtAry,
-                                               const sal_uInt8* pFlgAry );
+                                               const sal_uInt8* pFlgAry ) SAL_OVERRIDE;
     virtual bool        drawPolyPolygonBezier( sal_uInt32 nPoly,
                                                    const sal_uInt32* pPoints,
                                                    const SalPoint* const* pPtAry,
-                                                   const sal_uInt8* const* pFlgAry );
+                                                   const sal_uInt8* const* pFlgAry ) SAL_OVERRIDE;
 #endif
 
     virtual void            copyArea( long nDestX,
@@ -296,42 +296,42 @@ public:
                                       long nSrcY,
                                       long nSrcWidth,
                                       long nSrcHeight,
-                                      sal_uInt16 nFlags );
+                                      sal_uInt16 nFlags ) SAL_OVERRIDE;
     virtual void            copyBits( const SalTwoRect& rPosAry,
-                                      SalGraphics* pSrcGraphics );
+                                      SalGraphics* pSrcGraphics ) SAL_OVERRIDE;
     virtual void            drawBitmap( const SalTwoRect& rPosAry,
-                                        const SalBitmap& rSalBitmap );
+                                        const SalBitmap& rSalBitmap ) SAL_OVERRIDE;
     virtual void            drawBitmap( const SalTwoRect& rPosAry,
                                         const SalBitmap& rSalBitmap,
-                                        SalColor nTransparentColor );
+                                        SalColor nTransparentColor ) SAL_OVERRIDE;
     virtual void            drawBitmap( const SalTwoRect& rPosAry,
                                         const SalBitmap& rSalBitmap,
-                                        const SalBitmap& rMaskBitmap );
+                                        const SalBitmap& rMaskBitmap ) SAL_OVERRIDE;
     virtual void            drawMask( const SalTwoRect& rPosAry,
                                       const SalBitmap& rSalBitmap,
-                                      SalColor nMaskColor );
-    virtual SalBitmap*      getBitmap( long nX, long nY, long nWidth, long nHeight );
-    virtual SalColor        getPixel( long nX, long nY );
-    virtual void            invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags );
-    virtual void            invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+                                      SalColor nMaskColor ) SAL_OVERRIDE;
+    virtual SalBitmap*      getBitmap( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
+    virtual SalColor        getPixel( long nX, long nY ) SAL_OVERRIDE;
+    virtual void            invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ) SAL_OVERRIDE;
+    virtual void            invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) SAL_OVERRIDE;
 
-    virtual bool            drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize );
+    virtual bool            drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ) SAL_OVERRIDE;
 
     virtual bool            drawAlphaBitmap( const SalTwoRect&,
                                              const SalBitmap& rSourceBitmap,
-                                             const SalBitmap& rAlphaBitmap );
+                                             const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE;
     virtual bool drawTransformedBitmap(
         const basegfx::B2DPoint& rNull,
         const basegfx::B2DPoint& rX,
         const basegfx::B2DPoint& rY,
         const SalBitmap& rSourceBitmap,
-        const SalBitmap* pAlphaBitmap);
+        const SalBitmap* pAlphaBitmap) SAL_OVERRIDE;
 
     virtual bool            drawAlphaRect( long nX, long nY, long nWidth,
-                                           long nHeight, sal_uInt8 nTransparency );
+                                           long nHeight, sal_uInt8 nTransparency ) SAL_OVERRIDE;
 
-    virtual SystemGraphicsData GetGraphicsData() const;
-    virtual SystemFontData     GetSysFontData( int nFallbacklevel ) const;
+    virtual SystemGraphicsData GetGraphicsData() const SAL_OVERRIDE;
+    virtual SystemFontData     GetSysFontData( int nFallbacklevel ) const SAL_OVERRIDE;
 
     /*  use to handle GraphicsExpose/NoExpose after XCopyArea & friends
      *  if pFrame is not NULL, corresponding Paint events are generated
diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
index 72330e9b53c7..cea08dd6da96 100644
--- a/vcl/inc/unx/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -74,10 +74,10 @@ public:
 
     // dtrans implementation
     virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
-        CreateClipboard( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& i_rArguments );
-    virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDragSource();
-    virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDropTarget();
-    virtual void            AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService);
+        CreateClipboard( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& i_rArguments ) SAL_OVERRIDE;
+    virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDragSource() SAL_OVERRIDE;
+    virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDropTarget() SAL_OVERRIDE;
+    virtual void            AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) SAL_OVERRIDE;
 };
 
 #endif // INCLUDED_VCL_INC_UNX_SALINST_H
diff --git a/vcl/inc/unx/salmenu.h b/vcl/inc/unx/salmenu.h
index 93dc2f0bd9de..566c8e0f78af 100644
--- a/vcl/inc/unx/salmenu.h
+++ b/vcl/inc/unx/salmenu.h
@@ -29,19 +29,19 @@ public:
     X11SalMenu() {}
     virtual ~X11SalMenu();
 
-    virtual bool VisibleMenuBar();  // must return TRUE to actually DISPLAY native menu bars
+    virtual bool VisibleMenuBar() SAL_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 );
-    virtual void RemoveItem( unsigned nPos );
-    virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos );
-    virtual void SetFrame( const SalFrame* pFrame );
-    virtual void CheckItem( unsigned nPos, bool bCheck );
-    virtual void EnableItem( unsigned nPos, bool bEnable );
-    virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText );
-    virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage);
-    virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName );
-    virtual void GetSystemMenuData( SystemMenuData* pData );
+    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 KeyCode& rKeyCode, const OUString& rKeyName ) SAL_OVERRIDE;
+    virtual void GetSystemMenuData( SystemMenuData* pData ) SAL_OVERRIDE;
 };
 
 class X11SalMenuItem : public SalMenuItem
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index 5bb5990d0d30..01fbc998cda5 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -73,17 +73,17 @@ public:
     virtual ~X11SalObject();
 
     // overload all pure virtual methods
-     virtual void                   ResetClipRegion();
-    virtual sal_uInt16                  GetClipRegionType();
-    virtual void                    BeginSetClipRegion( sal_uIntPtr nRects );
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
-    virtual void                    EndSetClipRegion();
+     virtual void                   ResetClipRegion() SAL_OVERRIDE;
+    virtual sal_uInt16                  GetClipRegionType() SAL_OVERRIDE;
+    virtual void                    BeginSetClipRegion( sal_uIntPtr 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 );
-    virtual void                    Show( bool bVisible );
-    virtual void                    GrabFocus();
+    virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
+    virtual void                    Show( bool bVisible ) SAL_OVERRIDE;
+    virtual void                    GrabFocus() SAL_OVERRIDE;
 
-    virtual const SystemEnvData*    GetSystemData() const;
+    virtual const SystemEnvData*    GetSystemData() const SAL_OVERRIDE;
 };
 
 #endif // INCLUDED_VCL_INC_UNX_SALOBJ_H
diff --git a/vcl/inc/unx/saltimer.h b/vcl/inc/unx/saltimer.h
index f93acf889452..45692f766d43 100644
--- a/vcl/inc/unx/saltimer.h
+++ b/vcl/inc/unx/saltimer.h
@@ -31,8 +31,8 @@ public:
     virtual ~X11SalTimer();
 
     // overload all pure virtual methods
-    void  Start( sal_uIntPtr nMS );
-    void  Stop();
+    void  Start( sal_uIntPtr nMS ) SAL_OVERRIDE;
+    void  Stop() SAL_OVERRIDE;
 };
 
 #endif
diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h
index b50dd087dd39..1ec20174160d 100644
--- a/vcl/inc/unx/salvd.h
+++ b/vcl/inc/unx/salvd.h
@@ -76,12 +76,12 @@ public:
     int                     GetHeight() const { return nDY_; }
     SalX11Screen            GetXScreenNumber() const { return m_nXScreen; }
 
-    virtual SalGraphics*    AcquireGraphics();
-    virtual void            ReleaseGraphics( SalGraphics* pGraphics );
+    virtual SalGraphics*    AcquireGraphics() SAL_OVERRIDE;
+    virtual void            ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
 
                             // Set new size, without saving the old contents
-    virtual bool        SetSize( long nNewDX, long nNewDY );
-    virtual void            GetSize( long& rWidth, long& rHeight );
+    virtual bool        SetSize( long nNewDX, long nNewDY ) SAL_OVERRIDE;
+    virtual void            GetSize( long& rWidth, long& rHeight ) SAL_OVERRIDE;
 };
 
 
diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx
index bdcc61e49012..47c37de7e755 100644
--- a/vcl/inc/unx/x11/x11sys.hxx
+++ b/vcl/inc/unx/x11/x11sys.hxx
@@ -32,15 +32,15 @@ public:
     virtual ~X11SalSystem();
 
     // overload pure virtual methods
-    virtual unsigned int GetDisplayScreenCount();
-    virtual bool         IsUnifiedDisplay();
-    virtual unsigned int GetDisplayBuiltInScreen();
-    virtual Rectangle    GetDisplayScreenPosSizePixel( unsigned int nScreen );
-    virtual OUString GetDisplayScreenName( unsigned int nScreen );
+    virtual unsigned int GetDisplayScreenCount() SAL_OVERRIDE;
+    virtual bool         IsUnifiedDisplay() SAL_OVERRIDE;
+    virtual unsigned int GetDisplayBuiltInScreen() SAL_OVERRIDE;
+    virtual Rectangle    GetDisplayScreenPosSizePixel( unsigned int nScreen ) SAL_OVERRIDE;
+    virtual OUString GetDisplayScreenName( unsigned int nScreen ) SAL_OVERRIDE;
     virtual int ShowNativeDialog( const OUString& rTitle,
                                   const OUString& rMessage,
                                   const std::list< OUString >& rButtons,
-                                  int nDefButton );
+                                  int nDefButton ) SAL_OVERRIDE;
 };
 
 #endif // INCLUDED_VCL_INC_UNX_X11_X11SYS_HXX