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>

17 files changed, 124 insertions, 400 deletions

diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
index 2ce02150afbb..c20173a6bde7 100644
--- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
@@ -171,7 +171,6 @@ void DAVResourceAccess::OPTIONS(
     DAVOptions & rOptions,
     const css::uno::Reference<
     css::ucb::XCommandEnvironment > & xEnv )
-    throw ( DAVException )
 {
     initialize();
 
@@ -212,7 +211,6 @@ void DAVResourceAccess::PROPFIND(
     const std::vector< OUString > & rPropertyNames,
     std::vector< DAVResource > & rResources,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -255,7 +253,6 @@ void DAVResourceAccess::PROPFIND(
     const Depth nDepth,
     std::vector< DAVResourceInfo > & rResInfo,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -295,7 +292,6 @@ void DAVResourceAccess::PROPFIND(
 void DAVResourceAccess::PROPPATCH(
     const std::vector< ProppatchValue >& rValues,
     const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -335,7 +331,6 @@ void DAVResourceAccess::HEAD(
     const std::vector< OUString > & rHeaderNames,
     DAVResource & rResource,
     const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -374,7 +369,6 @@ void DAVResourceAccess::HEAD(
 
 uno::Reference< io::XInputStream > DAVResourceAccess::GET(
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -416,7 +410,6 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET(
 void DAVResourceAccess::GET(
     uno::Reference< io::XOutputStream > & rStream,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -455,7 +448,6 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET(
     const std::vector< OUString > & rHeaderNames,
     DAVResource & rResource,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw (css::uno::RuntimeException, DAVException)
 {
     initialize();
 
@@ -501,7 +493,6 @@ void DAVResourceAccess::GET0(
     const std::vector< OUString > & rHeaderNames,
     DAVResource & rResource,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -544,7 +535,6 @@ void DAVResourceAccess::GET(
     const std::vector< OUString > & rHeaderNames,
     DAVResource & rResource,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -583,7 +573,6 @@ void DAVResourceAccess::GET(
 
 
 void DAVResourceAccess::abort()
-  throw( DAVException )
 {
     initialize();
     m_xSession->abort();
@@ -594,7 +583,6 @@ namespace {
 
     /// @throws DAVException
     void resetInputStream( const uno::Reference< io::XInputStream > & rStream )
-        throw( DAVException )
     {
         try
         {
@@ -622,7 +610,6 @@ namespace {
 void DAVResourceAccess::PUT(
     const uno::Reference< io::XInputStream > & rStream,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw (css::uno::RuntimeException, DAVException)
 {
     initialize();
 
@@ -671,7 +658,6 @@ uno::Reference< io::XInputStream > DAVResourceAccess::POST(
     const OUString & rReferer,
     const uno::Reference< io::XInputStream > & rInputStream,
     const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-  throw (css::uno::RuntimeException, DAVException)
 {
     initialize();
 
@@ -735,7 +721,6 @@ void DAVResourceAccess::POST(
     const uno::Reference< io::XInputStream > & rInputStream,
     uno::Reference< io::XOutputStream > & rOutputStream,
     const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-  throw (css::uno::RuntimeException, DAVException)
 {
     initialize();
 
@@ -793,7 +778,6 @@ void DAVResourceAccess::POST(
 
 void DAVResourceAccess::MKCOL(
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -833,7 +817,6 @@ void DAVResourceAccess::COPY(
     const OUString & rDestinationURI,
     bool bOverwrite,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -875,7 +858,6 @@ void DAVResourceAccess::MOVE(
     const OUString & rDestinationURI,
     bool bOverwrite,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -914,7 +896,6 @@ void DAVResourceAccess::MOVE(
 
 void DAVResourceAccess::DESTROY(
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -953,7 +934,6 @@ void DAVResourceAccess::DESTROY(
 void DAVResourceAccess::LOCK(
     ucb::Lock & inLock,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw ( DAVException )
 {
     initialize();
 
@@ -1037,7 +1017,6 @@ sal_Int64 DAVResourceAccess::LOCK(
 
 void DAVResourceAccess::UNLOCK(
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw ( DAVException )
 {
     initialize();
 
@@ -1073,7 +1052,6 @@ void DAVResourceAccess::UNLOCK(
 
 
 void DAVResourceAccess::setFlags( const uno::Sequence< beans::NamedValue >& rFlags )
-    throw ( DAVException )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
     m_aFlags = rFlags;
@@ -1081,7 +1059,6 @@ void DAVResourceAccess::setFlags( const uno::Sequence< beans::NamedValue >& rFla
 
 
 void DAVResourceAccess::setURL( const OUString & rNewURL )
-    throw( DAVException )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
     m_aURL  = rNewURL;
@@ -1091,7 +1068,6 @@ void DAVResourceAccess::setURL( const OUString & rNewURL )
 
 // init dav session and path
 void DAVResourceAccess::initialize()
-    throw ( DAVException )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
     if ( m_aPath.isEmpty() )
@@ -1189,7 +1165,6 @@ void DAVResourceAccess::getUserRequestHeaders(
 // This function member implements the control on cyclical redirections
 bool DAVResourceAccess::detectRedirectCycle(
                                 const OUString& rRedirectURL )
-    throw ( DAVException )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -1236,7 +1211,6 @@ void DAVResourceAccess::resetUri()
 
 
 bool DAVResourceAccess::handleException( const DAVException & e, int errorCount )
-    throw ( DAVException )
 {
     switch ( e.getError() )
     {
diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
index 73e7d6d0b8ad..3667b9a15b22 100644
--- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
@@ -73,12 +73,10 @@ public:
     DAVResourceAccess & operator=( const DAVResourceAccess & rOther );
 
     /// @throws DAVException
-    void setFlags( const css::uno::Sequence< css::beans::NamedValue >& rFlags )
-        throw ( DAVException );
+    void setFlags( const css::uno::Sequence< css::beans::NamedValue >& rFlags );
 
     /// @throws DAVException
-    void setURL( const OUString & rNewURL )
-        throw ( DAVException );
+    void setURL( const OUString & rNewURL );
 
     void resetUri();
 
@@ -93,8 +91,7 @@ public:
     void
     OPTIONS( DAVOptions & rOptions,
              const css::uno::Reference<
-             css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+             css::ucb::XCommandEnvironment > & xEnv );
 
     // allprop & named
     /// @throws DAVException
@@ -102,48 +99,41 @@ public:
     PROPFIND( const Depth nDepth,
               const std::vector< OUString > & rPropertyNames,
               std::vector< DAVResource > & rResources,
-              const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+              const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     // propnames
     /// @throws DAVException
     void
     PROPFIND( const Depth nDepth,
               std::vector< DAVResourceInfo > & rResInfo,
-              const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+              const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     void
     PROPPATCH( const std::vector< ProppatchValue > & rValues,
-               const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw ( DAVException );
+               const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws DAVException
     void
     HEAD( const std::vector< OUString > & rHeaderNames, // empty == 'all'
           DAVResource & rResource,
-          const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw ( DAVException );
+          const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws DAVException
     css::uno::Reference< css::io::XInputStream >
-    GET( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+    GET( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     void
     GET( css::uno::Reference< css::io::XOutputStream > & rStream,
-         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::uno::RuntimeException
     /// @throws DAVException
     css::uno::Reference< css::io::XInputStream >
     GET( const std::vector< OUString > & rHeaderNames, // empty == 'all'
          DAVResource & rResource,
-         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw (css::uno::RuntimeException, DAVException);
+         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     // used as HEAD substitute when HEAD is not implemented on server
     /// @throws DAVException
@@ -151,23 +141,20 @@ public:
     GET0( DAVRequestHeaders & rRequestHeaders,
           const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all'
           DAVResource & rResource,
-          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-         throw ( DAVException );
+          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     void
     GET( css::uno::Reference< css::io::XOutputStream > & rStream,
          const std::vector< OUString > & rHeaderNames, // empty == 'all'
          DAVResource & rResource,
-         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::uno::RuntimeException
     /// @throws DAVException
     void
     PUT( const css::uno::Reference< css::io::XInputStream > & rStream,
-         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw (css::uno::RuntimeException, DAVException);
+         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::uno::RuntimeException
     /// @throws DAVException
@@ -175,8 +162,7 @@ public:
     POST( const OUString & rContentType,
           const OUString & rReferer,
           const css::uno::Reference< css::io::XInputStream > & rInputStream,
-          const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw (css::uno::RuntimeException, DAVException);
+          const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws css::uno::RuntimeException
     /// @throws DAVException
@@ -185,41 +171,35 @@ public:
           const OUString & rReferer,
           const css::uno::Reference< css::io::XInputStream > & rInputStream,
           css::uno::Reference< css::io::XOutputStream > & rOutputStream,
-          const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw (css::uno::RuntimeException, DAVException);
+          const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws DAVException
     void
-    MKCOL( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+    MKCOL( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     void
     COPY( const OUString & rSourcePath,
           const OUString & rDestinationURI,
           bool bOverwrite,
-          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     void
     MOVE( const OUString & rSourcePath,
           const OUString & rDestinationURI,
           bool bOverwrite,
-          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     void
-    DESTROY( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+    DESTROY( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     // set new lock.
     /// @throws DAVException
     void
     LOCK( css::ucb::Lock & inLock,
-          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw( DAVException );
+          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
 #if 0 // currently not used, but please don't remove code
     // refresh existing lock.
@@ -231,13 +211,11 @@ public:
 
     /// @throws DAVException
     void
-    UNLOCK( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+    UNLOCK( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     void
-    abort()
-        throw ( DAVException );
+    abort();
 
     // helper
     static void
@@ -248,17 +226,14 @@ public:
         DAVRequestHeaders & rRequestHeaders );
 
         /// @throws DAVException
-        bool handleException( const DAVException & e, int errorCount )
-        throw ( DAVException );
+        bool handleException( const DAVException & e, int errorCount );
 
 private:
     const OUString & getRequestURI() const;
     /// @throws DAVException
-    bool detectRedirectCycle( const OUString& rRedirectURL )
-        throw ( DAVException );
+    bool detectRedirectCycle( const OUString& rRedirectURL );
     /// @throws DAVException
-    void initialize()
-        throw ( DAVException );
+    void initialize();
 };
 
 } // namespace webdav_ucp
diff --git a/ucb/source/ucp/webdav-neon/DAVSession.hxx b/ucb/source/ucp/webdav-neon/DAVSession.hxx
index 5516a26a215f..58839c80a47f 100644
--- a/ucb/source/ucp/webdav-neon/DAVSession.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVSession.hxx
@@ -78,8 +78,7 @@ public:
     /// @throws std::exception
     virtual void OPTIONS( const OUString & inPath,
                           DAVOptions& rOptions,
-                          const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) = 0;
+                          const DAVRequestEnvironment & rEnv ) = 0;
 
     // allprop & named
     /// @throws std::exception
@@ -87,49 +86,42 @@ public:
                            const Depth inDepth,
                            const std::vector< OUString > & inPropertyNames,
                            std::vector< DAVResource > & ioResources,
-                           const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) = 0;
+                           const DAVRequestEnvironment & rEnv ) = 0;
 
     // propnames
     /// @throws std::exception
     virtual void PROPFIND( const OUString & inPath,
                            const Depth inDepth,
                            std::vector< DAVResourceInfo > & ioResInfo,
-                           const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) = 0;
+                           const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
     virtual void PROPPATCH( const OUString & inPath,
                             const std::vector< ProppatchValue > & inValues,
-                            const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) = 0;
+                            const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
     virtual void HEAD( const OUString &  inPath,
                        const std::vector< OUString > & inHeaderNames,
                        DAVResource & ioResource,
-                       const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) = 0;
+                       const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
     virtual css::uno::Reference< css::io::XInputStream >
     GET( const OUString & inPath,
-         const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) = 0;
+         const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
     virtual void GET( const OUString & inPath,
                       css::uno::Reference< css::io::XOutputStream >& o,
-                      const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) = 0;
+                      const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
     virtual css::uno::Reference< css::io::XInputStream >
     GET( const OUString & inPath,
          const std::vector< OUString > & inHeaderNames,
          DAVResource & ioResource,
-         const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) = 0;
+         const DAVRequestEnvironment & rEnv ) = 0;
 
     // used as HEAD substitute when HEAD is not implemented on server
     /// @throws std::exception
@@ -137,8 +129,7 @@ public:
     GET0( const OUString & inPath,
           const std::vector< OUString > & inHeaderNames,
           DAVResource & ioResource,
-          const DAVRequestEnvironment & rEnv )
-         throw( std::exception ) = 0;
+          const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
     virtual void
@@ -146,14 +137,12 @@ public:
          css::uno::Reference< css::io::XOutputStream >& o,
          const std::vector< OUString > & inHeaderNames,
          DAVResource & ioResource,
-         const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) = 0;
+         const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
     virtual void PUT( const OUString & inPath,
                       const css::uno::Reference< css::io::XInputStream >& s,
-                      const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) = 0;
+                      const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
     virtual css::uno::Reference< css::io::XInputStream >
@@ -161,8 +150,7 @@ public:
           const OUString & rContentType,
           const OUString & rReferer,
           const css::uno::Reference< css::io::XInputStream > & inInputStream,
-          const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) = 0;
+          const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
     virtual void POST( const OUString & inPath,
@@ -170,48 +158,40 @@ public:
                        const OUString & rReferer,
                        const css::uno::Reference< css::io::XInputStream > & inInputStream,
                        css::uno::Reference< css::io::XOutputStream > & oOutputStream,
-                       const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) = 0;
+                       const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
     virtual void MKCOL( const OUString & inPath,
-                        const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) = 0;
+                        const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
     virtual void COPY( const OUString & inSource,
                        const OUString & inDestination,
                        const DAVRequestEnvironment & rEnv,
-                       bool inOverwrite )
-        throw( std::exception ) = 0;
+                       bool inOverwrite ) = 0;
 
     /// @throws std::exception
     virtual void MOVE( const OUString & inSource,
                        const OUString & inDestination,
                        const DAVRequestEnvironment & rEnv,
-                       bool inOverwrite )
-        throw( std::exception ) = 0;
+                       bool inOverwrite ) = 0;
 
     /// @throws std::exception
     virtual void DESTROY( const OUString & inPath,
-                          const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) = 0;
+                          const DAVRequestEnvironment & rEnv ) = 0;
 
     // set new lock.
     /// @throws std::exception
     virtual void LOCK( const OUString & inPath,
                        css::ucb::Lock & inLock,
-                       const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) = 0;
+                       const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
     virtual void UNLOCK( const OUString & inPath,
-                         const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) = 0;
+                         const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
-    virtual void abort()
-        throw( std::exception ) = 0;
+    virtual void abort() = 0;
 
 protected:
     rtl::Reference< DAVSessionFactory > m_xFactory;
diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx
index db1ee134df0f..d189a66cba7e 100644
--- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx
+++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx
@@ -43,7 +43,6 @@ rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession(
                 const OUString & inUri,
                 const uno::Sequence< beans::NamedValue >& rFlags,
                 const uno::Reference< uno::XComponentContext > & rxContext )
-    throw( DAVException )
 {
     m_xContext = rxContext;
 
diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx
index 07dee1521472..7fa3b095974e 100644
--- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx
@@ -65,8 +65,7 @@ public:
     rtl::Reference< DAVSession >
         createDAVSession( const OUString & inUri,
                           const ::uno::Sequence< css::beans::NamedValue >& rFlags,
-                          const ::uno::Reference< ::uno::XComponentContext >& rxContext )
-            throw( DAVException );
+                          const ::uno::Reference< ::uno::XComponentContext >& rxContext );
 
     const ::uno::Reference< ::uno::XComponentContext >& getComponentContext() {  return m_xContext; }
 private:
diff --git a/ucb/source/ucp/webdav-neon/NeonInputStream.cxx b/ucb/source/ucp/webdav-neon/NeonInputStream.cxx
index c6c65a906656..d5e80029933d 100644
--- a/ucb/source/ucp/webdav-neon/NeonInputStream.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonInputStream.cxx
@@ -56,7 +56,6 @@ void NeonInputStream::AddToStream( const char * inBuf, sal_Int32 inLen )
 }
 
 Any NeonInputStream::queryInterface( const Type &type )
-                        throw( RuntimeException, std::exception )
 {
     Any aRet = ::cppu::queryInterface( type,
                                        static_cast< XInputStream * >( this ),
@@ -67,10 +66,6 @@ Any NeonInputStream::queryInterface( const Type &type )
 // "Reads" the specified number of bytes from the stream
 sal_Int32 SAL_CALL NeonInputStream::readBytes(
   css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw( css::io::NotConnectedException,
-               css::io::BufferSizeExceededException,
-               css::io::IOException,
-               css::uno::RuntimeException, std::exception )
 {
     // Work out how much we're actually going to write
     sal_Int32 theBytes2Read = nBytesToRead;
@@ -93,10 +88,6 @@ sal_Int32 SAL_CALL NeonInputStream::readBytes(
 
 sal_Int32 SAL_CALL NeonInputStream::readSomeBytes(
  css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-        throw( css::io::NotConnectedException,
-               css::io::BufferSizeExceededException,
-               css::io::IOException,
-               css::uno::RuntimeException, std::exception )
 {
     // Warning: What should this be doing ?
     return readBytes( aData, nMaxBytesToRead );
@@ -104,10 +95,6 @@ sal_Int32 SAL_CALL NeonInputStream::readSomeBytes(
 
 // Moves the current stream position forward
 void SAL_CALL NeonInputStream::skipBytes( sal_Int32 nBytesToSkip )
-        throw( css::io::NotConnectedException,
-               css::io::BufferSizeExceededException,
-               css::io::IOException,
-               css::uno::RuntimeException, std::exception )
 {
     mPos += nBytesToSkip;
     if ( mPos >= mLen )
@@ -116,24 +103,15 @@ void SAL_CALL NeonInputStream::skipBytes( sal_Int32 nBytesToSkip )
 
 // Returns the number of unread bytes currently remaining on the stream
 sal_Int32 SAL_CALL NeonInputStream::available(  )
-        throw( css::io::NotConnectedException,
-               css::io::IOException,
-               css::uno::RuntimeException, std::exception )
 {
     return sal::static_int_cast<sal_Int32>(mLen - mPos);
 }
 
 void SAL_CALL NeonInputStream::closeInput()
-         throw( css::io::NotConnectedException,
-                  css::io::IOException,
-                  css::uno::RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL NeonInputStream::seek( sal_Int64 location )
-        throw( css::lang::IllegalArgumentException,
-               css::io::IOException,
-               css::uno::RuntimeException, std::exception )
 {
     if ( location < 0 )
         throw css::lang::IllegalArgumentException();
@@ -145,15 +123,11 @@ void SAL_CALL NeonInputStream::seek( sal_Int64 location )
 }
 
 sal_Int64 SAL_CALL NeonInputStream::getPosition()
-        throw( css::io::IOException,
-               css::uno::RuntimeException, std::exception )
 {
     return mPos;
 }
 
 sal_Int64 SAL_CALL NeonInputStream::getLength()
-        throw( css::io::IOException,
-               css::uno::RuntimeException, std::exception )
 {
     return mLen;
 }
diff --git a/ucb/source/ucp/webdav-neon/NeonInputStream.hxx b/ucb/source/ucp/webdav-neon/NeonInputStream.hxx
index 154f0fbe9195..42e134637ec9 100644
--- a/ucb/source/ucp/webdav-neon/NeonInputStream.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonInputStream.hxx
@@ -58,8 +58,7 @@ class NeonInputStream : public css::io::XInputStream,
         void AddToStream( const char * inBuf, sal_Int32 inLen );
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & type )
-                            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & type ) override;
 
     virtual void SAL_CALL acquire()
                             throw () override
@@ -73,49 +72,24 @@ class NeonInputStream : public css::io::XInputStream,
     // XInputStream
     virtual sal_Int32 SAL_CALL readBytes(
               css::uno::Sequence< sal_Int8 > & aData,
-            sal_Int32 nBytesToRead )
-                throw( css::io::NotConnectedException,
-                          css::io::BufferSizeExceededException,
-                          css::io::IOException,
-                          css::uno::RuntimeException, std::exception ) override;
+            sal_Int32 nBytesToRead ) override;
 
     virtual sal_Int32 SAL_CALL readSomeBytes(
             css::uno::Sequence< sal_Int8 > & aData,
-            sal_Int32 nMaxBytesToRead )
-                throw( css::io::NotConnectedException,
-                          css::io::BufferSizeExceededException,
-                          css::io::IOException,
-                          css::uno::RuntimeException, std::exception ) override;
-
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-                throw( css::io::NotConnectedException,
-                          css::io::BufferSizeExceededException,
-                          css::io::IOException,
-                          css::uno::RuntimeException, std::exception ) override;
-
-    virtual sal_Int32 SAL_CALL available()
-                throw( css::io::NotConnectedException,
-                          css::io::IOException,
-                          css::uno::RuntimeException, std::exception ) override;
-
-    virtual void SAL_CALL closeInput()
-                throw( css::io::NotConnectedException,
-                          css::io::IOException,
-                          css::uno::RuntimeException, std::exception ) override;
+            sal_Int32 nMaxBytesToRead ) override;
+
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
+
+    virtual sal_Int32 SAL_CALL available() override;
+
+    virtual void SAL_CALL closeInput() override;
 
     // XSeekable
-    virtual void SAL_CALL seek( sal_Int64 location )
-        throw( css::lang::IllegalArgumentException,
-               css::io::IOException,
-               css::uno::RuntimeException, std::exception ) override;
-
-    virtual sal_Int64 SAL_CALL getPosition()
-        throw( css::io::IOException,
-               css::uno::RuntimeException, std::exception ) override;
-
-    virtual sal_Int64 SAL_CALL getLength()
-        throw( css::io::IOException,
-               css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL seek( sal_Int64 location ) override;
+
+    virtual sal_Int64 SAL_CALL getPosition() override;
+
+    virtual sal_Int64 SAL_CALL getLength() override;
 };
 
 } // namespace webdav_ucp
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index d614a79d3930..89a0456cb4e8 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -581,7 +581,6 @@ NeonSession::NeonSession( const rtl::Reference< DAVSessionFactory > & rSessionFa
                           const OUString& inUri,
                           const uno::Sequence< beans::NamedValue >& rFlags,
                           const ucbhelper::InternetProxyDecider & rProxyDecider )
-    throw ( std::exception )
     : DAVSession( rSessionFactory )
     , m_nProxyPort( 0 )
     , m_aFlags( rFlags )
@@ -610,7 +609,6 @@ NeonSession::~NeonSession( )
 }
 
 void NeonSession::Init( const DAVRequestEnvironment & rEnv )
-    throw (css::uno::RuntimeException, std::exception)
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     m_aEnv = rEnv;
@@ -618,7 +616,6 @@ void NeonSession::Init( const DAVRequestEnvironment & rEnv )
 }
 
 void NeonSession::Init()
-    throw (css::uno::RuntimeException, std::exception)
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -843,7 +840,6 @@ bool NeonSession::UsesProxy()
 void NeonSession::OPTIONS( const OUString & inPath,
                            DAVOptions & rOptions, // contains the name+values of every header
                            const DAVRequestEnvironment & rEnv )
-    throw( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -964,7 +960,6 @@ void NeonSession::PROPFIND( const OUString & inPath,
                             const std::vector< OUString > & inPropNames,
                             std::vector< DAVResource > & ioResources,
                             const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
 
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -998,7 +993,6 @@ void NeonSession::PROPFIND( const OUString & inPath,
                             const Depth inDepth,
                             std::vector< DAVResourceInfo > & ioResInfo,
                             const DAVRequestEnvironment & rEnv )
-    throw( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "PROPFIND - relative URL: <" << inPath << "> Depth: " << inDepth );
@@ -1033,7 +1027,6 @@ void NeonSession::PROPFIND( const OUString & inPath,
 void NeonSession::PROPPATCH( const OUString & inPath,
                              const std::vector< ProppatchValue > & inValues,
                              const DAVRequestEnvironment & rEnv )
-    throw( std::exception )
 {
     SAL_INFO( "ucb.ucp.webdav", "PROPPATCH - relative URL <" << inPath << ">" );
 
@@ -1164,7 +1157,6 @@ void NeonSession::HEAD( const OUString &  inPath,
                         const std::vector< OUString > & inHeaderNames,
                         DAVResource & ioResource,
                         const DAVRequestEnvironment & rEnv )
-    throw( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "HEAD - relative URL <" << inPath << ">" );
@@ -1184,7 +1176,6 @@ void NeonSession::HEAD( const OUString &  inPath,
 uno::Reference< io::XInputStream >
 NeonSession::GET( const OUString & inPath,
                   const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "GET - relative URL <" << inPath << ">" );
@@ -1208,7 +1199,6 @@ NeonSession::GET( const OUString & inPath,
 void NeonSession::GET( const OUString & inPath,
                        uno::Reference< io::XOutputStream > & ioOutputStream,
                        const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "GET - relative URL <" << inPath << ">" );
@@ -1231,7 +1221,6 @@ NeonSession::GET( const OUString & inPath,
                   const std::vector< OUString > & inHeaderNames,
                   DAVResource & ioResource,
                   const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "GET - relative URL <" << inPath << ">" );
@@ -1259,7 +1248,6 @@ void NeonSession::GET0( const OUString & inPath,
                   const std::vector< OUString > & inHeaderNames,
                   DAVResource & ioResource,
                   const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "GET - relative URL <" << inPath << ">" );
@@ -1285,7 +1273,6 @@ void NeonSession::GET( const OUString & inPath,
                        const std::vector< OUString > & inHeaderNames,
                        DAVResource & ioResource,
                        const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "GET - relative URL <" << inPath << ">" );
@@ -1309,7 +1296,6 @@ void NeonSession::GET( const OUString & inPath,
 void NeonSession::PUT( const OUString & inPath,
                        const uno::Reference< io::XInputStream > & inInputStream,
                        const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "PUT - relative URL <" << inPath << ">" );
@@ -1336,7 +1322,6 @@ NeonSession::POST( const OUString & inPath,
                    const OUString & rReferer,
                    const uno::Reference< io::XInputStream > & inInputStream,
                    const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "POST - relative URL <" << inPath << ">" );
@@ -1370,7 +1355,6 @@ void NeonSession::POST( const OUString & inPath,
                         const uno::Reference< io::XInputStream > & inInputStream,
                         uno::Reference< io::XOutputStream > & oOutputStream,
                         const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "POST - relative URL <" << inPath << ">" );
@@ -1397,7 +1381,6 @@ void NeonSession::POST( const OUString & inPath,
 
 void NeonSession::MKCOL( const OUString & inPath,
                          const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "MKCOL - relative URL <" << inPath << ">" );
@@ -1415,7 +1398,6 @@ void NeonSession::COPY( const OUString & inSourceURL,
                         const OUString & inDestinationURL,
                         const DAVRequestEnvironment & rEnv,
                         bool inOverWrite )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "COPY - inSourceURL: "<<inSourceURL<<" inDestinationURL: "<<inDestinationURL);
@@ -1442,7 +1424,6 @@ void NeonSession::MOVE( const OUString & inSourceURL,
                         const OUString & inDestinationURL,
                         const DAVRequestEnvironment & rEnv,
                         bool inOverWrite )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "MOVE - inSourceURL: "<<inSourceURL<<" inDestinationURL: "<<inDestinationURL);
@@ -1465,7 +1446,6 @@ void NeonSession::MOVE( const OUString & inSourceURL,
 
 void NeonSession::DESTROY( const OUString & inPath,
                            const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "DESTROY - relative URL <" << inPath << ">" );
@@ -1512,7 +1492,6 @@ namespace
 void NeonSession::LOCK( const OUString & inPath,
                         ucb::Lock & rLock,
                         const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "LOCK (create) - relative URL: <" << inPath << ">" );
@@ -1651,7 +1630,6 @@ bool NeonSession::LOCK( NeonLock * pLock,
 
 void NeonSession::UNLOCK( const OUString & inPath,
                           const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -1717,7 +1695,6 @@ bool NeonSession::UNLOCK( NeonLock * pLock )
 }
 
 void NeonSession::abort()
-    throw ( std::exception )
 {
     SAL_INFO( "ucb.ucp.webdav", "neon commands cannot be aborted" );
 }
@@ -1823,7 +1800,6 @@ bool NeonSession::removeExpiredLocktoken( const OUString & inURL,
 void NeonSession::HandleError( int nError,
                                const OUString & inPath,
                                const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     m_aEnv = DAVRequestEnvironment();
 
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.hxx b/ucb/source/ucp/webdav-neon/NeonSession.hxx
index 85e8172bed75..28b23678326c 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.hxx
@@ -75,8 +75,7 @@ public:
     NeonSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory,
                  const OUString& inUri,
                  const css::uno::Sequence< css::beans::NamedValue >& rFlags,
-                 const ucbhelper::InternetProxyDecider & rProxyDecider )
-        throw ( std::exception );
+                 const ucbhelper::InternetProxyDecider & rProxyDecider );
 
     // DAVSession methods
     virtual bool CanUse( const OUString & inPath,
@@ -90,8 +89,7 @@ public:
     virtual void
     OPTIONS( const OUString & inPath,
              DAVOptions& rOptions, // contains the name+values
-             const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) SAL_OVERRIDE;
+             const DAVRequestEnvironment & rEnv ) SAL_OVERRIDE;
 
     // allprop & named
     virtual void
@@ -99,76 +97,65 @@ public:
               const Depth inDepth,
               const std::vector< OUString > & inPropNames,
               std::vector< DAVResource > & ioResources,
-              const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+              const DAVRequestEnvironment & rEnv ) override;
 
     // propnames
     virtual void
     PROPFIND( const OUString & inPath,
               const Depth inDepth,
               std::vector< DAVResourceInfo >& ioResInfo,
-              const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+              const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     PROPPATCH( const OUString & inPath,
                const std::vector< ProppatchValue > & inValues,
-               const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+               const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     HEAD( const OUString &  inPath,
           const std::vector< OUString > & inHeaderNames,
           DAVResource & ioResource,
-          const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+          const DAVRequestEnvironment & rEnv ) override;
 
     virtual css::uno::Reference< css::io::XInputStream >
     GET( const OUString & inPath,
-         const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+         const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     GET( const OUString & inPath,
          css::uno::Reference< css::io::XOutputStream > &  ioOutputStream,
-         const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+         const DAVRequestEnvironment & rEnv ) override;
 
     virtual css::uno::Reference< css::io::XInputStream >
     GET( const OUString & inPath,
          const std::vector< OUString > & inHeaderNames,
          DAVResource & ioResource,
-         const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+         const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     GET0( const OUString & inPath,
          const std::vector< OUString > & inHeaderNames,
          DAVResource & ioResource,
-         const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) override;
+         const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     GET( const OUString & inPath,
          css::uno::Reference< css::io::XOutputStream > & ioOutputStream,
          const std::vector< OUString > & inHeaderNames,
          DAVResource & ioResource,
-         const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+         const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     PUT( const OUString & inPath,
          const css::uno::Reference< css::io::XInputStream > & inInputStream,
-         const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+         const DAVRequestEnvironment & rEnv ) override;
 
     virtual css::uno::Reference< css::io::XInputStream >
     POST( const OUString & inPath,
           const OUString & rContentType,
           const OUString & rReferer,
           const css::uno::Reference< css::io::XInputStream > & inInputStream,
-          const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+          const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     POST( const OUString & inPath,
@@ -176,45 +163,37 @@ public:
           const OUString & rReferer,
           const css::uno::Reference< css::io::XInputStream > & inInputStream,
           css::uno::Reference< css::io::XOutputStream > & oOutputStream,
-          const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+          const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     MKCOL( const OUString & inPath,
-           const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+           const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     COPY( const OUString & inSourceURL,
           const OUString & inDestinationURL,
           const DAVRequestEnvironment & rEnv,
-          bool inOverWrite )
-        throw ( std::exception ) override;
+          bool inOverWrite ) override;
 
     virtual void
     MOVE( const OUString & inSourceURL,
           const OUString & inDestinationURL,
           const DAVRequestEnvironment & rEnv,
-          bool inOverWrite )
-        throw ( std::exception ) override;
+          bool inOverWrite ) override;
 
     virtual void DESTROY( const OUString & inPath,
-                          const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+                          const DAVRequestEnvironment & rEnv ) override;
 
     // set new lock.
     virtual void LOCK( const OUString & inURL,
                        css::ucb::Lock & inLock,
-                       const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+                       const DAVRequestEnvironment & rEnv ) override;
 
     virtual void UNLOCK( const OUString & inURL,
-                         const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+                         const DAVRequestEnvironment & rEnv ) override;
 
     // helpers
-    virtual void abort()
-        throw ( std::exception ) override;
+    virtual void abort() override;
 
     const OUString & getHostName() const { return m_aHostName; }
 
@@ -229,19 +208,16 @@ private:
     friend class NeonLockStore;
 
     /// @throws css::uno::RuntimeException
-    void Init()
-        throw (css::uno::RuntimeException, std::exception);
+    void Init();
 
     /// @throws css::uno::RuntimeException
-    void Init( const DAVRequestEnvironment & rEnv )
-        throw (css::uno::RuntimeException, std::exception);
+    void Init( const DAVRequestEnvironment & rEnv );
 
     // ret: true => retry request.
     /// @throws std::exception
     void HandleError( int nError,
                       const OUString & inPath,
-                      const DAVRequestEnvironment & rEnv )
-        throw ( std::exception );
+                      const DAVRequestEnvironment & rEnv );
 
     const ucbhelper::InternetProxyServer & getProxySettings() const;
 
diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx
index 40a569cb196b..cf20b9fff2aa 100644
--- a/ucb/source/ucp/webdav-neon/NeonUri.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx
@@ -73,7 +73,6 @@ const ne_uri g_sUriDefaultsFTP   = { const_cast<char *>("ftp"),
 } // namespace
 
 NeonUri::NeonUri( const ne_uri * inUri )
-    throw ( DAVException )
 {
     if ( inUri == nullptr )
         throw DAVException( DAVException::DAV_INVALID_ARG );
@@ -90,7 +89,6 @@ NeonUri::NeonUri( const ne_uri * inUri )
 }
 
 NeonUri::NeonUri( const OUString & inUri )
-    throw ( DAVException )
 {
     if ( inUri.isEmpty() )
         throw DAVException( DAVException::DAV_INVALID_ARG );
diff --git a/ucb/source/ucp/webdav-neon/NeonUri.hxx b/ucb/source/ucp/webdav-neon/NeonUri.hxx
index 66ad95bd9409..ef7b852b1f84 100644
--- a/ucb/source/ucp/webdav-neon/NeonUri.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonUri.hxx
@@ -56,9 +56,9 @@ class NeonUri
 
     public:
         /// @throws DAVException
-        explicit NeonUri( const OUString & inUri ) throw ( DAVException );
+        explicit NeonUri( const OUString & inUri );
         /// @throws DAVException
-        explicit NeonUri( const ne_uri * inUri ) throw ( DAVException );
+        explicit NeonUri( const ne_uri * inUri );
         ~NeonUri( );
 
         bool operator== ( const NeonUri & rOther ) const;
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index 96a737130006..3b332fa36ce7 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -221,7 +221,6 @@ Content::Content(
           ContentProvider* pProvider,
           const uno::Reference< ucb::XContentIdentifier >& Identifier,
           rtl::Reference< DAVSessionFactory > const & rSessionFactory )
-  throw (ucb::ContentCreationException, css::uno::RuntimeException)
 : ContentImplHelper( rxContext, pProvider, Identifier ),
   m_eResourceType( UNKNOWN ),
   m_eResourceTypeForLocks( UNKNOWN ),
@@ -255,7 +254,6 @@ Content::Content(
             const uno::Reference< ucb::XContentIdentifier >& Identifier,
             rtl::Reference< DAVSessionFactory > const & rSessionFactory,
             bool isCollection )
-  throw (ucb::ContentCreationException, css::uno::RuntimeException)
 : ContentImplHelper( rxContext, pProvider, Identifier ),
   m_eResourceType( UNKNOWN ),
   m_eResourceTypeForLocks( UNKNOWN ),
@@ -306,7 +304,6 @@ void SAL_CALL Content::release()
 
 // virtual
 uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException, std::exception )
 {
     // Note: isFolder may require network activities! So call it only
     //       if it is really necessary!!!
@@ -353,7 +350,6 @@ XTYPEPROVIDER_COMMON_IMPL( Content );
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
-    throw( uno::RuntimeException, std::exception )
 {
     bool bFolder = false;
     try
@@ -446,7 +442,6 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
 
 // virtual
 OUString SAL_CALL Content::getImplementationName()
-    throw( uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.ucb.WebDAVContent" );
 }
@@ -454,7 +449,6 @@ OUString SAL_CALL Content::getImplementationName()
 
 // virtual
 uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence<OUString> aSNS { WEBDAV_CONTENT_SERVICE_NAME };
     return aSNS;
@@ -466,7 +460,6 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
 
 // virtual
 OUString SAL_CALL Content::getContentType()
-    throw( uno::RuntimeException, std::exception )
 {
     bool bFolder = false;
     try
@@ -497,9 +490,6 @@ uno::Any SAL_CALL Content::execute(
         const ucb::Command& aCommand,
         sal_Int32 /*CommandId*/,
         const uno::Reference< ucb::XCommandEnvironment >& Environment )
-    throw( uno::Exception,
-           ucb::CommandAbortedException,
-           uno::RuntimeException, std::exception )
 {
     SAL_INFO( "ucb.ucp.webdav", "Content::execute: start: command: " <<
               aCommand.Name << ", env: " <<
@@ -843,7 +833,6 @@ uno::Any SAL_CALL Content::execute(
 
 // virtual
 void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
-    throw( uno::RuntimeException, std::exception )
 {
     try
     {
@@ -870,11 +859,6 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
 
 void Content::addProperty( const ucb::PropertyCommandArgument& aCmdArg,
                            const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-    throw( beans::PropertyExistException,
-           beans::IllegalTypeException,
-           lang::IllegalArgumentException,
-           uno::RuntimeException,
-           std::exception )
 {
 //    if ( m_bTransient )
 //   @@@ ???
@@ -1012,10 +996,6 @@ void Content::addProperty( const ucb::PropertyCommandArgument& aCmdArg,
 
 void Content::removeProperty( const OUString& Name,
                               const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-    throw( beans::UnknownPropertyException,
-           beans::NotRemoveableException,
-           uno::RuntimeException,
-           std::exception )
 {
 
     // Try to remove property from server.
@@ -1105,10 +1085,6 @@ void Content::removeProperty( const OUString& Name,
 void SAL_CALL Content::addProperty( const OUString& Name,
                                     sal_Int16 Attributes,
                                     const uno::Any& DefaultValue )
-    throw( beans::PropertyExistException,
-           beans::IllegalTypeException,
-           lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception )
 {
     beans::Property aProperty;
     aProperty.Name = Name;
@@ -1122,9 +1098,6 @@ void SAL_CALL Content::addProperty( const OUString& Name,
 
 // virtual
 void SAL_CALL Content::removeProperty( const OUString& Name )
-    throw( beans::UnknownPropertyException,
-           beans::NotRemoveableException,
-           uno::RuntimeException, std::exception )
 {
     removeProperty( Name,
                     uno::Reference< ucb::XCommandEnvironment >() );
@@ -1137,7 +1110,6 @@ void SAL_CALL Content::removeProperty( const OUString& Name )
 // virtual
 uno::Sequence< ucb::ContentInfo > SAL_CALL
 Content::queryCreatableContentsInfo()
-    throw( uno::RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -1172,7 +1144,6 @@ Content::queryCreatableContentsInfo()
 // virtual
 uno::Reference< ucb::XContent > SAL_CALL
 Content::createNewContent( const ucb::ContentInfo& Info )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -1339,7 +1310,6 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
 uno::Reference< sdbc::XRow > Content::getPropertyValues(
                 const uno::Sequence< beans::Property >& rProperties,
                 const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-    throw ( uno::Exception, std::exception )
 {
     std::unique_ptr< ContentProperties > xProps;
     std::unique_ptr< ContentProperties > xCachedProps;
@@ -1795,7 +1765,6 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
 uno::Sequence< uno::Any > Content::setPropertyValues(
                 const uno::Sequence< beans::PropertyValue >& rValues,
                 const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-    throw ( uno::Exception, std::exception )
 {
     uno::Reference< ucb::XContentIdentifier >    xIdentifier;
     rtl::Reference< ContentProvider >            xProvider;
@@ -2199,7 +2168,6 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 uno::Any Content::open(
                 const ucb::OpenCommandArgument3 & rArg,
                 const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-    throw (uno::Exception, std::exception)
 {
     uno::Any aRet;
 
@@ -2395,7 +2363,6 @@ uno::Any Content::open(
 void Content::post(
                 const ucb::PostCommandArgument2 & rArg,
                 const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-    throw( uno::Exception, std::exception )
 {
     uno::Reference< io::XActiveDataSink > xSink( rArg.Sink, uno::UNO_QUERY );
     if ( xSink.is() )
@@ -2533,7 +2500,6 @@ void Content::insert(
         const uno::Reference< io::XInputStream > & xInputStream,
         bool bReplaceExisting,
         const uno::Reference< ucb::XCommandEnvironment >& Environment )
-    throw( uno::Exception, std::exception )
 {
     bool bTransient, bCollection;
     OUString aEscapedTitle;
@@ -2796,7 +2762,6 @@ void Content::insert(
 void Content::transfer(
         const ucb::TransferInfo & rArgs,
         const uno::Reference< ucb::XCommandEnvironment >& Environment )
-    throw( uno::Exception, std::exception )
 {
     uno::Reference< ucb::XContentIdentifier >    xIdentifier;
     uno::Reference< ucb::XContentProvider >      xProvider;
@@ -3045,7 +3010,6 @@ void Content::transfer(
 
 
 void Content::destroy( bool bDeletePhysical )
-    throw( uno::Exception, std::exception )
 {
     // @@@ take care about bDeletePhysical -> trashcan support
     uno::Reference< ucb::XContent > xThis = this;
@@ -3269,7 +3233,6 @@ Content::ResourceType Content::resourceTypeForLocks(
 
 void Content::lock(
         const uno::Reference< ucb::XCommandEnvironment >& Environment )
-    throw( uno::Exception, std::exception )
 {
 // prepare aURL to be used in exception, see below
     OUString aURL;
@@ -3417,7 +3380,6 @@ void Content::lock(
 
 void Content::unlock(
         const uno::Reference< ucb::XCommandEnvironment >& Environment )
-    throw( uno::Exception, std::exception )
 {
 
     try
@@ -3560,7 +3522,6 @@ bool Content::exchangeIdentity(
 
 bool Content::isFolder(
             const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-    throw( uno::Exception, std::exception )
 {
     {
         osl::MutexGuard aGuard( m_aMutex );
@@ -3765,7 +3726,6 @@ void Content::cancelCommandExecution(
                 const DAVException & e,
                 const uno::Reference< ucb::XCommandEnvironment > & xEnv,
                 bool bWrite /* = sal_False */ )
-    throw ( uno::Exception, std::exception )
 {
     ucbhelper::cancelCommandExecution( MapDAVException( e, bWrite ), xEnv );
     // Unreachable
@@ -3806,7 +3766,6 @@ Content::ResourceType Content::getResourceType(
                     const uno::Reference< ucb::XCommandEnvironment >& xEnv,
                     const std::unique_ptr< DAVResourceAccess > & rResAccess,
                     bool * networkAccessAllowed)
-    throw ( uno::Exception, std::exception )
 {
     {
         osl::MutexGuard g(m_aMutex);
@@ -3988,7 +3947,6 @@ Content::ResourceType Content::getResourceType(
 
 Content::ResourceType Content::getResourceType(
                     const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-    throw ( uno::Exception, std::exception )
 {
     std::unique_ptr< DAVResourceAccess > xResAccess;
     {
@@ -4037,7 +3995,6 @@ void Content::getResourceOptions(
                     DAVOptions& rDAVOptions,
                     const std::unique_ptr< DAVResourceAccess > & rResAccess,
                     bool * networkAccessAllowed )
-    throw ( css::uno::Exception, std::exception )
 {
     OUString aRedirURL;
     OUString aTargetURL = rResAccess->getURL();
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
index 4510674a918c..571dec7b2fa6 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
@@ -123,20 +123,17 @@ private:
     virtual OUString getParentURL() override;
 
     /// @throws css::uno::Exception
-    bool isFolder( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw ( css::uno::Exception, std::exception );
+    bool isFolder( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws css::uno::Exception
     css::uno::Reference< css::sdbc::XRow >
     getPropertyValues( const css::uno::Sequence< css::beans::Property >& rProperties,
-                       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::Sequence< css::uno::Any >
     setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& rValues,
-                       const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw ( css::uno::Exception, std::exception );
+                       const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     typedef rtl::Reference< Content > ContentRef;
     typedef std::list< ContentRef > ContentRefList;
@@ -150,56 +147,47 @@ private:
 
     /// @throws css::uno::Exception
     ResourceType
-    getResourceType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw ( css::uno::Exception, std::exception );
+    getResourceType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws css::uno::Exception
     ResourceType
     getResourceType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv,
                      const std::unique_ptr< DAVResourceAccess > & rResAccess,
-                     bool * networkAccessAllowed = nullptr)
-        throw ( css::uno::Exception, std::exception );
+                     bool * networkAccessAllowed = nullptr);
 
     // Command "open"
     /// @throws css::uno::Exception
     css::uno::Any open(
                 const css::ucb::OpenCommandArgument3 & rArg,
-                const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw (css::uno::Exception, std::exception);
+                const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     // Command "post"
     /// @throws css::uno::Exception
     void post( const css::ucb::PostCommandArgument2 & rArg,
-               const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw( css::uno::Exception, std::exception );
+               const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     // Command "insert"
     /// @throws css::uno::Exception
     void insert( const css::uno::Reference< css::io::XInputStream > & xInputStream,
                  bool bReplaceExisting,
-                 const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-        throw( css::uno::Exception, std::exception );
+                 const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment );
 
     // Command "transfer"
     /// @throws css::uno::Exception
     void transfer( const css::ucb::TransferInfo & rArgs,
-                   const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-        throw( css::uno::Exception, std::exception );
+                   const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment );
 
     // Command "delete"
     /// @throws css::uno::Exception
-    void destroy( bool bDeletePhysical )
-        throw( css::uno::Exception, std::exception );
+    void destroy( bool bDeletePhysical );
 
     // Command "lock"
     /// @throws css::uno::Exception
-    void lock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-        throw( css::uno::Exception, std::exception );
+    void lock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment );
 
     // Command "unlock"
     /// @throws css::uno::Exception
-    void unlock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-        throw( css::uno::Exception, std::exception );
+    void unlock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment );
 
     css::uno::Any MapDAVException( const DAVException & e,
                                                 bool bWrite );
@@ -207,8 +195,7 @@ private:
     void cancelCommandExecution(
                     const DAVException & e,
                     const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv,
-                    bool bWrite = false )
-        throw( css::uno::Exception, std::exception );
+                    bool bWrite = false );
 
     static bool shouldAccessNetworkAfterException( const DAVException & e );
 
@@ -224,22 +211,13 @@ private:
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
     void addProperty( const css::ucb::PropertyCommandArgument &aCmdArg,
-                      const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-    throw( css::beans::PropertyExistException,
-           css::beans::IllegalTypeException,
-           css::lang::IllegalArgumentException,
-           css::uno::RuntimeException,
-           std::exception );
+                      const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment );
 
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::beans::NotRemoveableException
     /// @throws css::uno::RuntimeException
     void removeProperty( const OUString& Name,
-                         const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-    throw( css::beans::UnknownPropertyException,
-           css::beans::NotRemoveableException,
-           css::uno::RuntimeException,
-           std::exception );
+                         const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment );
 
 public:
     /// @throws css::ucb::ContentCreationException
@@ -247,73 +225,54 @@ public:
     Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
              ContentProvider* pProvider,
              const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier,
-             rtl::Reference< DAVSessionFactory > const & rSessionFactory )
-        throw (css::ucb::ContentCreationException, css::uno::RuntimeException);
+             rtl::Reference< DAVSessionFactory > const & rSessionFactory );
     /// @throws css::ucb::ContentCreationException
     /// @throws css::uno::RuntimeException
     Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
              ContentProvider* pProvider,
              const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier,
              rtl::Reference< DAVSessionFactory > const & rSessionFactory,
-             bool isCollection )
-        throw (css::ucb::ContentCreationException, css::uno::RuntimeException);
+             bool isCollection );
     virtual ~Content() 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;
+    getImplementationName() override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getSupportedServiceNames() override;
 
     // XContent
     virtual OUString SAL_CALL
-    getContentType()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getContentType() override;
 
     // XCommandProcessor
     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;
 
     // 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;
 
 
     // Additional interfaces
@@ -321,11 +280,9 @@ public:
 
     // XContentCreator
     virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL
-   queryCreatableContentsInfo()
-        throw( css::uno::RuntimeException, std::exception ) override;
+   queryCreatableContentsInfo() override;
     virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
-    createNewContent( const css::ucb::ContentInfo& Info )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    createNewContent( const css::ucb::ContentInfo& Info ) override;
 
 
     // Non-interface methods.
@@ -346,8 +303,7 @@ public:
     void getResourceOptions( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv,
                              DAVOptions& rDAVOptions,
                              const std::unique_ptr< DAVResourceAccess > & rResAccess,
-                             bool * networkAccessAllowed = nullptr)
-        throw ( css::uno::Exception, std::exception );
+                             bool * networkAccessAllowed = nullptr);
 
     static bool isResourceAvailable( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv,
                              const std::unique_ptr< DAVResourceAccess > & rResAccess,
diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
index 7eef0b111b35..92a290699cd3 100644
--- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
@@ -321,7 +321,6 @@ void DataSupplier::close()
 
 // virtual
 void DataSupplier::validate()
-    throw( ucb::ResultSetException )
 {
     if ( m_pImpl->m_bThrowException )
         throw ucb::ResultSetException();
diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx
index 141a6ee14a12..d717f41a88c0 100644
--- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx
@@ -72,8 +72,7 @@ public:
 
     virtual void close() override;
 
-    virtual void validate()
-        throw( css::ucb::ResultSetException ) override;
+    virtual void validate() override;
 };
 
 }
diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx
index 4c68042591fb..f1f5530787d2 100644
--- a/ucb/source/ucp/webdav-neon/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavprovider.cxx
@@ -76,7 +76,6 @@ void SAL_CALL ContentProvider::release()
 }
 
 css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
     (static_cast< lang::XTypeProvider* >(this)),
@@ -102,7 +101,6 @@ XSERVICEINFO_COMMOM_IMPL( ContentProvider,
 /// @throws css::uno::Exception
 static css::uno::Reference< css::uno::XInterface > SAL_CALL
 ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
-    throw( css::uno::Exception )
 {
     css::lang::XServiceInfo* pX =
         static_cast<css::lang::XServiceInfo*>(new ContentProvider( ucbhelper::getComponentContext(rSMgr) ));
@@ -130,8 +128,6 @@ uno::Reference< ucb::XContent > SAL_CALL
 ContentProvider::queryContent(
             const uno::Reference<
                     ucb::XContentIdentifier >& Identifier )
-    throw( ucb::IllegalIdentifierException,
-           uno::RuntimeException, std::exception )
 {
     // Check URL scheme...
 
diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.hxx b/ucb/source/ucp/webdav-neon/webdavprovider.hxx
index cadd3f71e91c..071260c6e4c5 100644
--- a/ucb/source/ucp/webdav-neon/webdavprovider.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavprovider.hxx
@@ -80,26 +80,20 @@ public:
     virtual ~ContentProvider() 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();
@@ -110,9 +104,7 @@ public:
 
     // 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;
 
 
     // Non-interface methods.