Remove dynamic exception specifications

...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html> "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
author: Stephan Bergmann <sbergman@redhat.com> 2017-01-26 12:28:58 +0100
committer: Stephan Bergmann <sbergman@redhat.com> 2017-01-26 12:54:43 +0000
commit: e57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
tree: bcce66b27261553c308779f3e8663a269ed3a671 /ucb/source/core
parent: 8802ebd5172ec4bc412a59d136c82b77ab452281 (diff)
14 files changed, 136 insertions, 442 deletions
diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx
index 7762bf3c2bb2..450bafcb5e65 100644
--- a/ucb/source/core/FileAccess.cxx
+++ b/ucb/source/core/FileAccess.cxx
@@ -88,48 +88,43 @@ class OFileAccess : public FileAccessHelper
     /// @throws CommandAbortedException
     /// @throws Exception
     /// @throws RuntimeException
-    void transferImpl( const OUString& rSource, const OUString& rDest, bool bMoveData )
-        throw(CommandAbortedException, Exception, RuntimeException);
+    void transferImpl( const OUString& rSource, const OUString& rDest, bool bMoveData );
     /// @throws Exception
     bool createNewFile( const OUString & rParentURL,
                         const OUString & rTitle,
-                        const Reference< XInputStream >& data )
-        throw ( Exception );
+                        const Reference< XInputStream >& data );
 
 public:
     explicit OFileAccess( const Reference< XComponentContext > & xContext )
         : m_xContext( xContext) {}
     // Methods
