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

6 files changed, 65 insertions, 65 deletions

diff --git a/include/cppuhelper/compbase_ex.hxx b/include/cppuhelper/compbase_ex.hxx
index 2be384ad2a86..555376eade6a 100644
--- a/include/cppuhelper/compbase_ex.hxx
+++ b/include/cppuhelper/compbase_ex.hxx
@@ -68,19 +68,19 @@ public:
 
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
         ::com::sun::star::uno::Type const & rType )
-        throw (::com::sun::star::uno::RuntimeException, std::exception);
+        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL acquire()
-        throw ();
+        throw () SAL_OVERRIDE;
     virtual void SAL_CALL release()
-        throw ();
+        throw () SAL_OVERRIDE;
     virtual void SAL_CALL dispose()
-        throw (::com::sun::star::uno::RuntimeException, std::exception);
+        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     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);
+        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     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);
+        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
 /** Implementation helper base class for components. Inherits from ::cppu::OWeakAggObject and
@@ -113,22 +113,22 @@ public:
 
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
         ::com::sun::star::uno::Type const & rType )
-        throw (::com::sun::star::uno::RuntimeException, std::exception);
+        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(
         ::com::sun::star::uno::Type const & rType )
-        throw (::com::sun::star::uno::RuntimeException, std::exception);
+        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL acquire()
-        throw ();
+        throw () SAL_OVERRIDE;
     virtual void SAL_CALL release()
-        throw ();
+        throw () SAL_OVERRIDE;
     virtual void SAL_CALL dispose()
-        throw (::com::sun::star::uno::RuntimeException, std::exception);
+        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     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);
+        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     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);
+        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
 /** WeakComponentImplHelper
diff --git a/include/cppuhelper/component.hxx b/include/cppuhelper/component.hxx
index e14d8f4d4062..2f39ec83a11d 100644
--- a/include/cppuhelper/component.hxx
+++ b/include/cppuhelper/component.hxx
@@ -62,35 +62,35 @@ public:
     // XAggregation
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
         ::com::sun::star::uno::Type const & rType )
-        throw (::com::sun::star::uno::RuntimeException, std::exception);
+        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(
         ::com::sun::star::uno::Type const & rType )
-        throw (::com::sun::star::uno::RuntimeException, std::exception);
+        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL acquire()
-        throw ();
+        throw () SAL_OVERRIDE;
     virtual void SAL_CALL release()
-        throw ();
+        throw () SAL_OVERRIDE;
 
     /** @attention
         XTypeProvider::getImplementationId() has to be implemented separately!
     */
     virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw(::com::sun::star::uno::RuntimeException, std::exception) = 0;
+        throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0;
     /** @attention
         XTypeProvider::getTypes() has to be re-implemented!
     */
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
-        throw (::com::sun::star::uno::RuntimeException, std::exception);
+        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XComponent
     virtual void SAL_CALL dispose()
-        throw(::com::sun::star::uno::RuntimeException, std::exception);
+        throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL addEventListener(
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener )
-        throw(::com::sun::star::uno::RuntimeException, std::exception);
+        throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL removeEventListener(
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener )
-        throw(::com::sun::star::uno::RuntimeException, std::exception);
+        throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 protected:
     /** Called in dispose method after the listeners were notified.
diff --git a/include/cppuhelper/propertysetmixin.hxx b/include/cppuhelper/propertysetmixin.hxx
index 511f8f612712..88d460ba7058 100644
--- a/include/cppuhelper/propertysetmixin.hxx
+++ b/include/cppuhelper/propertysetmixin.hxx
@@ -264,13 +264,13 @@ protected:
     */
     virtual com::sun::star::uno::Any SAL_CALL queryInterface(
         com::sun::star::uno::Type const & type)
-        throw (com::sun::star::uno::RuntimeException, std::exception);
+        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // @see com::sun::star::beans::XPropertySet::getPropertySetInfo
     virtual
     com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo >
     SAL_CALL getPropertySetInfo()
-        throw (com::sun::star::uno::RuntimeException, std::exception);
+        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // @see com::sun::star::beans::XPropertySet::setPropertyValue
     virtual void SAL_CALL setPropertyValue(
@@ -281,7 +281,7 @@ protected:
             com::sun::star::beans::PropertyVetoException,
             com::sun::star::lang::IllegalArgumentException,
             com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception);
