From 567ef6d5782cdb729b49005caf6005610ce03e22 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 27 Mar 2014 18:12:18 +0100 Subject: 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 --- cui/source/inc/chardlg.hxx | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'cui/source/inc/chardlg.hxx') diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 68456aba4863..db0136976981 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -66,7 +66,7 @@ public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage( const SfxItemSet& rSet ); + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; }; @@ -146,8 +146,8 @@ public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - 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: ~SvxCharNamePage(); @@ -155,8 +155,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - 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; void SetFontList( const SvxFontListItem& rItem ); void EnableRelativeMode(); @@ -165,7 +165,7 @@ public: void SetPreviewBackgroundToCharacter(); void DisableControls( sal_uInt16 nDisable ); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; }; // class SvxCharEffectsPage ---------------------------------------------- @@ -228,20 +228,20 @@ private: public: using SfxTabPage::DeactivatePage; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - 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; void DisableControls( sal_uInt16 nDisable ); void EnableFlash(); /// the writer uses SID_ATTR_BRUSH as font background void SetPreviewBackgroundToCharacter(); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; }; // class SvxCharPositionPage --------------------------------------------- @@ -306,19 +306,19 @@ public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - virtual void ActivatePage( const SfxItemSet& rSet ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual void Reset( const SfxItemSet& rSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void FillUserData(); + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void FillUserData() SAL_OVERRIDE; /// the writer uses SID_ATTR_BRUSH as font background void SetPreviewBackgroundToCharacter(); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; }; // class SvxCharTwoLinesPage --------------------------------------------- @@ -349,18 +349,18 @@ public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - 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& rSet ); static sal_uInt16* GetRanges(); - 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; /// the writer uses SID_ATTR_BRUSH as font background void SetPreviewBackgroundToCharacter(); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_INC_CHARDLG_HXX -- cgit v1.2.3