-    virtual void SAL_CALL copy( const OUString& SourceURL, const OUString& DestURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL move( const OUString& SourceURL, const OUString& DestURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL kill( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isFolder( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isReadOnly( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setReadOnly( const OUString& FileURL, sal_Bool bReadOnly ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL createFolder( const OUString& NewFolderURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSize( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getContentType( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::util::DateTime SAL_CALL getDateTimeModified( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getFolderContents( const OUString& FolderURL, sal_Bool bIncludeFolders ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL exists( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL openFileRead( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL openFileWrite( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::io::XStream > SAL_CALL openFileReadWrite( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setInteractionHandler( const css::uno::Reference< css::task::XInteractionHandler >& Handler ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL writeFile( const OUString& FileURL, const css::uno::Reference< css::io::XInputStream >& data ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isHidden( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHidden( const OUString& FileURL, sal_Bool bHidden ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL copy( const OUString& SourceURL, const OUString& DestURL ) override;
+    virtual void SAL_CALL move( const OUString& SourceURL, const OUString& DestURL ) override;
+    virtual void SAL_CALL kill( const OUString& FileURL ) override;
+    virtual sal_Bool SAL_CALL isFolder( const OUString& FileURL ) override;
+    virtual sal_Bool SAL_CALL isReadOnly( const OUString& FileURL ) override;
+    virtual void SAL_CALL setReadOnly( const OUString& FileURL, sal_Bool bReadOnly ) override;
+    virtual void SAL_CALL createFolder( const OUString& NewFolderURL ) override;
+    virtual sal_Int32 SAL_CALL getSize( const OUString& FileURL ) override;
+    virtual OUString SAL_CALL getContentType( const OUString& FileURL ) override;
+    virtual css::util::DateTime SAL_CALL getDateTimeModified( const OUString& FileURL ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getFolderContents( const OUString& FolderURL, sal_Bool bIncludeFolders ) override;
+    virtual sal_Bool SAL_CALL exists( const OUString& FileURL ) override;
+    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL openFileRead( const OUString& FileURL ) override;
+    virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL openFileWrite( const OUString& FileURL ) override;
+    virtual css::uno::Reference< css::io::XStream > SAL_CALL openFileReadWrite( const OUString& FileURL ) override;
+    virtual void SAL_CALL setInteractionHandler( const css::uno::Reference< css::task::XInteractionHandler >& Handler ) override;
+    virtual void SAL_CALL writeFile( const OUString& FileURL, const css::uno::Reference< css::io::XInputStream >& data ) override;
+    virtual sal_Bool SAL_CALL isHidden( const OUString& FileURL ) override;
+    virtual void SAL_CALL setHidden( const OUString& FileURL, sal_Bool bHidden ) override;
+
+    OUString SAL_CALL getImplementationName() override
     { return OUString(IMPLEMENTATION_NAME); }
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
     { return cppu::supportsService(this, ServiceName); }
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     { return FileAccess_getSupportedServiceNames(); }
 };
 
@@ -142,10 +137,8 @@ class OActiveDataSink : public cppu::WeakImplHelper< XActiveDataSink >
 public:
 
     // Methods
-    virtual void SAL_CALL setInputStream( const Reference< XInputStream >& aStream )
-        throw(RuntimeException, std::exception) override;
-    virtual Reference< XInputStream > SAL_CALL getInputStream(  )
-        throw(RuntimeException, std::exception) override;
+    virtual void SAL_CALL setInputStream( const Reference< XInputStream >& aStream ) override;
+    virtual Reference< XInputStream > SAL_CALL getInputStream(  ) override;
 };
 
 // Implementation XActiveDataStreamer
@@ -157,10 +150,8 @@ class OActiveDataStreamer : public cppu::WeakImplHelper< XActiveDataStreamer >
 public:
 
     // Methods
-    virtual void SAL_CALL setStream( const Reference< XStream >& aStream )
-        throw(RuntimeException, std::exception) override;
-    virtual Reference< XStream > SAL_CALL getStream()
-        throw(RuntimeException, std::exception) override;
+    virtual void SAL_CALL setStream( const Reference< XStream >& aStream ) override;
+    virtual Reference< XStream > SAL_CALL getStream() override;
 };
 
 // Implementation XCommandEnvironment
@@ -176,44 +167,36 @@ public:
     }
 
     // Methods
-    virtual Reference< XInteractionHandler > SAL_CALL getInteractionHandler()
-        throw(RuntimeException, std::exception) override;
-    virtual Reference< XProgressHandler > SAL_CALL getProgressHandler()
-        throw(RuntimeException, std::exception) override;
+    virtual Reference< XInteractionHandler > SAL_CALL getInteractionHandler() override;
+    virtual Reference< XProgressHandler > SAL_CALL getProgressHandler() override;
 };
 
 void OActiveDataSink::setInputStream( const Reference< XInputStream >& aStream )
-    throw(RuntimeException, std::exception)
 {
     mxStream = aStream;
 }
 
 Reference< XInputStream > OActiveDataSink::getInputStream()
-    throw(RuntimeException, std::exception)
 {
     return mxStream;
 }
 
 void OActiveDataStreamer::setStream( const Reference< XStream >& aStream )
-    throw(RuntimeException, std::exception)
 {
     mxStream = aStream;
 }
 
 Reference< XStream > OActiveDataStreamer::getStream()
-    throw(RuntimeException, std::exception)
 {
     return mxStream;
 }
 
 Reference< XInteractionHandler > OCommandEnvironment::getInteractionHandler()
-    throw(RuntimeException, std::exception)
 {
     return mxInteraction;
 }
 
 Reference< XProgressHandler > OCommandEnvironment::getProgressHandler()
-    throw(RuntimeException, std::exception)
 {
     Reference< XProgressHandler > xRet;
     return xRet;
@@ -222,7 +205,6 @@ Reference< XProgressHandler > OCommandEnvironment::getProgressHandler()
 void OFileAccess::transferImpl( const OUString& rSource,
                                 const OUString& rDest,
                                 bool bMoveData )
-    throw(CommandAbortedException, Exception, RuntimeException)
 {
     // SfxContentHelper::Transfer_Impl
     INetURLObject aSourceObj( rSource, INetProtocol::File );
@@ -293,19 +275,16 @@ void OFileAccess::transferImpl( const OUString& rSource,
 }
 
 void OFileAccess::copy( const OUString& SourceURL, const OUString& DestURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     transferImpl( SourceURL, DestURL, false );
 }
 
 void OFileAccess::move( const OUString& SourceURL, const OUString& DestURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     transferImpl( SourceURL, DestURL, true );
 }
 
 void OFileAccess::kill( const OUString& FileURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     // SfxContentHelper::Kill
     INetURLObject aDeleteObj( FileURL, INetProtocol::File );
@@ -321,7 +300,6 @@ void OFileAccess::kill( const OUString& FileURL )
 }
 
 sal_Bool OFileAccess::isFolder( const OUString& FileURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     bool bRet = false;
     try
@@ -335,7 +313,6 @@ sal_Bool OFileAccess::isFolder( const OUString& FileURL )
 }
 
 sal_Bool OFileAccess::isReadOnly( const OUString& FileURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     INetURLObject aURLObj( FileURL, INetProtocol::File );
     ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment.get(), comphelper::getProcessComponentContext() );
@@ -346,7 +323,6 @@ sal_Bool OFileAccess::isReadOnly( const OUString& FileURL )
 }
 
 void OFileAccess::setReadOnly( const OUString& FileURL, sal_Bool bReadOnly )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     INetURLObject aURLObj( FileURL, INetProtocol::File );
     ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment.get(), comphelper::getProcessComponentContext() );
@@ -354,7 +330,6 @@ void OFileAccess::setReadOnly( const OUString& FileURL, sal_Bool bReadOnly )
 }
 
 void OFileAccess::createFolder( const OUString& NewFolderURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     // Does the folder already exist?
     if( NewFolderURL.isEmpty() || isFolder( NewFolderURL ) )
@@ -420,7 +395,6 @@ void OFileAccess::createFolder( const OUString& NewFolderURL )
 }
 
 sal_Int32 OFileAccess::getSize( const OUString& FileURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     // SfxContentHelper::GetSize
     sal_Int32 nSize = 0;
@@ -433,7 +407,6 @@ sal_Int32 OFileAccess::getSize( const OUString& FileURL )
 }
 
 OUString OFileAccess::getContentType( const OUString& FileURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     INetURLObject aObj( FileURL, INetProtocol::File );
     ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment.get(), comphelper::getProcessComponentContext() );
@@ -444,7 +417,6 @@ OUString OFileAccess::getContentType( const OUString& FileURL )
 }
 
 css::util::DateTime OFileAccess::getDateTimeModified( const OUString& FileURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     INetURLObject aFileObj( FileURL, INetProtocol::File );
     css::util::DateTime aDateTime;
@@ -458,7 +430,6 @@ css::util::DateTime OFileAccess::getDateTimeModified( const OUString& FileURL )
 typedef vector< OUString* > StringList_Impl;
 
 Sequence< OUString > OFileAccess::getFolderContents( const OUString& FolderURL, sal_Bool bIncludeFolders )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     // SfxContentHelper::GetFolderContents
 
@@ -514,7 +485,6 @@ Sequence< OUString > OFileAccess::getFolderContents( const OUString& FolderURL,
 }
 
 sal_Bool OFileAccess::exists( const OUString& FileURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     bool bRet = false;
     try
@@ -533,7 +503,6 @@ sal_Bool OFileAccess::exists( const OUString& FileURL )
 }
 
 Reference< XInputStream > OFileAccess::openFileRead( const OUString& FileURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     Reference< XInputStream > xRet;
     INetURLObject aObj( FileURL, INetProtocol::File );
@@ -556,7 +525,6 @@ Reference< XInputStream > OFileAccess::openFileRead( const OUString& FileURL )
 }
 
 Reference< XOutputStream > OFileAccess::openFileWrite( const OUString& FileURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     Reference< XOutputStream > xRet;
     Reference< XStream > xStream = OFileAccess::openFileReadWrite( FileURL );
@@ -566,7 +534,6 @@ Reference< XOutputStream > OFileAccess::openFileWrite( const OUString& FileURL )
 }
 
 Reference< XStream > OFileAccess::openFileReadWrite( const OUString& FileURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     Reference< XActiveDataStreamer > xSink = static_cast<XActiveDataStreamer*>(new OActiveDataStreamer());
     Reference< XInterface > xSinkIface( xSink, UNO_QUERY );
@@ -628,7 +595,6 @@ Reference< XStream > OFileAccess::openFileReadWrite( const OUString& FileURL )
 }
 
 void OFileAccess::setInteractionHandler( const Reference< XInteractionHandler >& Handler )
-    throw(RuntimeException, std::exception)
 {
     if( !mxEnvironment.is() )
     {
@@ -640,7 +606,6 @@ void OFileAccess::setInteractionHandler( const Reference< XInteractionHandler >&
 bool OFileAccess::createNewFile( const OUString & rParentURL,
                                  const OUString & rTitle,
                                  const Reference< XInputStream >& data )
-    throw ( Exception )
 {
     ucbhelper::Content aParentCnt( rParentURL, mxEnvironment.get(), comphelper::getProcessComponentContext() );
 
@@ -694,7 +659,6 @@ bool OFileAccess::createNewFile( const OUString & rParentURL,
 
 void SAL_CALL OFileAccess::writeFile( const OUString& FileURL,
                                       const Reference< XInputStream >& data )
-    throw ( Exception, RuntimeException, std::exception )
 {
     INetURLObject aURL( FileURL, INetProtocol::File );
     try
@@ -744,7 +708,6 @@ void SAL_CALL OFileAccess::writeFile( const OUString& FileURL,
 }
 
 sal_Bool OFileAccess::isHidden( const OUString& FileURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     INetURLObject aURLObj( FileURL, INetProtocol::File );
     ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment.get(), comphelper::getProcessComponentContext() );
@@ -755,7 +718,6 @@ sal_Bool OFileAccess::isHidden( const OUString& FileURL )
 }
 
 void OFileAccess::setHidden( const OUString& FileURL, sal_Bool bHidden )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     INetURLObject aURLObj( FileURL, INetProtocol::File );
     ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment.get(), comphelper::getProcessComponentContext() );
diff --git a/ucb/source/core/cmdenv.cxx b/ucb/source/core/cmdenv.cxx
index 012aa6e197d2..a8c1b862fd6d 100644
--- a/ucb/source/core/cmdenv.cxx
+++ b/ucb/source/core/cmdenv.cxx
@@ -55,8 +55,6 @@ UcbCommandEnvironment::~UcbCommandEnvironment()
 // virtual
 void SAL_CALL UcbCommandEnvironment::initialize(
         const uno::Sequence< uno::Any >& aArguments )
-    throw( uno::Exception,
-           uno::RuntimeException, std::exception )
 {
     if ( ( aArguments.getLength() < 2 ) ||
          !( aArguments[ 0 ] >>= m_xIH ) ||
@@ -70,7 +68,6 @@ void SAL_CALL UcbCommandEnvironment::initialize(
 
 // virtual
 OUString SAL_CALL UcbCommandEnvironment::getImplementationName()
-    throw ( uno::RuntimeException, std::exception )
 {
     return getImplementationName_Static();
 }
@@ -79,7 +76,6 @@ OUString SAL_CALL UcbCommandEnvironment::getImplementationName()
 // virtual
 sal_Bool SAL_CALL
 UcbCommandEnvironment::supportsService( const OUString& ServiceName )
-    throw ( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
@@ -88,7 +84,6 @@ UcbCommandEnvironment::supportsService( const OUString& ServiceName )
 // virtual
 uno::Sequence< OUString > SAL_CALL
 UcbCommandEnvironment::getSupportedServiceNames()
-    throw ( uno::RuntimeException, std::exception )
 {
     return getSupportedServiceNames_Static();
 }
@@ -116,7 +111,6 @@ UcbCommandEnvironment::getSupportedServiceNames_Static()
 // virtual
 uno::Reference< task::XInteractionHandler > SAL_CALL
 UcbCommandEnvironment::getInteractionHandler()
-    throw ( uno::RuntimeException, std::exception )
 {
     return m_xIH;
 }
@@ -125,7 +119,6 @@ UcbCommandEnvironment::getInteractionHandler()
 // virtual
 uno::Reference< ucb::XProgressHandler > SAL_CALL
 UcbCommandEnvironment::getProgressHandler()
-    throw ( uno::RuntimeException, std::exception )
 {
     return m_xPH;
 }
@@ -137,7 +130,6 @@ UcbCommandEnvironment::getProgressHandler()
 static uno::Reference< uno::XInterface > SAL_CALL
 UcbCommandEnvironment_CreateInstance(
     const uno::Reference< lang::XMultiServiceFactory> & rSMgr )
-    throw( uno::Exception )
 {
     lang::XServiceInfo * pX = static_cast< lang::XServiceInfo * >(
         new UcbCommandEnvironment( rSMgr ) );
diff --git a/ucb/source/core/cmdenv.hxx b/ucb/source/core/cmdenv.hxx
index a731fa2a7348..68dd3e4708a8 100644
--- a/ucb/source/core/cmdenv.hxx
+++ b/ucb/source/core/cmdenv.hxx
@@ -43,29 +43,22 @@ public:
 
     // XInitialization
     virtual void SAL_CALL
-    initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw( css::uno::Exception,
-               css::uno::RuntimeException, std::exception ) override;
+    initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
     virtual sal_Bool SAL_CALL
-    supportsService( const OUString& ServiceName )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    supportsService( const OUString& ServiceName ) override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getSupportedServiceNames() override;
 
     // XCommandEnvironment
     virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL
-    getInteractionHandler()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getInteractionHandler() override;
     virtual css::uno::Reference< css::ucb::XProgressHandler > SAL_CALL
-    getProgressHandler()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getProgressHandler() override;
 
     // Non-UNO interfaces
     static OUString  getImplementationName_Static();
diff --git a/ucb/source/core/identify.cxx b/ucb/source/core/identify.cxx
index f03cbb252adc..912163080154 100644
--- a/ucb/source/core/identify.cxx
+++ b/ucb/source/core/identify.cxx
@@ -47,7 +47,6 @@ ContentIdentifier::~ContentIdentifier()
 // XContentIdentifier methods.
 // virtual
 OUString SAL_CALL ContentIdentifier::getContentIdentifier()
-    throw( RuntimeException, std::exception )
 {
     return m_aContentId;
 }
@@ -55,7 +54,6 @@ OUString SAL_CALL ContentIdentifier::getContentIdentifier()
 
 // virtual
 OUString SAL_CALL ContentIdentifier::getContentProviderScheme()
-    throw( RuntimeException, std::exception )
 {
     if ( m_aProviderScheme.isEmpty() && !m_aContentId.isEmpty() )
     {
diff --git a/ucb/source/core/identify.hxx b/ucb/source/core/identify.hxx
index cb7313e27332..3dbf3ed380c1 100644
--- a/ucb/source/core/identify.hxx
+++ b/ucb/source/core/identify.hxx
@@ -33,10 +33,8 @@ public:
     virtual ~ContentIdentifier() override;
 
     // XContentIdentifier
-    virtual OUString SAL_CALL getContentIdentifier()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getContentProviderScheme()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getContentIdentifier() override;
+    virtual OUString SAL_CALL getContentProviderScheme() override;
 
 private:
     OUString m_aContentId;
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index 00770507dc7a..92819a585e00 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -50,7 +50,6 @@ XSERVICEINFO_COMMOM_IMPL( UcbContentProviderProxyFactory,
 /// @throws css::uno::Exception
 static css::uno::Reference< css::uno::XInterface > SAL_CALL
 UcbContentProviderProxyFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
-    throw( css::uno::Exception )
 {
     css::lang::XServiceInfo* pX =
         static_cast<css::lang::XServiceInfo*>(new UcbContentProviderProxyFactory( rSMgr ));
@@ -75,7 +74,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( UcbContentProviderProxyFactory );
 Reference< XContentProvider > SAL_CALL
 UcbContentProviderProxyFactory::createContentProvider(
                                                 const OUString& Service )
-    throw( RuntimeException, std::exception )
 {
     return Reference< XContentProvider >(
                         new UcbContentProviderProxy( m_xSMgr, Service ) );
@@ -118,7 +116,6 @@ void SAL_CALL UcbContentProviderProxy::release()
 // virtual
 Any SAL_CALL
 UcbContentProviderProxy::queryInterface( const Type & rType )
-    throw ( RuntimeException, std::exception )
 {
     Any aRet = cppu::queryInterface( rType,
                 static_cast< XTypeProvider * >( this ),
@@ -150,7 +147,6 @@ XTYPEPROVIDER_COMMON_IMPL( UcbContentProviderProxy );
 
 
 Sequence< Type > SAL_CALL UcbContentProviderProxy::getTypes()
-    throw( RuntimeException, std::exception )
 {
     // Get original provider an forward the call...
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
@@ -175,19 +171,16 @@ Sequence< Type > SAL_CALL UcbContentProviderProxy::getTypes()
 // XServiceInfo methods.
 
 OUString SAL_CALL UcbContentProviderProxy::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.ucb.UcbContentProviderProxy" );
 }
 
 sal_Bool SAL_CALL UcbContentProviderProxy::supportsService( const OUString& ServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 css::uno::Sequence< OUString > SAL_CALL UcbContentProviderProxy::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { "com.sun.star.ucb.ContentProviderProxy" };
 }
@@ -199,8 +192,6 @@ css::uno::Sequence< OUString > SAL_CALL UcbContentProviderProxy::getSupportedSer
 // virtual
 Reference< XContent > SAL_CALL UcbContentProviderProxy::queryContent(
                         const Reference< XContentIdentifier >& Identifier )
-    throw( IllegalIdentifierException,
-           RuntimeException, std::exception )
 {
     // Get original provider an forward the call...
 
@@ -218,7 +209,6 @@ Reference< XContent > SAL_CALL UcbContentProviderProxy::queryContent(
 sal_Int32 SAL_CALL UcbContentProviderProxy::compareContentIds(
                        const Reference< XContentIdentifier >& Id1,
                        const Reference< XContentIdentifier >& Id2 )
-    throw( RuntimeException, std::exception )
 {
     // Get original provider an forward the call...
 
@@ -242,8 +232,6 @@ Reference< XContentProvider > SAL_CALL
 UcbContentProviderProxy::registerInstance( const OUString& Template,
                                              const OUString& Arguments,
                                              sal_Bool ReplaceExisting )
-    throw( IllegalArgumentException,
-           RuntimeException, std::exception )
 {
     // Just remember that this method was called ( and the params ).
 
@@ -266,8 +254,6 @@ UcbContentProviderProxy::registerInstance( const OUString& Template,
 Reference< XContentProvider > SAL_CALL
 UcbContentProviderProxy::deregisterInstance( const OUString& Template,
                                              const OUString& Arguments )
-    throw( IllegalArgumentException,
-           RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -303,7 +289,6 @@ UcbContentProviderProxy::deregisterInstance( const OUString& Template,
 // virtual
 Reference< XContentProvider > SAL_CALL
 UcbContentProviderProxy::getContentProvider()
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
     if ( !m_xProvider.is() )
diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx
index 2e1a4fc6590b..d6abd529d8dd 100644
--- a/ucb/source/core/provprox.hxx
+++ b/ucb/source/core/provprox.hxx
@@ -49,12 +49,9 @@ public:
     virtual ~UcbContentProviderProxyFactory() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -65,8 +62,7 @@ public:
 
     // XContentProviderFactory
     virtual css::uno::Reference< css::ucb::XContentProvider > SAL_CALL
-    createContentProvider( const OUString& Service )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    createContentProvider( const OUString& Service ) override;
 };
 
 
@@ -102,56 +98,42 @@ public:
     virtual ~UcbContentProviderProxy() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XContentProviderSupplier
     virtual css::uno::Reference<
         css::ucb::XContentProvider > SAL_CALL
-    getContentProvider()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getContentProvider() override;
 
     // XContentProvider
     virtual css::uno::Reference<
         css::ucb::XContent > SAL_CALL
-    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier )
-        throw( css::ucb::IllegalIdentifierException,
-               css::uno::RuntimeException, std::exception ) override;
+    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override;
     virtual sal_Int32 SAL_CALL
     compareContentIds( const css::uno::Reference< css::ucb::XContentIdentifier >& Id1,
-                       const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                       const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 ) override;
 
     // XParameterizedContentProvider
     virtual css::uno::Reference< css::ucb::XContentProvider > SAL_CALL
     registerInstance( const OUString& Template,
                       const OUString& Arguments,
-                      sal_Bool ReplaceExisting )
-        throw( css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception ) override;
+                      sal_Bool ReplaceExisting ) override;
     virtual css::uno::Reference< css::ucb::XContentProvider > SAL_CALL
     deregisterInstance( const OUString& Template,
-                        const OUString& Arguments )
-        throw( css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception ) override;
+                        const OUString& Arguments ) override;
 };
 
 #endif // INCLUDED_UCB_SOURCE_CORE_PROVPROX_HXX
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index c452136ee086..025d5537bb84 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -255,7 +255,6 @@ void SAL_CALL UniversalContentBroker::release()
 }
 
 css::uno::Any SAL_CALL UniversalContentBroker::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< XUniversalContentBroker* >(this)),
@@ -291,7 +290,6 @@ XTYPEPROVIDER_IMPL_9( UniversalContentBroker,
 
 // virtual
 void SAL_CALL UniversalContentBroker::dispose()
-    throw( css::uno::RuntimeException, std::exception )
 {
     if ( m_pDisposeEventListeners && m_pDisposeEventListeners->getLength() )
     {
@@ -308,7 +306,6 @@ void SAL_CALL UniversalContentBroker::dispose()
 // virtual
 void SAL_CALL UniversalContentBroker::addEventListener(
                             const Reference< XEventListener >& Listener )
-    throw( css::uno::RuntimeException, std::exception )
 {
     if ( !m_pDisposeEventListeners )
         m_pDisposeEventListeners.reset( new OInterfaceContainerHelper2( m_aMutex ) );
@@ -320,7 +317,6 @@ void SAL_CALL UniversalContentBroker::addEventListener(
 // virtual
 void SAL_CALL UniversalContentBroker::removeEventListener(
                             const Reference< XEventListener >& Listener )
-    throw( css::uno::RuntimeException, std::exception )
 {
     if ( m_pDisposeEventListeners )
         m_pDisposeEventListeners->removeInterface( Listener );
@@ -336,7 +332,6 @@ XSERVICEINFO_COMMOM_IMPL( UniversalContentBroker,
 /// @throws css::uno::Exception
 static css::uno::Reference< css::uno::XInterface > SAL_CALL
 UniversalContentBroker_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
-    throw( css::uno::Exception )
 {
     css::lang::XServiceInfo* pX =
         static_cast<css::lang::XServiceInfo*>(new UniversalContentBroker( ucbhelper::getComponentContext(rSMgr) ));
@@ -361,8 +356,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( UniversalContentBroker );
 
 // virtual
 void SAL_CALL UniversalContentBroker::initialize( const css::uno::Sequence< Any >& aArguments )
-    throw( css::uno::Exception,
-           css::uno::RuntimeException, std::exception )
 {
     {
         osl::MutexGuard aGuard(m_aMutex);
@@ -404,7 +397,6 @@ UniversalContentBroker::registerContentProvider(
                             const Reference< XContentProvider >& Provider,
                             const OUString& Scheme,
                             sal_Bool ReplaceExisting )
-    throw( DuplicateProviderException, css::uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard(m_aMutex);
 
@@ -450,7 +442,6 @@ UniversalContentBroker::registerContentProvider(
 void SAL_CALL UniversalContentBroker::deregisterContentProvider(
                               const Reference< XContentProvider >& Provider,
                             const OUString& Scheme )
-    throw( css::uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard(m_aMutex);
 
@@ -488,7 +479,6 @@ void SAL_CALL UniversalContentBroker::deregisterContentProvider(
 // virtual
 css::uno::Sequence< ContentProviderInfo > SAL_CALL
                             UniversalContentBroker::queryContentProviders()
-    throw( css::uno::RuntimeException, std::exception )
 {
     // Return a list with information about active(!) content providers.
 
@@ -515,7 +505,6 @@ css::uno::Sequence< ContentProviderInfo > SAL_CALL
 Reference< XContentProvider > SAL_CALL
         UniversalContentBroker::queryContentProvider( const OUString&
                                                           Identifier )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return queryContentProvider( Identifier, false );
 }
@@ -527,7 +516,6 @@ Reference< XContentProvider > SAL_CALL
 // virtual
 Reference< XContent > SAL_CALL UniversalContentBroker::queryContent(
                         const Reference< XContentIdentifier >& Identifier )
-    throw( IllegalIdentifierException, css::uno::RuntimeException, std::exception )
 {
 
     // Let the content provider for the scheme given with the content
@@ -550,7 +538,6 @@ Reference< XContent > SAL_CALL UniversalContentBroker::queryContent(
 sal_Int32 SAL_CALL UniversalContentBroker::compareContentIds(
                                 const Reference< XContentIdentifier >& Id1,
                                 const Reference< XContentIdentifier >& Id2 )
-    throw( css::uno::RuntimeException, std::exception )
 {
     OUString aURI1( Id1->getContentIdentifier() );
     OUString aURI2( Id2->getContentIdentifier() );
@@ -577,7 +564,6 @@ sal_Int32 SAL_CALL UniversalContentBroker::compareContentIds(
 Reference< XContentIdentifier > SAL_CALL
         UniversalContentBroker::createContentIdentifier(
                                             const OUString& ContentId )
-    throw( css::uno::RuntimeException, std::exception )
 {
 
     // Let the content provider for the scheme given with content
@@ -609,7 +595,6 @@ Reference< XContentIdentifier > SAL_CALL
 
 // virtual
 sal_Int32 SAL_CALL UniversalContentBroker::createCommandIdentifier()
-    throw( RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -623,7 +608,6 @@ Any SAL_CALL UniversalContentBroker::execute(
                           const Command& aCommand,
                           sal_Int32,
                           const Reference< XCommandEnvironment >& Environment )
-    throw( Exception, CommandAbortedException, RuntimeException, std::exception )
 {
     Any aRet;
 
@@ -709,7 +693,6 @@ Any SAL_CALL UniversalContentBroker::execute(
 
 // virtual
 void SAL_CALL UniversalContentBroker::releaseCommandIdentifier(sal_Int32 /*aCommandId*/)
-    throw( RuntimeException, std::exception )
 {
     // @@@ Not implemeted ( yet).
 }
@@ -717,7 +700,6 @@ void SAL_CALL UniversalContentBroker::releaseCommandIdentifier(sal_Int32 /*aComm
 
 // virtual
 void SAL_CALL UniversalContentBroker::abort( sal_Int32 )
-    throw( RuntimeException, std::exception )
 {
     // @@@ Not implemeted ( yet).
 }
@@ -728,7 +710,6 @@ void SAL_CALL UniversalContentBroker::abort( sal_Int32 )
 
 // virtual
 void SAL_CALL UniversalContentBroker::changesOccurred( const util::ChangesEvent& Event )
-        throw( uno::RuntimeException, std::exception )
 {
     sal_Int32 nCount = Event.Changes.getLength();
     if ( nCount )
@@ -774,7 +755,6 @@ void SAL_CALL UniversalContentBroker::changesOccurred( const util::ChangesEvent&
 
 // virtual
 void SAL_CALL UniversalContentBroker::disposing(const lang::EventObject&)
-    throw( uno::RuntimeException, std::exception )
 {
     if ( m_xNotifier.is() )
     {
@@ -802,7 +782,6 @@ Reference< XContentProvider > UniversalContentBroker::queryContentProvider(
 }
 
 void UniversalContentBroker::configureUcb()
-    throw (uno::RuntimeException)
 {
     OUString aKey1;
     OUString aKey2;
diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx
index c09252829346..1cd5ef1a364b 100644
--- a/ucb/source/core/ucb.hxx
+++ b/ucb/source/core/ucb.hxx
@@ -66,26 +66,20 @@ public:
     virtual ~UniversalContentBroker() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -96,81 +90,59 @@ public:
 
     // XComponent
     virtual void SAL_CALL
-    dispose()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    dispose() override;
     virtual void SAL_CALL
-    addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
     virtual void SAL_CALL
     removeEventListener( const css::uno::Reference<
-                            css::lang::XEventListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                            css::lang::XEventListener >& Listener ) override;
 
     // XInitialization
     virtual void SAL_CALL
-    initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw( css::uno::Exception,
-               css::uno::RuntimeException, std::exception ) override;
+    initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XContentProviderManager
     virtual css::uno::Reference< css::ucb::XContentProvider > SAL_CALL
     registerContentProvider( const css::uno::Reference< css::ucb::XContentProvider >&  Provider,
                              const OUString& Scheme,
-                             sal_Bool ReplaceExisting )
-        throw( css::ucb::DuplicateProviderException,
-               css::uno::RuntimeException, std::exception ) override;
+                             sal_Bool ReplaceExisting ) override;
     virtual void SAL_CALL
     deregisterContentProvider( const css::uno::Reference< css::ucb::XContentProvider >&  Provider,
-                               const OUString& Scheme )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                               const OUString& Scheme ) override;
     virtual css::uno::Sequence< css::ucb::ContentProviderInfo > SAL_CALL
-    queryContentProviders()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryContentProviders() override;
     virtual css::uno::Reference< css::ucb::XContentProvider > SAL_CALL
-    queryContentProvider( const OUString& Identifier )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryContentProvider( const OUString& Identifier ) override;
 
     // XContentProvider
     virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
-    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier )
-        throw( css::ucb::IllegalIdentifierException,
-               css::uno::RuntimeException, std::exception ) override;
+    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override;
     virtual sal_Int32 SAL_CALL
     compareContentIds( const css::uno::Reference< css::ucb::XContentIdentifier >& Id1,
-                       const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                       const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 ) override;
 
     // XContentIdentifierFactory
     virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
-    createContentIdentifier( const OUString& ContentId )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    createContentIdentifier( const OUString& ContentId ) override;
 
     // XCommandProcessor
     virtual sal_Int32 SAL_CALL
-    createCommandIdentifier()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    createCommandIdentifier() override;
     virtual css::uno::Any SAL_CALL
     execute( const css::ucb::Command& aCommand,
              sal_Int32 CommandId,
-             const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-        throw( css::uno::Exception,
-               css::ucb::CommandAbortedException,
-               css::uno::RuntimeException, std::exception ) override;
+             const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override;
     virtual void SAL_CALL
-    abort( sal_Int32 CommandId )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    abort( sal_Int32 CommandId ) override;
 
     // XCommandProcessor2
-    virtual void SAL_CALL releaseCommandIdentifier(sal_Int32 aCommandId)
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL releaseCommandIdentifier(sal_Int32 aCommandId) override;
 
     // XChangesListener
-    virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) override;
 
      // XEventListener ( base of XChangesLisetenr )
-    virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
 private:
     css::uno::Reference< css::ucb::XContentProvider >
@@ -184,17 +156,15 @@ private:
     void
     globalTransfer(
             const css::ucb::GlobalTransferCommandArgument2 & rArg,
-            const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw( css::uno::Exception, std::exception );
+            const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws css::uno::Exception
     css::uno::Any checkIn( const css::ucb::CheckinArgument& rArg,
-            const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) throw( css::uno::Exception );
+            const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
 
     /// @throws css::uno::RuntimeException
-    void configureUcb()
-        throw ( css::uno::RuntimeException);
+    void configureUcb();
 
     bool getContentProviderData(
             const OUString & rKey1,
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index 70f03c91fe24..e93f056c8e37 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -101,15 +101,13 @@ public:
 
     // XInteractionHandler methods.
     virtual void SAL_CALL handle(
-            const uno::Reference< task::XInteractionRequest >& Request )
-        throw ( uno::RuntimeException, std::exception ) override;
+            const uno::Reference< task::XInteractionRequest >& Request ) override;
 };
 
 
 // virtual
 void SAL_CALL InteractionHandlerProxy::handle(
             const uno::Reference< task::XInteractionRequest >& Request )
-    throw ( uno::RuntimeException, std::exception )
 {
     if ( !m_xOrig.is() )
         return;
@@ -168,17 +166,14 @@ class ActiveDataSink : public cppu::WeakImplHelper< io::XActiveDataSink >
 public:
     // XActiveDataSink methods.
     virtual void SAL_CALL setInputStream(
-                        const uno::Reference< io::XInputStream >& aStream )
-        throw( uno::RuntimeException, std::exception ) override;
-    virtual uno::Reference< io::XInputStream > SAL_CALL getInputStream()
-        throw( uno::RuntimeException, std::exception ) override;
+                        const uno::Reference< io::XInputStream >& aStream ) override;
+    virtual uno::Reference< io::XInputStream > SAL_CALL getInputStream() override;
 };
 
 
 // virtual
 void SAL_CALL ActiveDataSink::setInputStream(
                         const uno::Reference< io::XInputStream >& aStream )
-    throw( uno::RuntimeException, std::exception )
 {
     m_xStream = aStream;
 }
@@ -186,7 +181,6 @@ void SAL_CALL ActiveDataSink::setInputStream(
 
 // virtual
 uno::Reference< io::XInputStream > SAL_CALL ActiveDataSink::getInputStream()
-    throw( uno::RuntimeException, std::exception )
 {
     return m_xStream;
 }
@@ -204,18 +198,13 @@ public:
     CommandProcessorInfo();
 
     // XCommandInfo methods
-    virtual uno::Sequence< ucb::CommandInfo > SAL_CALL getCommands()
-        throw( uno::RuntimeException, std::exception ) override;
+    virtual uno::Sequence< ucb::CommandInfo > SAL_CALL getCommands() override;
     virtual ucb::CommandInfo SAL_CALL
-    getCommandInfoByName( const OUString& Name )
-        throw( ucb::UnsupportedCommandException, uno::RuntimeException, std::exception ) override;
+    getCommandInfoByName( const OUString& Name ) override;
     virtual ucb::CommandInfo SAL_CALL
-    getCommandInfoByHandle( sal_Int32 Handle )
-        throw( ucb::UnsupportedCommandException, uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasCommandByName( const OUString& Name )
-        throw( uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasCommandByHandle( sal_Int32 Handle )
-        throw( uno::RuntimeException, std::exception ) override;
+    getCommandInfoByHandle( sal_Int32 Handle ) override;
+    virtual sal_Bool SAL_CALL hasCommandByName( const OUString& Name ) override;
+    virtual sal_Bool SAL_CALL hasCommandByHandle( sal_Int32 Handle ) override;
 };
 
 
@@ -244,7 +233,6 @@ CommandProcessorInfo::CommandProcessorInfo()
 // virtual
 uno::Sequence< ucb::CommandInfo > SAL_CALL
 CommandProcessorInfo::getCommands()
-    throw( uno::RuntimeException, std::exception )
 {
     return uno::Sequence< ucb::CommandInfo >( *m_pInfo );
 }
@@ -253,7 +241,6 @@ CommandProcessorInfo::getCommands()
 // virtual
 ucb::CommandInfo SAL_CALL
 CommandProcessorInfo::getCommandInfoByName( const OUString& Name )
-    throw( ucb::UnsupportedCommandException, uno::RuntimeException, std::exception )
 {
     for ( sal_Int32 n = 0; n < m_pInfo->getLength(); ++n )
     {
@@ -268,7 +255,6 @@ CommandProcessorInfo::getCommandInfoByName( const OUString& Name )
 // virtual
 ucb::CommandInfo SAL_CALL
 CommandProcessorInfo::getCommandInfoByHandle( sal_Int32 Handle )
-    throw( ucb::UnsupportedCommandException, uno::RuntimeException, std::exception )
 {
     for ( sal_Int32 n = 0; n < m_pInfo->getLength(); ++n )
     {
@@ -283,7 +269,6 @@ CommandProcessorInfo::getCommandInfoByHandle( sal_Int32 Handle )
 // virtual
 sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName(
                                                 const OUString& Name )
-    throw( uno::RuntimeException, std::exception )
 {
     for ( sal_Int32 n = 0; n < m_pInfo->getLength(); ++n )
     {
@@ -297,7 +282,6 @@ sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName(
 
 // virtual
 sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByHandle( sal_Int32 Handle )
-    throw( uno::RuntimeException, std::exception )
 {
     for ( sal_Int32 n = 0; n < m_pInfo->getLength(); ++n )
     {
@@ -450,7 +434,6 @@ bool setTitle(
         const uno::Reference< ucb::XCommandProcessor > & xCommandProcessor,
         const uno::Reference< ucb::XCommandEnvironment > & xEnv,
         const OUString & rNewTitle )
-    throw( uno::RuntimeException )
 {
     try
     {
@@ -499,7 +482,6 @@ uno::Reference< ucb::XContent > createNew(
                     bool bSourceIsFolder,
                     bool bSourceIsDocument,
                     bool bSourceIsLink )
-    throw( uno::Exception )
 {
 
 
@@ -722,7 +704,6 @@ void transferProperties(
     const TransferCommandContext & rContext,
     const uno::Reference< ucb::XCommandProcessor > & xCommandProcessorS,
     const uno::Reference< ucb::XCommandProcessor > & xCommandProcessorN )
-        throw( uno::Exception )
 {
     ucb::Command aGetPropertySetInfoCommand(
                 OUString("getPropertySetInfo"),
@@ -880,7 +861,6 @@ void transferProperties(
 uno::Reference< io::XInputStream > getInputStream(
     const TransferCommandContext & rContext,
     const uno::Reference< ucb::XCommandProcessor > & xCommandProcessorS )
-        throw( uno::Exception )
 {
     uno::Reference< io::XInputStream > xInputStream;
 
@@ -958,7 +938,6 @@ uno::Reference< io::XInputStream > getInputStream(
 uno::Reference< sdbc::XResultSet > getResultSet(
     const TransferCommandContext & rContext,
     const uno::Reference< ucb::XCommandProcessor > & xCommandProcessorS )
-        throw( uno::Exception )
 {
     uno::Reference< sdbc::XResultSet > xResultSet;
 
@@ -1009,7 +988,6 @@ void handleNameClashRename(
         const uno::Reference<
             ucb::XCommandProcessor > & xCommandProcessorS,
         /* [inout] */ uno::Reference< io::XInputStream > & xInputStream )
-    throw( uno::Exception, std::exception )
 {
     sal_Int32 nTry = 0;
 
@@ -1179,7 +1157,6 @@ void globalTransfer_(
         const uno::Reference< ucb::XContent > & xSource,
         const uno::Reference< ucb::XContent > & xTarget,
         const uno::Reference< sdbc::XRow > & xSourceProps )
-    throw( uno::Exception, std::exception )
 {
     // IsFolder: property is required.
     bool bSourceIsFolder = xSourceProps->getBoolean( 1 );
@@ -1642,7 +1619,6 @@ UniversalContentBroker::getCommandInfo()
 void UniversalContentBroker::globalTransfer(
             const ucb::GlobalTransferCommandArgument2 & rArg,
             const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-    throw( uno::Exception, std::exception )
 {
     // Use own command environment with own interaction handler intercepting
     // some interaction requests that shall not be handled by the user-supplied
@@ -1973,7 +1949,7 @@ void UniversalContentBroker::globalTransfer(
 }
 
 uno::Any UniversalContentBroker::checkIn( const ucb::CheckinArgument& rArg,
-            const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw ( uno::Exception )
+            const uno::Reference< ucb::XCommandEnvironment >& xEnv )
 {
     uno::Any aRet;
     // Use own command environment with own interaction handler intercepting
diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index b79d6a3f8078..b6cb1d1224c8 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -200,7 +200,6 @@ XSERVICEINFO_COMMOM_IMPL( UcbPropertiesManager,
 /// @throws css::uno::Exception
 static css::uno::Reference< css::uno::XInterface > SAL_CALL
 UcbPropertiesManager_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
-throw( css::uno::Exception )
 {
     css::lang::XServiceInfo* pX =
         static_cast<css::lang::XServiceInfo*>(new UcbPropertiesManager( rSMgr ));
@@ -223,7 +222,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( UcbPropertiesManager );
 
 // virtual
 Sequence< Property > SAL_CALL UcbPropertiesManager::getProperties()
-    throw( RuntimeException, std::exception )
 {
     return m_pProps;
 }
@@ -231,7 +229,6 @@ Sequence< Property > SAL_CALL UcbPropertiesManager::getProperties()
 
 // virtual
 Property SAL_CALL UcbPropertiesManager::getPropertyByName( const OUString& aName )
-    throw( UnknownPropertyException, RuntimeException, std::exception )
 {
     Property aProp;
     if ( queryProperty( aName, aProp ) )
@@ -243,7 +240,6 @@ Property SAL_CALL UcbPropertiesManager::getPropertyByName( const OUString& aName
 
 // virtual
 sal_Bool SAL_CALL UcbPropertiesManager::hasPropertyByName( const OUString& Name )
-    throw( RuntimeException, std::exception )
 {
     Property aProp;
     return queryProperty( Name, aProp );
diff --git a/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx
index 536b2c4f78db..4f789f999476 100644
--- a/ucb/source/core/ucbprops.hxx
+++ b/ucb/source/core/ucbprops.hxx
@@ -50,12 +50,9 @@ public:
     virtual ~UcbPropertiesManager() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -66,15 +63,11 @@ public:
 
     // XPropertySetInfo
     virtual css::uno::Sequence< css::beans::Property > SAL_CALL
-    getProperties()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getProperties() override;
     virtual css::beans::Property SAL_CALL
-    getPropertyByName( const OUString& aName )
-        throw( css::beans::UnknownPropertyException,
-               css::uno::RuntimeException, std::exception ) override;
+    getPropertyByName( const OUString& aName ) override;
     virtual sal_Bool SAL_CALL
-    hasPropertyByName( const OUString& Name )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    hasPropertyByName( const OUString& Name ) override;
 };
 
 #endif // INCLUDED_UCB_SOURCE_CORE_UCBPROPS_HXX
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index d51090765a59..8c1f9c4c5c64 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -121,12 +121,9 @@ public:
     explicit PropertySetInfo_Impl(PersistentPropertySet* pOwner);
 
     // XPropertySetInfo
-    virtual Sequence< Property > SAL_CALL getProperties()
-        throw( RuntimeException, std::exception ) override;
-    virtual Property SAL_CALL getPropertyByName( const OUString& aName )
-        throw( UnknownPropertyException, RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name )
-        throw( RuntimeException, std::exception ) override;
+    virtual Sequence< Property > SAL_CALL getProperties() override;
+    virtual Property SAL_CALL getPropertyByName( const OUString& aName ) override;
+    virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override;
 
     // Non-interface methods.
     void reset() { m_pProps.reset(); }
@@ -164,7 +161,6 @@ XSERVICEINFO_COMMOM_IMPL( UcbStore,
 /// @throws css::uno::Exception
 static css::uno::Reference< css::uno::XInterface > SAL_CALL
 UcbStore_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
-    throw( css::uno::Exception )
 {
     css::lang::XServiceInfo* pX =
         static_cast<css::lang::XServiceInfo*>(new UcbStore( ucbhelper::getComponentContext(rSMgr) ));
@@ -190,7 +186,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( UcbStore );
 // virtual
 Reference< XPropertySetRegistry > SAL_CALL
 UcbStore::createPropertySetRegistry( const OUString& )
-    throw( RuntimeException, std::exception )
 {
     // The URL parameter is ignored by this interface implementation. It always
     // uses the configuration server as storage medium.
@@ -211,7 +206,6 @@ UcbStore::createPropertySetRegistry( const OUString& )
 
 // virtual
 void SAL_CALL UcbStore::initialize( const Sequence< Any >& aArguments )
-    throw( Exception, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
     m_pImpl->m_aInitArgs = aArguments;
@@ -263,19 +257,16 @@ PropertySetRegistry::~PropertySetRegistry()
 
 
 OUString SAL_CALL PropertySetRegistry::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.ucb.PropertySetRegistry" );
 }
 
 sal_Bool SAL_CALL PropertySetRegistry::supportsService( const OUString& ServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 css::uno::Sequence< OUString > SAL_CALL PropertySetRegistry::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { PROPSET_REG_SERVICE_NAME };
 }
@@ -287,7 +278,6 @@ css::uno::Sequence< OUString > SAL_CALL PropertySetRegistry::getSupportedService
 // virtual
 Reference< XPersistentPropertySet > SAL_CALL
 PropertySetRegistry::openPropertySet( const OUString& key, sal_Bool create )
-    throw( RuntimeException, std::exception )
 {
     if ( !key.isEmpty() )
     {
@@ -412,7 +402,6 @@ PropertySetRegistry::openPropertySet( const OUString& key, sal_Bool create )
 
 // virtual
 void SAL_CALL PropertySetRegistry::removePropertySet( const OUString& key )
-    throw( RuntimeException, std::exception )
 {
     if ( key.isEmpty() )
         return;
@@ -472,7 +461,6 @@ void SAL_CALL PropertySetRegistry::removePropertySet( const OUString& key )
 
 // virtual
 css::uno::Type SAL_CALL PropertySetRegistry::getElementType()
-    throw( RuntimeException, std::exception )
 {
     return cppu::UnoType<XPersistentPropertySet>::get();
 }
@@ -480,7 +468,6 @@ css::uno::Type SAL_CALL PropertySetRegistry::getElementType()
 
 // virtual
 sal_Bool SAL_CALL PropertySetRegistry::hasElements()
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
@@ -498,7 +485,6 @@ sal_Bool SAL_CALL PropertySetRegistry::hasElements()
 
 // virtual
 Any SAL_CALL PropertySetRegistry::getByName( const OUString& aName )
-    throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
@@ -527,7 +513,6 @@ Any SAL_CALL PropertySetRegistry::getByName( const OUString& aName )
 
 // virtual
 Sequence< OUString > SAL_CALL PropertySetRegistry::getElementNames()
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
@@ -543,7 +528,6 @@ Sequence< OUString > SAL_CALL PropertySetRegistry::getElementNames()
 
 // virtual
 sal_Bool SAL_CALL PropertySetRegistry::hasByName( const OUString& aName )
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
@@ -1134,20 +1118,17 @@ PersistentPropertySet::~PersistentPropertySet()
 // XServiceInfo methods.
 
 OUString SAL_CALL PersistentPropertySet::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.ucb.PersistentPropertySet" );
 }
 
 sal_Bool SAL_CALL PersistentPropertySet::supportsService( const OUString& ServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 css::uno::Sequence< OUString > SAL_CALL
 PersistentPropertySet::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { PERS_PROPSET_SERVICE_NAME };
 }
@@ -1158,7 +1139,6 @@ PersistentPropertySet::getSupportedServiceNames()
 
 // virtual
 void SAL_CALL PersistentPropertySet::dispose()
-    throw( RuntimeException, std::exception )
 {
     if ( m_pImpl->m_pDisposeEventListeners &&
          m_pImpl->m_pDisposeEventListeners->getLength() )
@@ -1188,7 +1168,6 @@ void SAL_CALL PersistentPropertySet::dispose()
 // virtual
 void SAL_CALL PersistentPropertySet::addEventListener(
                             const Reference< XEventListener >& Listener )
-    throw( RuntimeException, std::exception )
 {
     if ( !m_pImpl->m_pDisposeEventListeners )
         m_pImpl->m_pDisposeEventListeners =
@@ -1201,7 +1180,6 @@ void SAL_CALL PersistentPropertySet::addEventListener(
 // virtual
 void SAL_CALL PersistentPropertySet::removeEventListener(
                             const Reference< XEventListener >& Listener )
-    throw( RuntimeException, std::exception )
 {
     if ( m_pImpl->m_pDisposeEventListeners )
         m_pImpl->m_pDisposeEventListeners->removeInterface( Listener );
@@ -1215,7 +1193,6 @@ void SAL_CALL PersistentPropertySet::removeEventListener(
 
 // virtual
 Reference< XPropertySetInfo > SAL_CALL PersistentPropertySet::getPropertySetInfo()
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
@@ -1230,12 +1207,6 @@ Reference< XPropertySetInfo > SAL_CALL PersistentPropertySet::getPropertySetInfo
 // virtual
 void SAL_CALL PersistentPropertySet::setPropertyValue( const OUString& aPropertyName,
                                                        const Any& aValue )
-    throw( UnknownPropertyException,
-           PropertyVetoException,
-           IllegalArgumentException,
-           WrappedTargetException,
-           RuntimeException,
-           std::exception )
 {
     if ( aPropertyName.isEmpty() )
         throw UnknownPropertyException();
@@ -1337,9 +1308,6 @@ void SAL_CALL PersistentPropertySet::setPropertyValue( const OUString& aProperty
 // virtual
 Any SAL_CALL PersistentPropertySet::getPropertyValue(
                                             const OUString& PropertyName )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     if ( PropertyName.isEmpty() )
         throw UnknownPropertyException();
@@ -1372,9 +1340,6 @@ Any SAL_CALL PersistentPropertySet::getPropertyValue(
 void SAL_CALL PersistentPropertySet::addPropertyChangeListener(
                     const OUString& aPropertyName,
                     const Reference< XPropertyChangeListener >& xListener )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
 //  load();
 
@@ -1391,9 +1356,6 @@ void SAL_CALL PersistentPropertySet::addPropertyChangeListener(
 void SAL_CALL PersistentPropertySet::removePropertyChangeListener(
                     const OUString& aPropertyName,
                     const Reference< XPropertyChangeListener >& aListener )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
 //  load();
 
@@ -1409,9 +1371,6 @@ void SAL_CALL PersistentPropertySet::removePropertyChangeListener(
 void SAL_CALL PersistentPropertySet::addVetoableChangeListener(
                     const OUString&,
                     const Reference< XVetoableChangeListener >& )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
 //  load();
 //  OSL_FAIL( //                "PersistentPropertySet::addVetoableChangeListener - N.Y.I." );
@@ -1422,9 +1381,6 @@ void SAL_CALL PersistentPropertySet::addVetoableChangeListener(
 void SAL_CALL PersistentPropertySet::removeVetoableChangeListener(
                     const OUString&,
                     const Reference< XVetoableChangeListener >& )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
 //  load();
 //  OSL_FAIL( //                "PersistentPropertySet::removeVetoableChangeListener - N.Y.I." );
@@ -1436,7 +1392,6 @@ void SAL_CALL PersistentPropertySet::removeVetoableChangeListener(
 
 // virtual
 Reference< XPropertySetRegistry > SAL_CALL PersistentPropertySet::getRegistry()
-    throw( RuntimeException, std::exception )
 {
     return Reference< XPropertySetRegistry >( m_pImpl->m_pCreator.get() );
 }
@@ -1444,7 +1399,6 @@ Reference< XPropertySetRegistry > SAL_CALL PersistentPropertySet::getRegistry()
 
 // virtual
 OUString SAL_CALL PersistentPropertySet::getKey()
-    throw( RuntimeException, std::exception )
 {
     return m_pImpl->m_aKey;
 }
@@ -1455,7 +1409,6 @@ OUString SAL_CALL PersistentPropertySet::getKey()
 
 // virtual
 OUString SAL_CALL PersistentPropertySet::getName()
-    throw( RuntimeException, std::exception )
 {
     // same as getKey()
     return m_pImpl->m_aKey;
@@ -1464,7 +1417,6 @@ OUString SAL_CALL PersistentPropertySet::getName()
 
 // virtual
 void SAL_CALL PersistentPropertySet::setName( const OUString& aName )
-    throw( RuntimeException, std::exception )
 {
     if ( aName != m_pImpl->m_aKey )
         m_pImpl->m_pCreator->renamePropertySet( m_pImpl->m_aKey, aName );
@@ -1477,10 +1429,6 @@ void SAL_CALL PersistentPropertySet::setName( const OUString& aName )
 // virtual
 void SAL_CALL PersistentPropertySet::addProperty(
         const OUString& Name, sal_Int16 Attributes, const Any& DefaultValue )
-    throw( PropertyExistException,
-           IllegalTypeException,
-           IllegalArgumentException,
-           RuntimeException, std::exception )
 {
     if ( Name.isEmpty() )
         throw IllegalArgumentException();
@@ -1640,9 +1588,6 @@ void SAL_CALL PersistentPropertySet::addProperty(
 
 // virtual
 void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name )
-    throw( UnknownPropertyException,
-           NotRemoveableException,
-           RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
@@ -1792,7 +1737,6 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name )
 // virtual
 void SAL_CALL PersistentPropertySet::addPropertySetInfoChangeListener(
                 const Reference< XPropertySetInfoChangeListener >& Listener )
-    throw( RuntimeException, std::exception )
 {
     if ( !m_pImpl->m_pPropSetChangeListeners )
         m_pImpl->m_pPropSetChangeListeners =
@@ -1805,7 +1749,6 @@ void SAL_CALL PersistentPropertySet::addPropertySetInfoChangeListener(
 // virtual
 void SAL_CALL PersistentPropertySet::removePropertySetInfoChangeListener(
                 const Reference< XPropertySetInfoChangeListener >& Listener )
-    throw( RuntimeException, std::exception )
 {
     if ( m_pImpl->m_pPropSetChangeListeners )
         m_pImpl->m_pPropSetChangeListeners->removeInterface( Listener );
@@ -1817,7 +1760,6 @@ void SAL_CALL PersistentPropertySet::removePropertySetInfoChangeListener(
 
 // virtual
 Sequence< PropertyValue > SAL_CALL PersistentPropertySet::getPropertyValues()
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
@@ -1950,11 +1892,6 @@ Sequence< PropertyValue > SAL_CALL PersistentPropertySet::getPropertyValues()
 // virtual
 void SAL_CALL PersistentPropertySet::setPropertyValues(
                                  const Sequence< PropertyValue >& aProps )
-    throw( UnknownPropertyException,
-           PropertyVetoException,
-           IllegalArgumentException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     sal_Int32 nCount = aProps.getLength();
     if ( !nCount )
@@ -2175,7 +2112,6 @@ PropertySetInfo_Impl::PropertySetInfo_Impl(
 
 // virtual
 Sequence< Property > SAL_CALL PropertySetInfo_Impl::getProperties()
-    throw( RuntimeException, std::exception )
 {
     if ( !m_pProps )
     {
@@ -2323,7 +2259,6 @@ Sequence< Property > SAL_CALL PropertySetInfo_Impl::getProperties()
 // virtual
 Property SAL_CALL PropertySetInfo_Impl::getPropertyByName(
                                                     const OUString& aName )
-    throw( UnknownPropertyException, RuntimeException, std::exception )
 {
     Reference< XHierarchicalNameAccess > xRootHierNameAccess(
             m_pOwner->getPropertySetRegistry().getRootConfigReadAccess(),
@@ -2407,7 +2342,6 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName(
 // virtual
 sal_Bool SAL_CALL PropertySetInfo_Impl::hasPropertyByName(
                                                     const OUString& Name )
-    throw( RuntimeException, std::exception )
 {
     Reference< XHierarchicalNameAccess > xRootHierNameAccess(
             m_pOwner->getPropertySetRegistry().getRootConfigReadAccess(),
diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx
index 912256fcad47..ebc8fa419d5c 100644
--- a/ucb/source/core/ucbstore.hxx
+++ b/ucb/source/core/ucbstore.hxx
@@ -59,12 +59,9 @@ public:
     virtual ~UcbStore() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -75,14 +72,11 @@ public:
 
     // XPropertySetRegistryFactory
     virtual css::uno::Reference< css::ucb::XPropertySetRegistry > SAL_CALL
-    createPropertySetRegistry( const OUString& URL )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    createPropertySetRegistry( const OUString& URL ) override;
 
     // XInitialization
     virtual void SAL_CALL
-    initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw( css::uno::Exception,
-               css::uno::RuntimeException, std::exception ) override;
+    initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 };
 
 
@@ -117,41 +111,29 @@ public:
 
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XPropertySetRegistry
     virtual css::uno::Reference< css::ucb::XPersistentPropertySet > SAL_CALL
-    openPropertySet( const OUString& key, sal_Bool create )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    openPropertySet( const OUString& key, sal_Bool create ) override;
     virtual void SAL_CALL
-    removePropertySet( const OUString& key )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    removePropertySet( const OUString& key ) override;
 
     // XElementAccess ( XNameAccess is derived from it )
     virtual css::uno::Type SAL_CALL
-    getElementType()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getElementType() override;
     virtual sal_Bool SAL_CALL
-    hasElements()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    hasElements() 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;
+    getByName( const OUString& aName ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getElementNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getElementNames() override;
     virtual sal_Bool SAL_CALL
-    hasByName( const OUString& aName )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    hasByName( const OUString& aName ) override;
 
     // Non-interface methods
     css::uno::Reference< css::uno::XInterface >
@@ -187,116 +169,70 @@ public:
     virtual ~PersistentPropertySet() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XComponent
     virtual void SAL_CALL
-    dispose()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    dispose() override;
     virtual void SAL_CALL
-    addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
     virtual void SAL_CALL
-    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-    getPropertySetInfo()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getPropertySetInfo() override;
     virtual void SAL_CALL
     setPropertyValue( const OUString& aPropertyName,
-                      const css::uno::Any& aValue )
-        throw( css::beans::UnknownPropertyException,
-               css::beans::PropertyVetoException,
-               css::lang::IllegalArgumentException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                      const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL
-    getPropertyValue( const OUString& PropertyName )
-        throw( css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+    getPropertyValue( const OUString& PropertyName ) override;
     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;
+                               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 )
-        throw( css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                                  const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL
     addVetoableChangeListener( const OUString& PropertyName,
-                               const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-        throw( css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                               const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL
     removeVetoableChangeListener( const OUString& PropertyName,
-                                  const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-        throw( css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                                  const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // XPersistentPropertySet
     virtual css::uno::Reference< css::ucb::XPropertySetRegistry > SAL_CALL
-    getRegistry()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getRegistry() override;
     virtual OUString SAL_CALL
-    getKey()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getKey() override;
 
     // XNamed
     virtual OUString SAL_CALL
-    getName()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getName() override;
     virtual void SAL_CALL
-    setName( const OUString& aName )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    setName( const OUString& aName ) override;
 
     // XPropertyContainer
     virtual void SAL_CALL
     addProperty( const OUString& Name,
                  sal_Int16 Attributes,
-                 const css::uno::Any& DefaultValue )
-        throw( css::beans::PropertyExistException,
-               css::beans::IllegalTypeException,
-               css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception ) override;
+                 const css::uno::Any& DefaultValue ) override;
     virtual void SAL_CALL
-    removeProperty( const OUString& Name )
-        throw( css::beans::UnknownPropertyException,
-               css::beans::NotRemoveableException,
-               css::uno::RuntimeException, std::exception ) override;
+    removeProperty( const OUString& Name ) override;
 
     // XPropertySetInfoChangeNotifier
     virtual void SAL_CALL
-    addPropertySetInfoChangeListener( const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    addPropertySetInfoChangeListener( const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) override;
     virtual void SAL_CALL
-    removePropertySetInfoChangeListener( const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    removePropertySetInfoChangeListener( const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) override;
 
     // XPropertyAccess
     virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
-    getPropertyValues()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getPropertyValues() override;
     virtual void SAL_CALL
-    setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps )
-        throw( css::beans::UnknownPropertyException,
-               css::beans::PropertyVetoException,
-               css::lang::IllegalArgumentException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+    setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) override;
 
     // Non-interface methods.
     PropertySetRegistry& getPropertySetRegistry();
author	Stephan Bergmann <sbergman@redhat.com>	2017-01-26 12:28:58 +0100
committer	Stephan Bergmann <sbergman@redhat.com>	2017-01-26 12:54:43 +0000
commit	e57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
tree	bcce66b27261553c308779f3e8663a269ed3a671 /ucb/source/core
parent	8802ebd5172ec4bc412a59d136c82b77ab452281 (diff)