Second batch of adding SAL_OVERRIDE to overriding function declarations

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

Change-Id: Ie656f9d653fc716f72ac175925272696d509038f

30 files changed, 107 insertions, 107 deletions

diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx
index be7ee6442f54..836b2f61389f 100644
--- a/cui/source/options/cfgchart.hxx
+++ b/cui/source/options/cfgchart.hxx
@@ -83,8 +83,8 @@ public:
     const SvxChartColorTable&   GetDefaultColors();
     void                        SetDefaultColors( const SvxChartColorTable& aCol );
 
-    virtual void                Commit();
-    virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames);
+    virtual void                Commit() SAL_OVERRIDE;
+    virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE;
 };
 
 
@@ -97,8 +97,8 @@ public:
     SvxChartColorTableItem( sal_uInt16 nWhich, const SvxChartColorTable& );
     SvxChartColorTableItem( const SvxChartColorTableItem& );
 
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual bool            operator==( const SfxPoolItem& ) const;
+    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+    virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
     void                    SetOptions( SvxChartOptions* pOpts ) const;
 
     const SvxChartColorTable & GetColorList() const ;
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index b00df7aad0d6..3f5b16260c62 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -47,9 +47,9 @@ namespace offapp
     public:
         DriverListControl(Window* _pParent);
 
-        virtual void Init();
+        virtual void Init() SAL_OVERRIDE;
                 void Update(const DriverPoolingSettings& _rSettings);
-        virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const;
+        virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const SAL_OVERRIDE;
 
         // the handler will be called with a DriverPoolingSettings::const_iterator as parameter,
         // or NULL if no valid current row exists
@@ -66,22 +66,22 @@ namespace offapp
         sal_Bool    isModified() const;
 
     protected:
-        virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol );
-        virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol );
+        virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ) SAL_OVERRIDE;
+        virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ) SAL_OVERRIDE;
 
-        virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const;
+        virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const SAL_OVERRIDE;
 
-        virtual bool SeekRow( long nRow );
-        virtual bool SaveModified();
+        virtual bool SeekRow( long nRow ) SAL_OVERRIDE;
+        virtual bool SaveModified() SAL_OVERRIDE;
 
-        virtual bool IsTabAllowed(bool _bForward) const;
+        virtual bool IsTabAllowed(bool _bForward) const SAL_OVERRIDE;
 
-        virtual void StateChanged( StateChangedType nStateChange );
+        virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
 
-        virtual void CursorMoved();
+        virtual void CursorMoved() SAL_OVERRIDE;
 
     protected:
-        virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId);
+        virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) SAL_OVERRIDE;
 
 
     private:
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index 27fef9a06487..10f0003b3421 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -54,11 +54,11 @@ namespace offapp
         static SfxTabPage*  Create(Window* _pParent, const SfxItemSet& _rAttrSet);
 
     protected:
-        virtual bool        Notify( NotifyEvent& _rNEvt );
+        virtual bool        Notify( NotifyEvent& _rNEvt ) SAL_OVERRIDE;
 
-        virtual bool        FillItemSet(SfxItemSet& _rSet);
-        virtual void        Reset(const SfxItemSet& _rSet);
-        virtual void        ActivatePage( const SfxItemSet& _rSet);
+        virtual bool        FillItemSet(SfxItemSet& _rSet) SAL_OVERRIDE;
+        virtual void        Reset(const SfxItemSet& _rSet) SAL_OVERRIDE;
+        virtual void        ActivatePage( const SfxItemSet& _rSet) SAL_OVERRIDE;
 
     protected:
         DECL_LINK( OnEnabledDisabled, const CheckBox* );
diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx
index f9e8a4e55fa5..59a4a8d6e47b 100644
--- a/cui/source/options/connpoolsettings.hxx
+++ b/cui/source/options/connpoolsettings.hxx
@@ -87,8 +87,8 @@ namespace offapp
 
         DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings );
 
-        virtual bool             operator==( const SfxPoolItem& ) const;
-        virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
+        virtual bool             operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+        virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
 
         const DriverPoolingSettings& getSettings() const    { return m_aSettings; }
     };
diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx
index c3fb36806cd0..687b87a6695c 100644
--- a/cui/source/options/dbregistersettings.hxx
+++ b/cui/source/options/dbregistersettings.hxx
@@ -76,8 +76,8 @@ namespace svx
 
         DatabaseMapItem( sal_uInt16 _nId, const DatabaseRegistrations& _rRegistrations );
 
-        virtual bool             operator==( const SfxPoolItem& ) const;
-        virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
+        virtual bool             operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+        virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
 
         const DatabaseRegistrations&
                                 getRegistrations() const { return m_aRegistrations; }
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index bbc891555c9e..e299ed225bd5 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -36,9 +36,9 @@ class SvxFontSubstCheckListBox : public SvSimpleTable
     using SvTreeListBox::SetCheckButtonState;
 
     protected:
-        virtual void    SetTabs();
-        virtual void    KeyInput( const KeyEvent& rKEvt );
-        virtual void    Resize();
+        virtual void    SetTabs() SAL_OVERRIDE;
+        virtual void    KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
+        virtual void    Resize() SAL_OVERRIDE;
 
     public:
         SvxFontSubstCheckListBox(SvSimpleTableContainer& rParent, WinBits nBits)
@@ -96,8 +96,8 @@ class SvxFontSubstTabPage : public SfxTabPage
 
 public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet);
-    virtual bool        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
 };
 
 
diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx
index 2fb211d0c5eb..d9c355e62802 100644
--- a/cui/source/options/optHeaderTabListbox.cxx
+++ b/cui/source/options/optHeaderTabListbox.cxx
@@ -35,7 +35,7 @@ public:
         SvLBoxString( pEntry, nFlags, rTxt ) {}
 
     virtual void Paint(
-        const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry);
+        const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE;
 };
 
 
diff --git a/cui/source/options/optHeaderTabListbox.hxx b/cui/source/options/optHeaderTabListbox.hxx
index d495ba319763..e591a438a052 100644
--- a/cui/source/options/optHeaderTabListbox.hxx
+++ b/cui/source/options/optHeaderTabListbox.hxx
@@ -30,7 +30,7 @@ namespace svx
     public:
         OptHeaderTabListBox(SvSimpleTableContainer& rParent, WinBits nBits);
 
-        virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind);
+        virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) SAL_OVERRIDE;
     };
 } // svx
 #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTHEADERTABLISTBOX_HXX
diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx
index e9a11d4a37b2..55c614e628e0 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -35,8 +35,8 @@ public:
         , bNumericOnly(false)
     {}
 
-    virtual void KeyInput( const KeyEvent& rKeyEvent );
-    virtual Size GetOptimalSize() const;
+    virtual void KeyInput( const KeyEvent& rKeyEvent ) SAL_OVERRIDE;
+    virtual Size GetOptimalSize() const SAL_OVERRIDE;
     //void setBehaviour( bool bNumeric, int nLengthLimit);
 };
 
@@ -65,7 +65,7 @@ public:
    com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > getConfigAccess( const OUString& sNodePath, sal_Bool bUpdate );
    virtual bool FillItemSet( /* SfxItemSet& rSet*/ );
 
-   virtual Size GetOptimalSize() const;
+   virtual Size GetOptimalSize() const SAL_OVERRIDE;
 };
 
 class CuiAboutConfigValueDialog : public ModalDialog
diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx
index 400d3ebe1f74..1cdc671a053f 100644
--- a/cui/source/options/optaccessibility.hxx
+++ b/cui/source/options/optaccessibility.hxx
@@ -46,8 +46,8 @@ public:
     virtual ~SvxAccessibilityOptionsTabPage();
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
-    virtual bool        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
 };
 
 #endif
diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx
index 13c8490383a9..3890ce1e26ba 100644
--- a/cui/source/options/optbasic.hxx
+++ b/cui/source/options/optbasic.hxx
@@ -41,9 +41,9 @@ public:
     ~SvxBasicIDEOptionsPage();
 
     static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
