1 files changed, 8 insertions, 32 deletions
diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx
index 0332cd29f90c..ed10fbb72076 100644
--- a/comphelper/source/container/namecontainer.cxx
+++ b/comphelper/source/container/namecontainer.cxx
@@ -38,32 +38,20 @@ namespace comphelper
         explicit NameContainer( css::uno::Type aType );
 
         // XNameContainer
-        virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement )
-            throw(css::lang::IllegalArgumentException, css::container::ElementExistException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeByName( const OUString& Name )
-            throw(css::container::NoSuchElementException, css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override;
+        virtual void SAL_CALL removeByName( const OUString& Name ) override;
 
         // XNameReplace
-        virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement )
-            throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException,
-                css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
 
         // XNameAccess
-        virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-            throw(css::container::NoSuchElementException, css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  )
-            throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+        virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
         // XElementAccess
-        virtual sal_Bool SAL_CALL hasElements(  )
-            throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Type SAL_CALL getElementType(  )
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasElements(  ) override;
+        virtual css::uno::Type SAL_CALL getElementType(  ) override;
 
     private:
         SvGenericNameContainerMapImpl maProperties;
@@ -86,8 +74,6 @@ NameContainer::NameContainer( css::uno::Type aType )
 
 // XNameContainer
 void SAL_CALL NameContainer::insertByName( const OUString& aName, const Any& aElement )
-    throw(IllegalArgumentException, ElementExistException,
-        WrappedTargetException, RuntimeException, std::exception)
 {
     MutexGuard aGuard( maMutex );
 
@@ -101,8 +87,6 @@ void SAL_CALL NameContainer::insertByName( const OUString& aName, const Any& aEl
 }
 
 void SAL_CALL NameContainer::removeByName( const OUString& Name )
-    throw(NoSuchElementException, WrappedTargetException,
-        RuntimeException, std::exception)
 {
     MutexGuard aGuard( maMutex );
 
@@ -116,8 +100,6 @@ void SAL_CALL NameContainer::removeByName( const OUString& Name )
 // XNameReplace
 
 void SAL_CALL NameContainer::replaceByName( const OUString& aName, const Any& aElement )
-    throw(IllegalArgumentException, NoSuchElementException,
-        WrappedTargetException, RuntimeException, std::exception)
 {
     MutexGuard aGuard( maMutex );
 
@@ -134,8 +116,6 @@ void SAL_CALL NameContainer::replaceByName( const OUString& aName, const Any& aE
 // XNameAccess
 
 Any SAL_CALL NameContainer::getByName( const OUString& aName )
-    throw(NoSuchElementException, WrappedTargetException,
-        RuntimeException, std::exception)
 {
     MutexGuard aGuard( maMutex );
 
@@ -147,7 +127,6 @@ Any SAL_CALL NameContainer::getByName( const OUString& aName )
 }
 
 Sequence< OUString > SAL_CALL NameContainer::getElementNames(  )
-    throw(RuntimeException, std::exception)
 {
     MutexGuard aGuard( maMutex );
 
@@ -155,7 +134,6 @@ Sequence< OUString > SAL_CALL NameContainer::getElementNames(  )
 }
 
 sal_Bool SAL_CALL NameContainer::hasByName( const OUString& aName )
-    throw(RuntimeException, std::exception)
 {
     MutexGuard aGuard( maMutex );
 
@@ -164,7 +142,6 @@ sal_Bool SAL_CALL NameContainer::hasByName( const OUString& aName )
 }
 
 sal_Bool SAL_CALL NameContainer::hasElements(  )
-    throw(RuntimeException, std::exception)
 {
     MutexGuard aGuard( maMutex );
 
@@ -172,7 +149,6 @@ sal_Bool SAL_CALL NameContainer::hasElements(  )
 }
 
 Type SAL_CALL NameContainer::getElementType()
-    throw( RuntimeException, std::exception )
 {
     return maType;
 }