+            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // @see com::sun::star::beans::XPropertySet::getPropertyValue
     virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(
@@ -289,7 +289,7 @@ protected:
         throw (
             com::sun::star::beans::UnknownPropertyException,
             com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception);
+            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     /**
        @short Adds a
@@ -307,7 +307,7 @@ protected:
         throw (
             com::sun::star::beans::UnknownPropertyException,
             com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception);
+            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // @see com::sun::star::beans::XPropertySet::removePropertyChangeListener
     virtual void SAL_CALL removePropertyChangeListener(
@@ -317,7 +317,7 @@ protected:
         throw (
             com::sun::star::beans::UnknownPropertyException,
             com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception);
+            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     /**
        @short Adds a
@@ -335,7 +335,7 @@ protected:
         throw (
             com::sun::star::beans::UnknownPropertyException,
             com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception);
+            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // @see com::sun::star::beans::XPropertySet::removeVetoableChangeListener
     virtual void SAL_CALL removeVetoableChangeListener(
@@ -345,7 +345,7 @@ protected:
         throw (
             com::sun::star::beans::UnknownPropertyException,
             com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception);
+            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // @see com::sun::star::beans::XFastPropertySet::setFastPropertyValue
     virtual void SAL_CALL setFastPropertyValue(
@@ -355,7 +355,7 @@ protected:
             com::sun::star::beans::PropertyVetoException,
             com::sun::star::lang::IllegalArgumentException,
             com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception);
+            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // @see com::sun::star::beans::XFastPropertySet::getFastPropertyValue
     virtual com::sun::star::uno::Any SAL_CALL getFastPropertyValue(
@@ -363,13 +363,13 @@ protected:
         throw (
             com::sun::star::beans::UnknownPropertyException,
             com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception);
+            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // @see com::sun::star::beans::XPropertyAccess::getPropertyValues
     virtual
     com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >
     SAL_CALL getPropertyValues()
-        throw (com::sun::star::uno::RuntimeException, std::exception);
+        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // @see com::sun::star::beans::XPropertyAccess::setPropertyValues
     virtual void SAL_CALL setPropertyValues(
@@ -380,7 +380,7 @@ protected:
             com::sun::star::beans::PropertyVetoException,
             com::sun::star::lang::IllegalArgumentException,
             com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException, std::exception);
+            com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
     PropertySetMixinImpl( const PropertySetMixinImpl&); // not defined
diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx
index acbe6cdd4140..381f2719ed74 100644
--- a/include/cppuhelper/propshlp.hxx
+++ b/include/cppuhelper/propshlp.hxx
@@ -156,11 +156,11 @@ public:
        @return True, if the handle exist, otherwise false.
      */
     virtual sal_Bool SAL_CALL fillPropertyMembersByHandle(
-        ::rtl::OUString * pPropName, sal_Int16 * pAttributes, sal_Int32 nHandle );
+        ::rtl::OUString * pPropName, sal_Int16 * pAttributes, sal_Int32 nHandle ) SAL_OVERRIDE;
     /**
        Return the sequence of properties. The sequence is sorted by name.
      */
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(void);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(void) SAL_OVERRIDE;
     /**
        Return the property with the name rPropertyName.
        @param rPropertyName the name of the property.
@@ -168,25 +168,25 @@ public:
      */
     virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName(
         const ::rtl::OUString& rPropertyName )
-        throw (::com::sun::star::beans::UnknownPropertyException);
+        throw (::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE;
     /**
        Return true if the property with the name rPropertyName exist, otherwise false.
        @param rPropertyName the name of the property.
      */
-    virtual sal_Bool SAL_CALL hasPropertyByName(const ::rtl::OUString& rPropertyName);
+    virtual sal_Bool SAL_CALL hasPropertyByName(const ::rtl::OUString& rPropertyName) SAL_OVERRIDE;
     /**
        Return the handle of the property with the name rPropertyName.
        If the property does not exist -1 is returned.
        @param rPropertyName the name of the property.
      */
-    virtual sal_Int32 SAL_CALL getHandleByName( const ::rtl::OUString & rPropertyName );
+    virtual sal_Int32 SAL_CALL getHandleByName( const ::rtl::OUString & rPropertyName ) SAL_OVERRIDE;
     /**
        Fill the array with the handles of the properties.
        @return the handles of the names from the pHandles array. -1
        indicates an unknown property name.
      */
     virtual sal_Int32 SAL_CALL fillHandles(
-        /*out*/sal_Int32 * pHandles, const ::com::sun::star::uno::Sequence< ::rtl::OUString > & rPropNames );
+        /*out*/sal_Int32 * pHandles, const ::com::sun::star::uno::Sequence< ::rtl::OUString > & rPropNames ) SAL_OVERRIDE;
 
 protected:
     /** reserved for future use. do not use.
@@ -426,7 +426,7 @@ public:
        XEventListener.
      */
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType )
-        throw (::com::sun::star::uno::RuntimeException, std::exception);
+        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     /** eases implementing XTypeProvider::getTypes, returns the types of XMultiPropertySet, XFastPropertySet, XPropertySet
      */