-    virtual bool FillItemSet( SfxItemSet& rSet );
-    virtual void Reset( const SfxItemSet& rSet );
-    virtual void FillUserData();
+    virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void FillUserData() SAL_OVERRIDE;
 };
 
 
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index d91ebb6b6149..b15926782ef9 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -64,8 +64,8 @@ public:
     void    Construct();
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rInAttrs );
-    virtual bool        FillItemSet( SfxItemSet& rOutAttrs );
-    virtual void        Reset( const SfxItemSet& rInAttrs );
+    virtual bool        FillItemSet( SfxItemSet& rOutAttrs ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE;
 };
 
 #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTCHART_HXX
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index f29162d19ebb..79ec9b289363 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -266,11 +266,11 @@ private:
     void SetAppearance();
 
 private:
-    virtual void Command (CommandEvent const& rCEvt);
-    virtual void DataChanged (DataChangedEvent const& rDCEvt);
+    virtual void Command (CommandEvent const& rCEvt) SAL_OVERRIDE;
+    virtual void DataChanged (DataChangedEvent const& rDCEvt) SAL_OVERRIDE;
 
-    virtual Size calculateRequisition() const;
-    virtual void setAllocation(const Size &rAllocation);
+    virtual Size calculateRequisition() const SAL_OVERRIDE;
+    virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE;
 
     bool IsGroupVisible (Group) const;
 };
@@ -838,9 +838,9 @@ class ColorConfigCtrl_Impl : public VclVBox
     DECL_LINK(ColorHdl, ColorListBox*);
     DECL_LINK(ControlFocusHdl, Control*);
 
-    virtual bool PreNotify (NotifyEvent& rNEvt);
-    virtual void Command (CommandEvent const& rCEvt);
-    virtual void DataChanged (DataChangedEvent const& rDCEvt);
+    virtual bool PreNotify (NotifyEvent& rNEvt) SAL_OVERRIDE;
+    virtual void Command (CommandEvent const& rCEvt) SAL_OVERRIDE;
+    virtual void DataChanged (DataChangedEvent const& rDCEvt) SAL_OVERRIDE;
 public:
     ColorConfigCtrl_Impl(Window* pParent);
     ~ColorConfigCtrl_Impl();
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index 4c6216cf9f27..580b535a694c 100644
--- a/cui/source/options/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
@@ -52,11 +52,11 @@ public:
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual bool        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
 
-    virtual int         DeactivatePage( SfxItemSet* pSet );
-    virtual void        FillUserData();
+    virtual int         DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
+    virtual void        FillUserData() SAL_OVERRIDE;
 
 };
 
diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx
index 32ae80c86873..326718bee03f 100644
--- a/cui/source/options/optctl.hxx
+++ b/cui/source/options/optctl.hxx
@@ -48,8 +48,8 @@ public:
     virtual ~SvxCTLOptionsPage();
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
-    virtual bool        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
 };
 
 #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTCTL_HXX
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index 9ee8a71c36a4..fe01a122a480 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -46,8 +46,8 @@ public:
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet );
 
-    virtual bool        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
 };
 
 class OfaMSFilterTabPage2 : public SfxTabPage
@@ -62,9 +62,9 @@ class OfaMSFilterTabPage2 : public SfxTabPage
         SvButtonState   GetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol ) const;
         void            SetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol, SvButtonState );
     protected:
-        virtual void    SetTabs();
-        virtual void    HBarClick();
-        virtual void    KeyInput( const KeyEvent& rKEvt );
+        virtual void    SetTabs() SAL_OVERRIDE;
+        virtual void    HBarClick() SAL_OVERRIDE;
+        virtual void    KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
 
     public:
         MSFltrSimpleTable(SvSimpleTableContainer& rParent, WinBits nBits = 0)
@@ -95,8 +95,8 @@ public:
 
     static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual bool        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
 };
 
 
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 8c28f7ac31a4..cd5fcd2ded2f 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -62,7 +62,7 @@ private:
     DECL_LINK( OnFileDlgToggled, void* );
 #endif
 protected:
