diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:37:00 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:39:26 +0100 |
commit | 70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch) | |
tree | a70f4957c454b443520cbf91250c41d9eea80017 /vcl/source/window/menu.cxx | |
parent | 8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff) |
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
Diffstat (limited to 'vcl/source/window/menu.cxx')
-rw-r--r-- | vcl/source/window/menu.cxx | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 65193d1d8584..2bd976881439 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -514,8 +514,8 @@ private: DECL_LINK(AutoScroll, void *); DECL_LINK( ShowHideListener, VclWindowEvent* ); - void StateChanged( StateChangedType nType ); - void DataChanged( const DataChangedEvent& rDCEvt ); + void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; protected: Region ImplCalcClipRegion( bool bIncludeLogo = true ) const; void ImplInitClipRegion(); @@ -534,14 +534,14 @@ public: void doShutdown(); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvent ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void Resize(); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; void SetFocusId( sal_uLong nId ) { nSaveFocusId = nId; } sal_uLong GetFocusId() const { return nSaveFocusId; } @@ -565,7 +565,7 @@ public: void SetPosInParent( sal_uInt16 nPos ) { nPosInParent = nPos; } sal_uInt16 GetPosInParent() const { return nPosInParent; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; }; // To get the transparent mouse-over look, the closer is actually a toolbox @@ -580,7 +580,7 @@ public: DecoToolBox( Window* pParent, WinBits nStyle = 0 ); void ImplInit(); - void DataChanged( const DataChangedEvent& rDCEvt ); + void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void SetImages( long nMaxHeight = 0, bool bForce = false ); @@ -730,10 +730,10 @@ private: DECL_LINK( ToolboxEventHdl, VclWindowEvent* ); DECL_LINK( ShowHideListener, VclWindowEvent* ); - void StateChanged( StateChangedType nType ); - void DataChanged( const DataChangedEvent& rDCEvt ); - void LoseFocus(); - void GetFocus(); + void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + void LoseFocus() SAL_OVERRIDE; + void GetFocus() SAL_OVERRIDE; public: MenuBarWindow( Window* pParent ); @@ -741,13 +741,13 @@ public: void ShowButtons( bool bClose, bool bFloat, bool bHide ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvent ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; void SetFocusId( sal_uLong nId ) { nSaveFocusId = nId; } sal_uLong GetFocusId() const { return nSaveFocusId; } @@ -757,7 +757,7 @@ public: PopupMenu* GetActivePopup() const { return pActivePopup; } void PopupClosed( Menu* pMenu ); sal_uInt16 GetHighlightedItem() const { return nHighlightedItem; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; void SetAutoPopup( bool bAuto ) { mbAutoPopup = bAuto; } void ImplLayoutChanged(); |