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

1 files changed, 16 insertions, 16 deletions

diff --git a/include/comphelper/uno3.hxx b/include/comphelper/uno3.hxx
index 643e5c12d8d0..0bebb9fa91aa 100644
--- a/include/comphelper/uno3.hxx
+++ b/include/comphelper/uno3.hxx
@@ -43,17 +43,17 @@ namespace comphelper
     /** used for declaring UNO3-Defaults, i.e. acquire/release
     */
     #define DECLARE_UNO3_DEFAULTS(classname, baseclass) \
-        virtual void    SAL_CALL acquire() throw() { baseclass::acquire(); }    \
-        virtual void    SAL_CALL release() throw() { baseclass::release(); }    \
+        virtual void    SAL_CALL acquire() throw() SAL_OVERRIDE { baseclass::acquire(); }    \
+        virtual void    SAL_CALL release() throw() SAL_OVERRIDE { baseclass::release(); }    \
         void            SAL_CALL PUT_SEMICOLON_AT_THE_END()
 
     /** used for declaring UNO3-Defaults, i.e. acquire/release if you want to forward all queryInterfaces to the base class,
         (e.g. if you overload queryAggregation)
     */
     #define DECLARE_UNO3_AGG_DEFAULTS(classname, baseclass) \
-        virtual void            SAL_CALL acquire() throw() { baseclass::acquire(); } \
-        virtual void            SAL_CALL release() throw() { baseclass::release(); }    \
-        virtual ::com::sun::star::uno::Any  SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) \
+        virtual void            SAL_CALL acquire() throw() SAL_OVERRIDE { baseclass::acquire(); } \
+        virtual void            SAL_CALL release() throw() SAL_OVERRIDE { baseclass::release(); }    \
+        virtual ::com::sun::star::uno::Any  SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \
             { return baseclass::queryInterface(_rType); } \
         void                    SAL_CALL PUT_SEMICOLON_AT_THE_END()
 
@@ -122,21 +122,21 @@ namespace comphelper
         that would be ::cppu::WeakComponentImplHelperBase
     */
     #define DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS(classname, baseclass, implhelper) \
-        virtual void SAL_CALL acquire() throw() { baseclass::acquire(); }   \
-        virtual void SAL_CALL release() throw() { baseclass::release(); }   \
-        virtual ::com::sun::star::uno::Any  SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) \
+        virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { baseclass::acquire(); }   \
+        virtual void SAL_CALL release() throw() SAL_OVERRIDE { baseclass::release(); }   \
+        virtual ::com::sun::star::uno::Any  SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \
             { return baseclass::queryInterface(_rType); }                               \
-        virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) \
+        virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \
         {                                                                               \
             implhelper::dispose();                                                      \
         }                                                                               \
         virtual void SAL_CALL addEventListener(                                         \
-            ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) \
+            ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \
         {                                                                               \
             implhelper::addEventListener(xListener);                                        \
         }                                                                               \
         virtual void SAL_CALL removeEventListener(                                      \
-            ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) \
+            ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \
         {                                                                               \
             implhelper::removeEventListener(xListener);                                 \
         }                                                                               \
@@ -149,9 +149,9 @@ namespace comphelper
     //= forwarding/merging XInterface funtionality
 
     #define DECLARE_XINTERFACE( )   \
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception); \
-        virtual void SAL_CALL acquire() throw(); \
-        virtual void SAL_CALL release() throw();
+        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \
+        virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; \
+        virtual void SAL_CALL release() throw() SAL_OVERRIDE;
 
     #define IMPLEMENT_FORWARD_REFCOUNT( classname, refcountbase ) \
         void SAL_CALL classname::acquire() throw() { refcountbase::acquire(); } \
@@ -185,8 +185,8 @@ namespace comphelper
     //= forwarding/merging XTypeProvider funtionality
 
     #define DECLARE_XTYPEPROVIDER( )    \
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw (::com::sun::star::uno::RuntimeException, std::exception); \
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \
+        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     #define IMPLEMENT_GET_IMPLEMENTATION_ID( classname ) \
         ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL classname::getImplementationId(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) \