Second batch of adding SAL_OVERRIDE to overriding function declarations

...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.

Change-Id: Ie656f9d653fc716f72ac175925272696d509038f

2 files changed, 32 insertions, 32 deletions

diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx
index 6440f09d6e15..ccefd23c4b24 100644
--- a/avmedia/source/viewer/mediaevent_impl.hxx
+++ b/avmedia/source/viewer/mediaevent_impl.hxx
@@ -49,23 +49,23 @@ namespace avmedia
         protected:
 
             // XKeyListener
-            virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception);
-            virtual void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception);
-            virtual void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+            virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            virtual void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            virtual void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
             // XMouseListener
-            virtual void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception);
-            virtual void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception);
-            virtual void SAL_CALL mouseEntered( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception);
-            virtual void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+            virtual void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            virtual void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            virtual void SAL_CALL mouseEntered( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            virtual void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
             // XMouseMotionListener
-            virtual void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception);
-            virtual void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+            virtual void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            virtual void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
             // XFocusListener
-            virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception);
-            virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+            virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
         private:
 
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
index 0d121bb66c98..80abf9574ea6 100644
--- a/avmedia/source/viewer/mediawindow_impl.hxx
+++ b/avmedia/source/viewer/mediawindow_impl.hxx
@@ -50,8 +50,8 @@ namespace avmedia
 
         protected:
 
-            void    update();
-            void    execute( const MediaItem& rItem );
+            void    update() SAL_OVERRIDE;
+            void    execute( const MediaItem& rItem ) SAL_OVERRIDE;
         };
 
 
@@ -67,12 +67,12 @@ namespace avmedia
 
         protected:
 
-            virtual void    MouseMove( const MouseEvent& rMEvt );
-            virtual void    MouseButtonDown( const MouseEvent& rMEvt );
-            virtual void    MouseButtonUp( const MouseEvent& rMEvt );
-            virtual void    KeyInput( const KeyEvent& rKEvt );
-            virtual void    KeyUp( const KeyEvent& rKEvt );
-            virtual void    Command( const CommandEvent& rCEvt );
+            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    Command( const CommandEvent& rCEvt ) SAL_OVERRIDE;
         };
 
         // ------------------.
@@ -113,23 +113,23 @@ namespace avmedia
         private:
 
             // Window
-            virtual void    MouseMove( const MouseEvent& rMEvt );
-            virtual void    MouseButtonDown( const MouseEvent& rMEvt );
-            virtual void    MouseButtonUp( const MouseEvent& rMEvt );
-            virtual void    KeyInput( const KeyEvent& rKEvt );
-            virtual void    KeyUp( const KeyEvent& rKEvt );
-            virtual void    Command( const CommandEvent& rCEvt );
-            virtual void    Resize();
-            virtual void    StateChanged( StateChangedType );
-            virtual void    Paint( const Rectangle& ); // const
-            virtual void    GetFocus();
+            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    Command( const CommandEvent& rCEvt ) SAL_OVERRIDE;
+            virtual void    Resize() SAL_OVERRIDE;
+            virtual void    StateChanged( StateChangedType ) SAL_OVERRIDE;
+            virtual void    Paint( const Rectangle& ) SAL_OVERRIDE; // const
+            virtual void    GetFocus() SAL_OVERRIDE;
 
             // DropTargetHelper
-            virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
-            virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
+            virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE;
+            virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE;
 
             // DragSourceHelper
-            virtual void    StartDrag( sal_Int8 nAction, const Point& rPosPixel );
+            virtual void    StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE;
 
             bool    setZoom( ::com::sun::star::media::ZoomLevel eLevel );
             ::com::sun::star::media::ZoomLevel getZoom() const;