First batch of adding SAL_OVERRRIDE to overriding function declarations

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

Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a

2 files changed, 12 insertions, 12 deletions

diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx
index b1cdd53a16d4..e022f8286266 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -88,7 +88,7 @@ private:
 class Impl1: public Interface1, private Base {
 public:
     virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type)
-        throw (css::uno::RuntimeException, std::exception)
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
     {
         if (type
             == getCppuType< css::uno::Reference< css::uno::XInterface > >())
@@ -104,11 +104,11 @@ public:
         }
     }
 
-    virtual void SAL_CALL acquire() throw () {
+    virtual void SAL_CALL acquire() throw () SAL_OVERRIDE {
         Base::acquire();
     }
 
-    virtual void SAL_CALL release() throw () {
+    virtual void SAL_CALL release() throw () SAL_OVERRIDE {
         Base::release();
     }
 };
@@ -116,7 +116,7 @@ public:
 class Impl2: public Interface2a, public Interface3, private Base {
 public:
     virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type)
-        throw (css::uno::RuntimeException, std::exception)
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
     {
         if (type
             == getCppuType< css::uno::Reference< css::uno::XInterface > >())
@@ -140,11 +140,11 @@ public:
         }
     }
 
-    virtual void SAL_CALL acquire() throw () {
+    virtual void SAL_CALL acquire() throw () SAL_OVERRIDE {
         Base::acquire();
     }
 
-    virtual void SAL_CALL release() throw () {
+    virtual void SAL_CALL release() throw () SAL_OVERRIDE {
         Base::release();
     }
 };
@@ -152,7 +152,7 @@ public:
 class Impl2b: public Interface2b, private Base {
 public:
     virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type)
-        throw (css::uno::RuntimeException, std::exception)
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
     {
         if (type
             == getCppuType< css::uno::Reference< css::uno::XInterface > >())
@@ -177,11 +177,11 @@ public:
         }
     }
 
-    virtual void SAL_CALL acquire() throw () {
+    virtual void SAL_CALL acquire() throw () SAL_OVERRIDE {
         Base::acquire();
     }
 
-    virtual void SAL_CALL release() throw () {
+    virtual void SAL_CALL release() throw () SAL_OVERRIDE {
         Base::release();
     }
 };
diff --git a/cppu/qa/test_reference.cxx b/cppu/qa/test_reference.cxx
index e49c31620124..f9058260484f 100644
--- a/cppu/qa/test_reference.cxx
+++ b/cppu/qa/test_reference.cxx
@@ -48,7 +48,7 @@ public:
     }
 
     virtual Any SAL_CALL queryInterface(const Type & _type)
-        throw (RuntimeException, std::exception)
+        throw (RuntimeException, std::exception) SAL_OVERRIDE
     {
         Any aInterface;
         if (_type == getCppuType< Reference< XInterface > >())
@@ -65,12 +65,12 @@ public:
         return Any();
     }
 
-    virtual void SAL_CALL acquire() throw ()
+    virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
     {
         osl_atomic_increment( &m_refCount );
     }
 
-    virtual void SAL_CALL release() throw ()
+    virtual void SAL_CALL release() throw () SAL_OVERRIDE
     {
         if ( 0 == osl_atomic_decrement( &m_refCount ) )
             delete this;