diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
| commit | 567ef6d5782cdb729b49005caf6005610ce03e22 (patch) | |
| tree | 7e3be1da41382e555d9091914ef7e064852a4fd4 /include/formula | |
| parent | c36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff) | |
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
Diffstat (limited to 'include/formula')
| -rw-r--r-- | include/formula/formula.hxx | 4 | ||||
| -rw-r--r-- | include/formula/funcutl.hxx | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx index 41a6ef5167c3..62f22d16d878 100644 --- a/include/formula/formula.hxx +++ b/include/formula/formula.hxx @@ -64,7 +64,7 @@ private: protected: - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputDoneAfter( bool bForced = false ); @@ -108,7 +108,7 @@ protected: protected: - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputDoneAfter( bool bForced = false ); diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx index ecd2ace89bca..18e94ab20a4d 100644 --- a/include/formula/funcutl.hxx +++ b/include/formula/funcutl.hxx @@ -39,9 +39,9 @@ private: DECL_LINK( UpdateHdl, void* ); protected: - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; public: RefEdit( Window* _pParent,IControlReferenceHandler* pParent, Window* pShrinkModeLabel, const ResId& rResId ); @@ -59,8 +59,8 @@ public: using Edit::SetText; - void SetText( const OUString& rStr ); - virtual void Modify(); + void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual void Modify() SAL_OVERRIDE; void StartUpdateData(); @@ -89,10 +89,10 @@ private: RefEdit* pRefEdit; // zugeordnetes Edit-Control protected: - virtual void Click(); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void Click() SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; public: RefButton(Window* _pParent, const ResId& rResId); |