summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /vcl/source/window
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/dockmgr.cxx40
-rw-r--r--vcl/source/window/dockwin.cxx20
-rw-r--r--vcl/source/window/menubarwindow.hxx30
-rw-r--r--vcl/source/window/menufloatingwindow.hxx26
-rw-r--r--vcl/source/window/scrwnd.hxx8
-rw-r--r--vcl/source/window/winproc.cxx6
6 files changed, 65 insertions, 65 deletions
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 4eba0364c448..05a08f599ca7 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -57,16 +57,16 @@ public:
ImplDockFloatWin2( vcl::Window* pParent, WinBits nWinBits,
ImplDockingWindowWrapper* pDockingWin );
virtual ~ImplDockFloatWin2();
- virtual void dispose() SAL_OVERRIDE;
-
- virtual void Move() SAL_OVERRIDE;
- virtual void Resize() SAL_OVERRIDE;
- virtual void TitleButtonClick( TitleButton nButton ) SAL_OVERRIDE;
- virtual void Pin() SAL_OVERRIDE;
- virtual void Roll() SAL_OVERRIDE;
- virtual void PopupModeEnd() SAL_OVERRIDE;
- virtual void Resizing( Size& rSize ) SAL_OVERRIDE;
- virtual bool Close() SAL_OVERRIDE;
+ virtual void dispose() override;
+
+ virtual void Move() override;
+ virtual void Resize() override;
+ virtual void TitleButtonClick( TitleButton nButton ) override;
+ virtual void Pin() override;
+ virtual void Roll() override;
+ virtual void PopupModeEnd() override;
+ virtual void Resizing( Size& rSize ) override;
+ virtual bool Close() override;
};
ImplDockFloatWin2::ImplDockFloatWin2( vcl::Window* pParent, WinBits nWinBits,
@@ -479,16 +479,16 @@ private:
public:
ImplPopupFloatWin( vcl::Window* pParent, ImplDockingWindowWrapper* pDockingWin, bool bHasGrip );
virtual ~ImplPopupFloatWin();
- virtual void dispose() SAL_OVERRIDE;
-
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE;
- virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
- 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 Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE;
- virtual void Resize() SAL_OVERRIDE;
- virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE;
+ virtual void dispose() override;
+
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override;
+ virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
+ virtual void MouseMove( const MouseEvent& rMEvt ) override;
+ virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
+ virtual void MouseButtonUp( const MouseEvent& rMEvt ) override;
+ virtual void Tracking( const TrackingEvent& rTEvt ) override;
+ virtual void Resize() override;
+ virtual vcl::Window* GetPreferredKeyInputWindow() override;
Rectangle GetDragRect() const;
Point GetToolboxPosition() const;
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index eba4cf2e2f21..083fd0e9a4bf 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -73,16 +73,16 @@ public:
ImplDockFloatWin( vcl::Window* pParent, WinBits nWinBits,
DockingWindow* pDockingWin );
virtual ~ImplDockFloatWin();
- virtual void dispose() SAL_OVERRIDE;
-
- virtual void Move() SAL_OVERRIDE;
- virtual void Resize() SAL_OVERRIDE;
- virtual void TitleButtonClick( TitleButton nButton ) SAL_OVERRIDE;
- virtual void Pin() SAL_OVERRIDE;
- virtual void Roll() SAL_OVERRIDE;
- virtual void PopupModeEnd() SAL_OVERRIDE;
- virtual void Resizing( Size& rSize ) SAL_OVERRIDE;
- virtual bool Close() SAL_OVERRIDE;
+ virtual void dispose() override;
+
+ virtual void Move() override;
+ virtual void Resize() override;
+ virtual void TitleButtonClick( TitleButton nButton ) override;
+ virtual void Pin() override;
+ virtual void Roll() override;
+ virtual void PopupModeEnd() override;
+ virtual void Resizing( Size& rSize ) override;
+ virtual bool Close() override;
};
ImplDockFloatWin::ImplDockFloatWin( vcl::Window* pParent, WinBits nWinBits,
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();
diff --git a/vcl/source/window/menufloatingwindow.hxx b/vcl/source/window/menufloatingwindow.hxx
index 2b555aaefc7a..8797d4ba9361 100644
--- a/vcl/source/window/menufloatingwindow.hxx
+++ b/vcl/source/window/menufloatingwindow.hxx
@@ -63,8 +63,8 @@ private:
DECL_LINK_TYPED( AutoScroll, Timer *, void );
DECL_LINK_TYPED( ShowHideListener, VclWindowEvent&, void );
- virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE;
- virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
+ virtual void StateChanged( StateChangedType nType ) override;
+ virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
void InitMenuClipRegion(vcl::RenderContext& rRenderContext);
@@ -86,19 +86,19 @@ public:
MenuFloatingWindow(Menu* pMenu, vcl::Window* pParent, WinBits nStyle);
virtual ~MenuFloatingWindow();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void doShutdown();
- 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(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
- virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
- virtual void Resize() 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 Command(const CommandEvent& rCEvt) override;
+ virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
+ virtual void RequestHelp( const HelpEvent& rHEvt ) override;
+ virtual void Resize() override;
- virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
+ virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
void SetFocusId( sal_uLong nId ) { nSaveFocusId = nId; }
sal_uLong GetFocusId() const { return nSaveFocusId; }
@@ -120,7 +120,7 @@ public:
void SetPosInParent( sal_uInt16 nPos ) { nPosInParent = nPos; }
- virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE;
+ virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override;
};
#endif // INCLUDED_VCL_SOURCE_WINDOW_MENUFLOATINGWINDOW_HXX
diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx
index c096509ffcfb..101fd356c7f2 100644
--- a/vcl/source/window/scrwnd.hxx
+++ b/vcl/source/window/scrwnd.hxx
@@ -63,15 +63,15 @@ private:
protected:
- virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
- virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
- virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+ virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override;
+ virtual void MouseMove( const MouseEvent& rMEvt ) override;
+ virtual void MouseButtonUp( const MouseEvent& rMEvt ) override;
public:
explicit ImplWheelWindow( vcl::Window* pParent );
virtual ~ImplWheelWindow();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void ImplStop();
void ImplSetWheelMode( sal_uLong nWheelMode );
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index ef92f616b4f3..16696ec38694 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1500,7 +1500,7 @@ public:
m_aWheelData = CommandWheelData(rEvt.mnDelta, rEvt.mnNotchDelta, rEvt.mnScrollLines, nMode, nCode, bHorz, bPixel);
}
- virtual bool CallCommand(vcl::Window *pWindow, const Point &rMousePos) SAL_OVERRIDE
+ virtual bool CallCommand(vcl::Window *pWindow, const Point &rMousePos) override
{
return ImplCallWheelCommand(pWindow, rMousePos, &m_aWheelData);
}
@@ -1569,7 +1569,7 @@ public:
{
m_aSwipeData = CommandSwipeData(rEvt.mnVelocityX);
}
- virtual bool CallCommand(vcl::Window *pWindow, const Point &/*rMousePos*/) SAL_OVERRIDE
+ virtual bool CallCommand(vcl::Window *pWindow, const Point &/*rMousePos*/) override
{
return ImplCallCommand(pWindow, CommandEventId::Swipe, &m_aSwipeData);
}
@@ -1591,7 +1591,7 @@ public:
{
m_aLongPressData = CommandLongPressData(rEvt.mnX, rEvt.mnY);
}
- virtual bool CallCommand(vcl::Window *pWindow, const Point &/*rMousePos*/) SAL_OVERRIDE
+ virtual bool CallCommand(vcl::Window *pWindow, const Point &/*rMousePos*/) override
{
return ImplCallCommand(pWindow, CommandEventId::LongPress, &m_aLongPressData);
}