From d7034051a94816e4e81bd17ed5eb81ca0c8a97f4 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 19 May 2014 08:45:31 +0300 Subject: [PATCH] WaE: overriding virtual function declaration not marked 'SAL_OVERRIDE' Change-Id: I00aaacadf108f2cc5d57963991e5c99ea4485056 --- vcl/workben/svpclient.cxx | 18 +++++++++--------- vcl/workben/svptest.cxx | 16 ++++++++-------- vcl/workben/vcldemo.cxx | 16 ++++++++-------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index 60823d0e4601..c9c52f52553d 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -84,17 +84,17 @@ class MyWin : public WorkWindow ImageControl m_aImage; PushButton m_aQuitButton; public: - MyWin( Window* pParent, WinBits nWinStyle ); + MyWin( Window* pParent, WinBits nWinStyle ); - void MouseMove( const MouseEvent& rMEvt ); - void MouseButtonDown( const MouseEvent& rMEvt ); - void MouseButtonUp( const MouseEvent& rMEvt ); - void KeyInput( const KeyEvent& rKEvt ); - void KeyUp( const KeyEvent& rKEvt ); - void Paint( const Rectangle& rRect ); - 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& rKEvt ) SAL_OVERRIDE; + virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; - bool Close(); + virtual bool Close() SAL_OVERRIDE; void parseList( const OString& rList ); OString processCommand( const OString& rCommand ); diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx index 134a4fd097ee..8ba8277f51b4 100644 --- a/vcl/workben/svptest.cxx +++ b/vcl/workben/svptest.cxx @@ -69,15 +69,15 @@ class MyWin : public WorkWindow { Bitmap m_aBitmap; public: - MyWin( Window* pParent, WinBits nWinStyle ); + MyWin( Window* pParent, WinBits nWinStyle ); - void MouseMove( const MouseEvent& rMEvt ); - void MouseButtonDown( const MouseEvent& rMEvt ); - void MouseButtonUp( const MouseEvent& rMEvt ); - void KeyInput( const KeyEvent& rKEvt ); - void KeyUp( const KeyEvent& rKEvt ); - void Paint( const Rectangle& rRect ); - 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& rKEvt ) SAL_OVERRIDE; + virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; }; void Main() diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 3ce00edc7303..8b26e37d3025 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -63,15 +63,15 @@ SAL_IMPLEMENT_MAIN() class MyWin : public WorkWindow { public: - MyWin( Window* pParent, WinBits nWinStyle ); + MyWin( Window* pParent, WinBits nWinStyle ); - void MouseMove( const MouseEvent& rMEvt ); - void MouseButtonDown( const MouseEvent& rMEvt ); - void MouseButtonUp( const MouseEvent& rMEvt ); - void KeyInput( const KeyEvent& rKEvt ); - void KeyUp( const KeyEvent& rKEvt ); - void Paint( const Rectangle& rRect ); - 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& rKEvt ) SAL_OVERRIDE; + virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; }; void Main()