diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /include/svtools/calendar.hxx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'include/svtools/calendar.hxx')
-rw-r--r-- | include/svtools/calendar.hxx | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index 6bb8bf365123..da98035a8dac 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -226,7 +226,7 @@ private: SVT_DLLPRIVATE void ImplInit( WinBits nWinStyle ); SVT_DLLPRIVATE void ImplInitSettings(); - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; SVT_DLLPRIVATE void ImplGetWeekFont( vcl::Font& rFont ) const; SVT_DLLPRIVATE void ImplFormat(); @@ -258,21 +258,21 @@ protected: public: Calendar( vcl::Window* pParent, WinBits nWinStyle = 0 ); virtual ~Calendar(); - virtual void dispose() SAL_OVERRIDE; - - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Tracking( const TrackingEvent& rMEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void dispose() override; + + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void Tracking( const TrackingEvent& rMEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Resize() override; + virtual void GetFocus() override; + virtual void LoseFocus() override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void Select(); @@ -365,9 +365,9 @@ private: public: CalendarField( vcl::Window* pParent, WinBits nWinStyle ); virtual ~CalendarField(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool ShowDropDown( bool bShow ) SAL_OVERRIDE; + virtual bool ShowDropDown( bool bShow ) override; VclPtr<Calendar> CreateCalendar( vcl::Window* pParent ); Calendar* GetCalendar(); @@ -375,7 +375,7 @@ public: void EnableNone( bool bNone = true ) { mbNone = bNone; } protected: - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) override; }; #endif // INCLUDED_SVTOOLS_CALENDAR_HXX |