@@ -447,36 +447,36 @@ public:
        value and setFastPropertyValue is called.
      */
     virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue )
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
+        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     /**
        Throw UnknownPropertyException if the property with the name
        rPropertyName does not exist.
      */
     virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString& aPropertyName)
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
+        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     /** Ignored if the property is not bound. */
     virtual void SAL_CALL addPropertyChangeListener(
         const ::rtl::OUString& aPropertyName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener)
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
+        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     /** Ignored if the property is not bound. */
     virtual void SAL_CALL removePropertyChangeListener(
         const ::rtl::OUString& aPropertyName,
         const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertyChangeListener >& aListener)
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
+        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     /** Ignored if the property is not constrained. */
     virtual void SAL_CALL addVetoableChangeListener(
         const ::rtl::OUString& aPropertyName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener)
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
+        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     /** Ignored if the property is not constrained. */
     virtual void SAL_CALL removeVetoableChangeListener(
         const ::rtl::OUString& aPropertyName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener )
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
+        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     /**
        Throw UnknownPropertyException or PropertyVetoException if the property with the name
@@ -486,38 +486,38 @@ public:
        notified.
       */
     virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue )
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
+        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     /**
        @exception com::sun::star::beans::UnknownPropertyException
          if the property with the handle nHandle does not exist.
      */
     virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle )
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
+        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XMultiPropertySet
     virtual void SAL_CALL setPropertyValues(
         const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames,
         const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values )
-        throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception);
+        throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues(
         const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames )
-        throw(::com::sun::star::uno::RuntimeException, std::exception);
+        throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL addPropertiesChangeListener(
         const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames,
         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& Listener )
-        throw(::com::sun::star::uno::RuntimeException, std::exception);
+        throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL removePropertiesChangeListener(
         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& Listener )
-        throw(::com::sun::star::uno::RuntimeException, std::exception);
+        throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL firePropertiesChangeEvent(
         const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames,
         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener > & Listener )
-        throw(::com::sun::star::uno::RuntimeException, std::exception);
+        throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     /**
        The property sequence is created in the call. The interface isn't used after the call.
@@ -705,11 +705,11 @@ public:
 
     // XInterface
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType )
-        throw (::com::sun::star::uno::RuntimeException, std::exception);
+        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XPropertySetOption
     virtual void SAL_CALL enableChangeListenerNotification( sal_Bool bEnable )
-        throw(::com::sun::star::uno::RuntimeException, std::exception);
+        throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 
 
diff --git a/include/cppuhelper/weak.hxx b/include/cppuhelper/weak.hxx
index 67bc0b74614b..dcddbb6d08c7 100644
--- a/include/cppuhelper/weak.hxx
+++ b/include/cppuhelper/weak.hxx
@@ -132,22 +132,22 @@ public:
     */
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
         const ::com::sun::star::uno::Type & rType )
-        throw (::com::sun::star::uno::RuntimeException, std::exception);
+        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     /** increasing m_refCount
     */
     virtual void SAL_CALL acquire()
-        throw ();
+        throw () SAL_OVERRIDE;
     /** decreasing m_refCount
     */
     virtual void SAL_CALL release()
-        throw ();
+        throw () SAL_OVERRIDE;
 
     /** XWeak::queryAdapter() implementation
 
         @return a \::com::sun::star::uno::XAdapter reference
     */
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAdapter > SAL_CALL queryAdapter()
-        throw (::com::sun::star::uno::RuntimeException, std::exception);
+        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     /** Cast operator to XInterface reference.
 
diff --git a/include/cppuhelper/weakagg.hxx b/include/cppuhelper/weakagg.hxx
index 3b7b9b14a3a2..0514fd6bacec 100644
--- a/include/cppuhelper/weakagg.hxx
+++ b/include/cppuhelper/weakagg.hxx
@@ -50,11 +50,11 @@ public:
     /** If a delegator is set, then the delegators gets acquired.  Otherwise call is delegated to
         base class ::cppu::OWeakObject.
     */
-    virtual void SAL_CALL acquire() throw();
+    virtual void SAL_CALL acquire() throw() SAL_OVERRIDE;
     /** If a delegator is set, then the delegators gets released.  Otherwise call is delegated to
         base class ::cppu::OWeakObject.
     */
-    virtual void SAL_CALL release() throw();
+    virtual void SAL_CALL release() throw() SAL_OVERRIDE;
     /** If a delegator is set, then the delegator is queried for the demanded interface.  If the
         delegator cannot provide the demanded interface, it calls queryAggregation() on its
         aggregated objects.
@@ -64,21 +64,21 @@ public:
         @see queryAggregation.
     */
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType )
-        throw(::com::sun::star::uno::RuntimeException, std::exception);
+        throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     /** Set the delegator.  The delegator member reference is a weak reference.
 
         @param Delegator the object that delegate its queryInterface to this aggregate.
     */
     virtual void SAL_CALL setDelegator( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & Delegator )
-        throw(::com::sun::star::uno::RuntimeException, std::exception);
+        throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     /** Called by the delegator or queryInterface. Re-implement this method instead of
         queryInterface.
 
         @see queryInterface
     */
     virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType )
-        throw(::com::sun::star::uno::RuntimeException, std::exception);
+        throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 protected:
     /** Virtual dtor. Called when reference count is 0.