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 --- formula/source/ui/dlg/ControlHelper.hxx | 10 +++++----- formula/source/ui/dlg/FormulaHelper.cxx | 26 +++++++++++++------------- formula/source/ui/dlg/formula.cxx | 4 ++-- formula/source/ui/dlg/funcpage.hxx | 4 ++-- formula/source/ui/dlg/structpg.hxx | 12 ++++++------ 5 files changed, 28 insertions(+), 28 deletions(-) (limited to 'formula') diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index 86e2453256b9..0ab2a05eecce 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.hxx @@ -34,7 +34,7 @@ public: void SetValue( const OUString& rStrVal ); protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; private: OUString aStrValue; @@ -55,10 +55,10 @@ private: protected: - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void SelectionChanged(); - virtual void Resize(); - virtual void GetFocus(); + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; public: @@ -86,7 +86,7 @@ public: ScrollBar& rArgSlider, sal_uInt16 nArgCount ); protected: - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; private: ArgEdit* pEdPrev; diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx index 8dcb6b254f18..2de6be937413 100644 --- a/formula/source/ui/dlg/FormulaHelper.cxx +++ b/formula/source/ui/dlg/FormulaHelper.cxx @@ -33,19 +33,19 @@ namespace formula OEmptyFunctionDescription(){} virtual ~OEmptyFunctionDescription(){} - virtual OUString getFunctionName() const { return OUString(); } - virtual const IFunctionCategory* getCategory() const { return NULL; } - virtual OUString getDescription() const { return OUString(); } - virtual sal_Int32 getSuppressedArgumentCount() const { return 0; } - virtual OUString getFormula(const ::std::vector< OUString >& ) const { return OUString(); } - virtual void fillVisibleArgumentMapping(::std::vector& ) const {} - virtual void initArgumentInfo() const {} - virtual OUString getSignature() const { return OUString(); } - virtual OString getHelpId() const { return ""; } - virtual sal_uInt32 getParameterCount() const { return 0; } - virtual OUString getParameterName(sal_uInt32 ) const { return OUString(); } - virtual OUString getParameterDescription(sal_uInt32 ) const { return OUString(); } - virtual bool isParameterOptional(sal_uInt32 ) const { return false; } + virtual OUString getFunctionName() const SAL_OVERRIDE { return OUString(); } + virtual const IFunctionCategory* getCategory() const SAL_OVERRIDE { return NULL; } + virtual OUString getDescription() const SAL_OVERRIDE { return OUString(); } + virtual sal_Int32 getSuppressedArgumentCount() const SAL_OVERRIDE { return 0; } + virtual OUString getFormula(const ::std::vector< OUString >& ) const SAL_OVERRIDE { return OUString(); } + virtual void fillVisibleArgumentMapping(::std::vector& ) const SAL_OVERRIDE {} + virtual void initArgumentInfo() const SAL_OVERRIDE {} + virtual OUString getSignature() const SAL_OVERRIDE { return OUString(); } + virtual OString getHelpId() const SAL_OVERRIDE { return ""; } + virtual sal_uInt32 getParameterCount() const SAL_OVERRIDE { return 0; } + virtual OUString getParameterName(sal_uInt32 ) const SAL_OVERRIDE { return OUString(); } + virtual OUString getParameterDescription(sal_uInt32 ) const SAL_OVERRIDE { return OUString(); } + virtual bool isParameterOptional(sal_uInt32 ) const SAL_OVERRIDE { return false; } }; } diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 54ea9a6ed392..dd8ebfb64f5d 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -79,8 +79,8 @@ namespace formula virtual ~OFormulaToken() {} - virtual bool isFunction() const { return m_bIsFunction; } - virtual sal_uInt32 getArgumentCount() const { return m_nParaCount; } + virtual bool isFunction() const SAL_OVERRIDE { return m_bIsFunction; } + virtual sal_uInt32 getArgumentCount() const SAL_OVERRIDE { return m_nParaCount; } }; diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index 0ace168d4256..4065ff2f91fa 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -46,8 +46,8 @@ class FormulaListBox : public ListBox { protected: - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: FormulaListBox( Window* pParent, const ResId& rResId ); diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx index 4988f47b509f..43c5eb7efa19 100644 --- a/formula/source/ui/dlg/structpg.hxx +++ b/formula/source/ui/dlg/structpg.hxx @@ -44,7 +44,7 @@ private: sal_Bool bActiveFlag; protected: - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; public: @@ -60,8 +60,8 @@ public: void SetActiveFlag(sal_Bool bFlag=sal_True); sal_Bool GetActiveFlag(); - void GetFocus(); - void LoseFocus(); + void GetFocus() SAL_OVERRIDE; + void LoseFocus() SAL_OVERRIDE; }; @@ -94,10 +94,10 @@ public: void ClearStruct(); virtual SvTreeListEntry* InsertEntry(const OUString& rText, SvTreeListEntry* pParent, - sal_uInt16 nFlag,sal_uLong nPos=0,IFormulaToken* pScToken=NULL); + sal_uInt16 nFlag,sal_uLong nPos=0,IFormulaToken* pScToken=NULL) SAL_OVERRIDE; - virtual OUString GetEntryText(SvTreeListEntry* pEntry) const; - virtual SvTreeListEntry* GetParent(SvTreeListEntry* pEntry) const; + virtual OUString GetEntryText(SvTreeListEntry* pEntry) const SAL_OVERRIDE; + virtual SvTreeListEntry* GetParent(SvTreeListEntry* pEntry) const SAL_OVERRIDE; void SetSelectionHdl( const Link& rLink ) { aSelLink = rLink; } const Link& GetSelectionHdl() const { return aSelLink; } -- cgit v1.2.3