summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/dockmgr.cxx34
-rw-r--r--vcl/source/window/dockwin.cxx16
-rw-r--r--vcl/source/window/menu.cxx48
-rw-r--r--vcl/source/window/scrwnd.hxx6
4 files changed, 52 insertions, 52 deletions
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 4e62e93907cf..f3f2f42db8a4 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -59,17 +59,17 @@ public:
ImplDockingWindowWrapper* pDockingWin );
~ImplDockFloatWin2();
- virtual void Move();
- virtual void Resize();
- virtual void TitleButtonClick( sal_uInt16 nButton );
- virtual void Pin();
- virtual void Roll();
- virtual void PopupModeEnd();
- virtual void Resizing( Size& rSize );
- virtual bool Close();
+ virtual void Move() SAL_OVERRIDE;
+ virtual void Resize() SAL_OVERRIDE;
+ virtual void TitleButtonClick( sal_uInt16 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 setPosSizePixel( long nX, long nY,
long nWidth, long nHeight,
- sal_uInt16 nFlags = WINDOW_POSSIZE_ALL );
+ sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ) SAL_OVERRIDE;
sal_uLong GetLastTicks() const { return mnLastTicks; }
};
@@ -498,14 +498,14 @@ public:
ImplPopupFloatWin( Window* pParent, ImplDockingWindowWrapper* pDockingWin, bool bHasGrip );
~ImplPopupFloatWin();
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
- virtual void Paint( const Rectangle& rRect );
- virtual void MouseMove( const MouseEvent& rMEvt );
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual void MouseButtonUp( const MouseEvent& rMEvt );
- virtual void Tracking( const TrackingEvent& rTEvt );
- virtual void Resize();
- virtual Window* GetPreferredKeyInputWindow();
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE;
+ virtual void Paint( 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 Window* GetPreferredKeyInputWindow() SAL_OVERRIDE;
Rectangle GetDragRect() const;
Point GetToolboxPosition() const;
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index c8d0cb7f83a6..dabd203107f3 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -74,14 +74,14 @@ public:
DockingWindow* pDockingWin );
~ImplDockFloatWin();
- virtual void Move();
- virtual void Resize();
- virtual void TitleButtonClick( sal_uInt16 nButton );
- virtual void Pin();
- virtual void Roll();
- virtual void PopupModeEnd();
- virtual void Resizing( Size& rSize );
- virtual bool Close();
+ virtual void Move() SAL_OVERRIDE;
+ virtual void Resize() SAL_OVERRIDE;
+ virtual void TitleButtonClick( sal_uInt16 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;
sal_uLong GetLastTicks() const { return mnLastTicks; }
};
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();
diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx
index bd6ee20204f0..b7c6503f3dae 100644
--- a/vcl/source/window/scrwnd.hxx
+++ b/vcl/source/window/scrwnd.hxx
@@ -60,9 +60,9 @@ private:
protected:
- virtual void Paint( const Rectangle& rRect );
- virtual void MouseMove( const MouseEvent& rMEvt );
- virtual void MouseButtonUp( const MouseEvent& rMEvt );
+ virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+ virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+ virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
public:
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 15:44:30 +0000