1 files changed, 5 insertions, 15 deletions
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx
index 71ed084d30fa..9c6b4c2e4b0a 100644
--- a/ucb/source/ucp/expand/ucpexpand.cxx
+++ b/ucb/source/ucp/expand/ucpexpand.cxx
@@ -71,21 +71,16 @@ public:
         {}
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName )
-        throw (uno::RuntimeException, std::exception) override;
-    virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw (uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) override;
+    virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XContentProvider
     virtual uno::Reference< ucb::XContent > SAL_CALL queryContent(
-        uno::Reference< ucb::XContentIdentifier > const & xIdentifier )
-        throw (ucb::IllegalIdentifierException, uno::RuntimeException, std::exception) override;
+        uno::Reference< ucb::XContentIdentifier > const & xIdentifier ) override;
     virtual sal_Int32 SAL_CALL compareContentIds(
         uno::Reference< ucb::XContentIdentifier > const & xId1,
-        uno::Reference< ucb::XContentIdentifier > const & xId2 )
-        throw (uno::RuntimeException, std::exception) override;
+        uno::Reference< ucb::XContentIdentifier > const & xId2 ) override;
 };
 
 
@@ -134,7 +129,6 @@ uno::Sequence< OUString > SAL_CALL supportedServices()
 // XServiceInfo
 
 OUString ExpandContentProviderImpl::getImplementationName()
-    throw (uno::RuntimeException, std::exception)
 {
     check();
     return implName();
@@ -142,14 +136,12 @@ OUString ExpandContentProviderImpl::getImplementationName()
 
 
 uno::Sequence< OUString > ExpandContentProviderImpl::getSupportedServiceNames()
-    throw (uno::RuntimeException, std::exception)
 {
     check();
     return supportedServices();
 }
 
 sal_Bool ExpandContentProviderImpl::supportsService(OUString const & serviceName )
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, serviceName);
 }
@@ -178,7 +170,6 @@ OUString ExpandContentProviderImpl::expandUri(
 
 uno::Reference< ucb::XContent > ExpandContentProviderImpl::queryContent(
     uno::Reference< ucb::XContentIdentifier > const & xIdentifier )
-    throw (ucb::IllegalIdentifierException, uno::RuntimeException, std::exception)
 {
     check();
     OUString uri( expandUri( xIdentifier ) );
@@ -200,7 +191,6 @@ uno::Reference< ucb::XContent > ExpandContentProviderImpl::queryContent(
 sal_Int32 ExpandContentProviderImpl::compareContentIds(
     uno::Reference< ucb::XContentIdentifier > const & xId1,
     uno::Reference< ucb::XContentIdentifier > const & xId2 )
-    throw (uno::RuntimeException, std::exception)
 {
     check();
     try