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

4 files changed, 14 insertions, 14 deletions

diff --git a/slideshow/source/inc/delayevent.hxx b/slideshow/source/inc/delayevent.hxx
index 00c30df9c727..532c9ab31eb3 100644
--- a/slideshow/source/inc/delayevent.hxx
+++ b/slideshow/source/inc/delayevent.hxx
@@ -50,11 +50,11 @@ public:
         mbWasFired(false) {}
 
     // Event:
-    virtual bool fire();
-    virtual bool isCharged() const;
-    virtual double getActivationTime( double nCurrentTime ) const;
+    virtual bool fire() SAL_OVERRIDE;
+    virtual bool isCharged() const SAL_OVERRIDE;
+    virtual double getActivationTime( double nCurrentTime ) const SAL_OVERRIDE;
     // Disposable:
-    virtual void dispose();
+    virtual void dispose() SAL_OVERRIDE;
 
 private:
     double const mnTimeout;
diff --git a/slideshow/source/inc/interruptabledelayevent.hxx b/slideshow/source/inc/interruptabledelayevent.hxx
index d5f962d69946..9b3234508110 100644
--- a/slideshow/source/inc/interruptabledelayevent.hxx
+++ b/slideshow/source/inc/interruptabledelayevent.hxx
@@ -44,7 +44,7 @@ namespace slideshow
             {
             }
 
-            virtual bool fire()
+            virtual bool fire() SAL_OVERRIDE
             {
                 if( mpEvent && isCharged() )
                 {
@@ -57,7 +57,7 @@ namespace slideshow
                 return false;
             }
 
-            virtual bool isCharged() const
+            virtual bool isCharged() const SAL_OVERRIDE
             {
                 // pass on to wrappee - this ensures that we return
                 // false on isCharged(), even if the other event has
@@ -65,14 +65,14 @@ namespace slideshow
                 return !mpEvent ? false : mpEvent->isCharged();
             }
 
-            virtual double getActivationTime( double nCurrentTime ) const
+            virtual double getActivationTime( double nCurrentTime ) const SAL_OVERRIDE
             {
                 // enforce _our_ timeout to our clients (this
                 // overrides any timeout possibly set at the wrappee!)
                 return nCurrentTime + mnTimeout;
             }
 
-            virtual void dispose()
+            virtual void dispose() SAL_OVERRIDE
             {
                 mpEvent.reset();
             }
diff --git a/slideshow/source/inc/soundplayer.hxx b/slideshow/source/inc/soundplayer.hxx
index 8f534f489435..1db5bfbcbfd5 100644
--- a/slideshow/source/inc/soundplayer.hxx
+++ b/slideshow/source/inc/soundplayer.hxx
@@ -84,10 +84,10 @@ namespace slideshow
             void setPlaybackLoop( bool bLoop );
 
             // PauseEventHandler:
-            virtual bool handlePause( bool bPauseShow );
+            virtual bool handlePause( bool bPauseShow ) SAL_OVERRIDE;
 
             // Disposable
-            virtual void dispose();
+            virtual void dispose() SAL_OVERRIDE;
 
         private:
             SoundPlayer(
diff --git a/slideshow/source/inc/wakeupevent.hxx b/slideshow/source/inc/wakeupevent.hxx
index 114d2c83737d..c836c2818e43 100644
--- a/slideshow/source/inc/wakeupevent.hxx
+++ b/slideshow/source/inc/wakeupevent.hxx
@@ -45,10 +45,10 @@ public:
         ::boost::shared_ptr< ::canvas::tools::ElapsedTime > const& pTimeBase,
         ActivitiesQueue & rActivityQueue );
 
-    virtual void dispose();
-    virtual bool fire();
-    virtual bool isCharged() const;
-    virtual double getActivationTime( double nCurrentTime ) const;
+    virtual void dispose() SAL_OVERRIDE;
+    virtual bool fire() SAL_OVERRIDE;
+    virtual bool isCharged() const SAL_OVERRIDE;
+    virtual double getActivationTime( double nCurrentTime ) const SAL_OVERRIDE;
 
     /// Start the internal timer
     void start();