1 files changed, 15 insertions, 22 deletions

diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx
index 6ee1da2bbd55..93ce85d3779a 100644
--- a/comphelper/source/property/genericpropertyset.cxx
+++ b/comphelper/source/property/genericpropertyset.cxx
@@ -58,30 +58,30 @@ namespace comphelper
         cppu::OMultiTypeInterfaceContainerHelperVar<OUString> m_aListener;
 
     protected:
-        virtual void _setPropertyValues( const PropertyMapEntry** ppEntries, const  Any* pValues ) throw( UnknownPropertyException,  PropertyVetoException,  IllegalArgumentException,  WrappedTargetException ) override;
-        virtual void _getPropertyValues( const PropertyMapEntry** ppEntries,  Any* pValue ) throw( UnknownPropertyException,  WrappedTargetException ) override;
+        virtual void _setPropertyValues( const PropertyMapEntry** ppEntries, const  Any* pValues ) override;
+        virtual void _getPropertyValues( const PropertyMapEntry** ppEntries,  Any* pValue ) override;
 
     public:
         explicit GenericPropertySet( PropertySetInfo* pInfo ) throw();
 
         // XInterface
-        virtual  Any SAL_CALL queryAggregation( const  Type & rType ) throw( RuntimeException, std::exception) override;
-        virtual  Any SAL_CALL queryInterface( const  Type & rType ) throw( RuntimeException, std::exception) override;
+        virtual  Any SAL_CALL queryAggregation( const  Type & rType ) override;
+        virtual  Any SAL_CALL queryInterface( const  Type & rType ) override;
         virtual void SAL_CALL acquire() throw() override;
         virtual void SAL_CALL release() throw() override;
 
         // XTypeProvider
-        virtual  Sequence<  Type > SAL_CALL getTypes(  ) throw( RuntimeException, std::exception) override;
-        virtual  Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw( RuntimeException, std::exception) override;
+        virtual  Sequence<  Type > SAL_CALL getTypes(  ) override;
+        virtual  Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(  RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(  RuntimeException, std::exception ) override;
-        virtual  Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(  RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual  Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // XPropertySet
-        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     };
 
 }
@@ -93,7 +93,7 @@ GenericPropertySet::GenericPropertySet( PropertySetInfo* pInfo ) throw()
 {
 }
 
-void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener )
 {
     Reference < XPropertySetInfo > xInfo = getPropertySetInfo(  );
     if ( xInfo.is() )
@@ -115,7 +115,7 @@ void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& aPr
     }
 }
 
-void SAL_CALL GenericPropertySet::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL GenericPropertySet::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener )
 {
     ResettableMutexGuard aGuard( maMutex );
     Reference < XPropertySetInfo > xInfo = getPropertySetInfo(  );
@@ -140,7 +140,6 @@ void SAL_CALL GenericPropertySet::removePropertyChangeListener( const OUString&
 }
 
 void GenericPropertySet::_setPropertyValues( const PropertyMapEntry** ppEntries, const Any* pValues )
-    throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException )
 {
     ResettableMutexGuard aGuard( maMutex );
 
@@ -166,7 +165,6 @@ void GenericPropertySet::_setPropertyValues( const PropertyMapEntry** ppEntries,
 }
 
 void GenericPropertySet::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, Any* pValue )
-    throw( UnknownPropertyException, WrappedTargetException )
 {
     MutexGuard aGuard( maMutex );
 
@@ -182,13 +180,11 @@ void GenericPropertySet::_getPropertyValues( const comphelper::PropertyMapEntry*
 // XInterface
 
 Any SAL_CALL GenericPropertySet::queryInterface( const Type & rType )
-    throw( RuntimeException, std::exception )
 {
     return OWeakAggObject::queryInterface( rType );
 }
 
 Any SAL_CALL GenericPropertySet::queryAggregation( const Type & rType )
-    throw(RuntimeException, std::exception)
 {
     Any aAny;
 
@@ -217,7 +213,6 @@ void SAL_CALL GenericPropertySet::release() throw()
 }
 
 uno::Sequence< uno::Type > SAL_CALL GenericPropertySet::getTypes()
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< uno::Type > aTypes( 5 );
     uno::Type* pTypes = aTypes.getArray();
@@ -232,24 +227,22 @@ uno::Sequence< uno::Type > SAL_CALL GenericPropertySet::getTypes()
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL GenericPropertySet::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // XServiceInfo
-sal_Bool SAL_CALL GenericPropertySet::supportsService( const  OUString& ServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL GenericPropertySet::supportsService( const  OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-OUString SAL_CALL GenericPropertySet::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL GenericPropertySet::getImplementationName()
 {
     return OUString( "com.sun.star.comp.comphelper.GenericPropertySet" );
 }
 
 Sequence< OUString > SAL_CALL GenericPropertySet::getSupportedServiceNames(  )
-    throw( RuntimeException, std::exception )
 {
     Sequence<OUString> aSNS { "com.sun.star.beans.XPropertySet" };
     return aSNS;