diff options
Diffstat (limited to 'vcl/source/window/menubarwindow.hxx')
-rw-r--r-- | vcl/source/window/menubarwindow.hxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/vcl/source/window/menubarwindow.hxx b/vcl/source/window/menubarwindow.hxx index 7621faf92898..01979047fff7 100644 --- a/vcl/source/window/menubarwindow.hxx +++ b/vcl/source/window/menubarwindow.hxx @@ -46,7 +46,7 @@ public: void ImplInit(); - void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + void DataChanged( const DataChangedEvent& rDCEvt ) override; void SetImages( long nMaxHeight = 0, bool bForce = false ); @@ -101,31 +101,31 @@ private: void ImplInitStyleSettings(); - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; DECL_LINK_TYPED( CloseHdl, ToolBox*, void ); DECL_LINK_TYPED( ToolboxEventHdl, VclWindowEvent&, void ); DECL_LINK_TYPED( ShowHideListener, VclWindowEvent&, void ); - void StateChanged( StateChangedType nType ) SAL_OVERRIDE; - void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - void LoseFocus() SAL_OVERRIDE; - void GetFocus() SAL_OVERRIDE; + void StateChanged( StateChangedType nType ) override; + void DataChanged( const DataChangedEvent& rDCEvt ) override; + void LoseFocus() override; + void GetFocus() override; public: explicit MenuBarWindow( vcl::Window* pParent ); virtual ~MenuBarWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void ShowButtons(bool bClose, bool bFloat, bool bHide); - 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( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvent ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Resize() override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; void SetFocusId(sal_uLong nId) { nSaveFocusId = nId; } sal_uLong GetFocusId() const { return nSaveFocusId; } @@ -135,7 +135,7 @@ public: void KillActivePopup(); void PopupClosed(Menu* pMenu); sal_uInt16 GetHighlightedItem() const { return nHighlightedItem; } - virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE; + virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; void SetAutoPopup(bool bAuto) { mbAutoPopup = bAuto; } void LayoutChanged(); |