-    virtual int         DeactivatePage( SfxItemSet* pSet = NULL );
+    virtual int         DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
 
 public:
     OfaMiscTabPage( Window* pParent, const SfxItemSet& rSet );
@@ -70,8 +70,8 @@ public:
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual bool        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
 };
 
 // class OfaViewTabPage --------------------------------------------------
@@ -125,8 +125,8 @@ public:
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual bool        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
 };
 
 struct LanguageConfig_Impl;
@@ -167,8 +167,8 @@ public:
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual bool        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
 };
 #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTGDLG_HXX
 
diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx
index 2aa122f930ff..1bab77f331ed 100644
--- a/cui/source/options/opthtml.hxx
+++ b/cui/source/options/opthtml.hxx
@@ -59,8 +59,8 @@ public:
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet );
 
-    virtual bool        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
 
 };
 
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 759c68152165..bd37cc5c6aee 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -1114,8 +1114,8 @@ public:
     MailerProgramCfg_Impl();
     virtual ~MailerProgramCfg_Impl();
 
-    virtual void    Commit();
-    virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames);
+    virtual void    Commit() SAL_OVERRIDE;
+    virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE;
 };
 
 /* -------------------------------------------------------------------------*/
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 5b7243f85171..e02f3735e0a9 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -49,9 +49,9 @@ public:
         : Edit(pParent, nStyle)
         , bOnlyNumeric(false)
     {}
-    virtual void KeyInput(const KeyEvent& rKEvent);
-    virtual void Modify();
-    virtual bool set_property(const OString &rKey, const OString &rValue);
+    virtual void KeyInput(const KeyEvent& rKEvent) SAL_OVERRIDE;
+    virtual void Modify() SAL_OVERRIDE;
+    virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE;
 };
 
 // class SvxProxyTabPage -------------------------------------------------
@@ -105,8 +105,8 @@ private:
 
 public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
-    virtual bool        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
 };
 
 // #98647# class SvxScriptExecListBox ------------------------------------
@@ -119,7 +119,7 @@ public:
             :ListBox(pParent, rResId) {}
 
 protected:
-    virtual void RequestHelp( const HelpEvent& rHEvt );
+    virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
 };
 
 // class SvxSecurityTabPage ---------------------------------------------
@@ -170,13 +170,13 @@ private:
     virtual     ~SvxSecurityTabPage();
 
 protected:
-    virtual void        ActivatePage( const SfxItemSet& rSet );
-    virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
+    virtual void        ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual int         DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
 
 public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
-    virtual bool        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
 };
 
 class MozPluginTabPage : public SfxTabPage
@@ -195,8 +195,8 @@ public:
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet );
 
-    virtual bool        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
 
 };
 
@@ -220,8 +220,8 @@ public:
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual bool        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
 };
 
 #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTINET2_HXX
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index be81c0c49baf..41a82f6f436f 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -120,7 +120,7 @@ public:
         aStaticTabs[4] = aStaticTabs[3] + nVersionWidth;
         SvSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL);
     }
-    virtual void Resize()
+    virtual void Resize() SAL_OVERRIDE
     {
         svx::SvxRadioButtonListBox::Resize();
         setColSizes();
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 6a438f739b50..1cf0f9657e84 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -109,9 +109,9 @@ public:
 
     static SfxTabPage*      Create( Window* pParent, const SfxItemSet& rSet );
 
-    virtual bool            FillItemSet( SfxItemSet& rSet );
-    virtual void            Reset( const SfxItemSet& rSet );
-    virtual void            FillUserData();
+    virtual bool            FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void            Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void            FillUserData() SAL_OVERRIDE;
 };
 
 // class SvxJavaParameterDlg ---------------------------------------------
@@ -141,7 +141,7 @@ public:
     SvxJavaParameterDlg( Window* pParent );
     ~SvxJavaParameterDlg();
 
-    virtual short           Execute();
+    virtual short           Execute() SAL_OVERRIDE;
 
     ::com::sun::star::uno::Sequence< OUString > GetParameters() const;
     void SetParameters( ::com::sun::star::uno::Sequence< OUString >& rParams );
diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx
index 6262375083e3..b6fc3a39a3fe 100644
--- a/cui/source/options/optjsearch.hxx
+++ b/cui/source/options/optjsearch.hxx
@@ -66,8 +66,8 @@ public:
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
 
-    virtual void        Reset( const SfxItemSet& rSet );
-    virtual bool        FillItemSet( SfxItemSet& rSet );
+    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual bool        FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
 
     sal_Bool                IsSaveOptions() const           { return bSaveOptions; }
     void                EnableSaveOptions( sal_Bool bVal )  { bSaveOptions = bVal; }
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index acf6a1269c22..0eaf290583cc 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -284,7 +284,7 @@ public:
         const OUString& rStr ) : SvLBoxString( pEntry, nFlags, rStr ) {}
 
     virtual void Paint(
-        const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry);
+        const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE;
 };
 
 void BrwStringDic_Impl::Paint(
@@ -464,7 +464,7 @@ public:
         const OUString& rStr ) : SvLBoxString( pEntry, nFlags, rStr ) {}
 
     virtual void Paint(
-        const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry);
+        const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE;
 };
 
 void BrwString_Impl::Paint(
diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx
index cba5303e1b36..276cc1ea94d1 100644
--- a/cui/source/options/optmemory.hxx
+++ b/cui/source/options/optmemory.hxx
@@ -53,7 +53,7 @@ private:
     inline void         SetNfGraphicObjectCacheMax( long nSizeInBytes );
     inline void         SetNfGraphicObjectCacheLast( long nSizeInBytes );
 protected:
-    virtual int         DeactivatePage( SfxItemSet* pSet = NULL );
+    virtual int         DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
 
 public:
     OfaMemoryOptionsPage( Window* pParent, const SfxItemSet& rSet );
@@ -61,8 +61,8 @@ public:
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual bool        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
 };
 
 
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index b1a1485c6c7b..810c1af3e3b6 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -76,8 +76,8 @@ public:
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual bool        FillItemSet( SfxItemSet& rSet );
-    virtual void        Reset( const SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
 };
 
 #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTSAVE_HXX
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index 53e049161aa9..6b3b261358ad 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -56,9 +56,9 @@ public:
 
     static SfxTabPage*      Create( Window* pParent, const SfxItemSet& rSet );
 
-    virtual bool            FillItemSet( SfxItemSet& rSet );
-    virtual void            Reset( const SfxItemSet& rSet );
-    virtual void            FillUserData();
+    virtual bool            FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void            Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void            FillUserData() SAL_OVERRIDE;
 };
 
 
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index db323d061b90..e7197f5ff375 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -32,10 +32,10 @@ public:
     static SfxTabPage* Create( Window *pParent, const SfxItemSet &rSet );
 
     /// Apply the settings ([OK] button).
-    virtual bool FillItemSet( SfxItemSet &rSet );
+    virtual bool FillItemSet( SfxItemSet &rSet ) SAL_OVERRIDE;
 
     /// Reset to default settings ([Revert] button).
-    virtual void Reset( const SfxItemSet &rSet );
+    virtual void Reset( const SfxItemSet &rSet ) SAL_OVERRIDE;
 
 private:
     /// Handle the Persona selection
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 287c1a525e5b..fa5d8901f0ef 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -256,8 +256,8 @@ public:
     MailMergeCfg_Impl();
     virtual ~MailMergeCfg_Impl();
 
-    virtual void    Commit();
-    virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames);
+    virtual void    Commit() SAL_OVERRIDE;
+    virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE;
 
     sal_Bool IsEmailSupported() const {return bIsEmailSupported;}
 
diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx
index 38c06a51110a..44dc8e3bbefa 100644
--- a/cui/source/options/webconninfo.hxx
+++ b/cui/source/options/webconninfo.hxx
@@ -38,7 +38,7 @@ namespace svx
         void InsertHeaderItem(sal_uInt16 nColumn, const OUString& rText, HeaderBarItemBits nBits);
         void setColWidths();
         void Resort( bool bForced );
-        virtual void Resize();
+        virtual void Resize() SAL_OVERRIDE;
     };