1 files changed, 23 insertions, 46 deletions
diff --git a/ucb/source/ucp/webdav/SerfSession.hxx b/ucb/source/ucp/webdav/SerfSession.hxx
index 9bcc112a4d59..3e162258117c 100644
--- a/ucb/source/ucp/webdav/SerfSession.hxx
+++ b/ucb/source/ucp/webdav/SerfSession.hxx
@@ -74,8 +74,7 @@ public:
     /// @throws DAVException
     SerfSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory,
                  const OUString& inUri,
-                 const ucbhelper::InternetProxyDecider & rProxyDecider )
-        throw ( DAVException );
+                 const ucbhelper::InternetProxyDecider & rProxyDecider );
 
     // Serf library callbacks
     apr_status_t setupSerfConnection( apr_socket_t * inAprSocket,
@@ -121,71 +120,61 @@ public:
               const Depth inDepth,
               const std::vector< OUString > & inPropNames,
               std::vector< DAVResource > & ioResources,
-              const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+              const DAVRequestEnvironment & rEnv ) override;
 
     // propnames
     virtual void
     PROPFIND( const OUString & inPath,
               const Depth inDepth,
               std::vector< DAVResourceInfo >& ioResInfo,
-              const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+              const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     PROPPATCH( const OUString & inPath,
                const std::vector< ProppatchValue > & inValues,
-               const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+               const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     HEAD( const OUString &  inPath,
           const std::vector< OUString > & inHeaderNames,
           DAVResource & ioResource,
-          const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+          const DAVRequestEnvironment & rEnv ) override;
 
     bool isHeadRequestInProgress();
 
     virtual css::uno::Reference< css::io::XInputStream >
     GET( const OUString & inPath,
-         const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+         const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     GET( const OUString & inPath,
          css::uno::Reference< css::io::XOutputStream > &  ioOutputStream,
-         const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) 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 ( DAVException ) 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 ( DAVException ) override;
+         const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     PUT( const OUString & inPath,
          const css::uno::Reference< css::io::XInputStream > & inInputStream,
-         const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) 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 ( DAVException ) override;
+          const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     POST( const OUString & inPath,
@@ -193,51 +182,42 @@ public:
           const OUString & rReferer,
           const css::uno::Reference< css::io::XInputStream > & inInputStream,
           css::uno::Reference< css::io::XOutputStream > & oOutputStream,
-          const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+          const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     MKCOL( const OUString & inPath,
-           const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+           const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     COPY( const OUString & inSourceURL,
           const OUString & inDestinationURL,
           const DAVRequestEnvironment & rEnv,
-          bool inOverWrite = false )
-        throw ( DAVException ) override;
+          bool inOverWrite = false ) override;
 
     virtual void
     MOVE( const OUString & inSourceURL,
           const OUString & inDestinationURL,
           const DAVRequestEnvironment & rEnv,
-          bool inOverWrite = false )
-        throw ( DAVException ) override;
+          bool inOverWrite = false ) override;
 
     virtual void DESTROY( const OUString & inPath,
-                          const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+                          const DAVRequestEnvironment & rEnv ) override;
 
     // set new lock.
     virtual void LOCK( const OUString & inURL,
                        css::ucb::Lock & inLock,
-                       const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+                       const DAVRequestEnvironment & rEnv ) override;
 
     // refresh existing lock.
     virtual sal_Int64 LOCK( const OUString & inURL,
                             sal_Int64 nTimeout,
-                            const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+                            const DAVRequestEnvironment & rEnv ) override;
 
     virtual void UNLOCK( const OUString & inURL,
-                         const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+                         const DAVRequestEnvironment & rEnv ) override;
 
     // helpers
-    virtual void abort()
-        throw ( DAVException ) override;
+    virtual void abort() override;
 
     const OUString & getHostName() const { return m_aUri.GetHost(); }
     int getPort() const { return m_aUri.GetPort(); }
@@ -248,16 +228,13 @@ private:
     friend class SerfLockStore;
 
     /// @throws DAVException
-    void Init()
-        throw ( DAVException );
+    void Init();
 
     /// @throws DAVException
-    void Init( const DAVRequestEnvironment & rEnv )
-        throw ( DAVException );
+    void Init( const DAVRequestEnvironment & rEnv );
 
     /// @throws DAVException
-    void HandleError( std::shared_ptr<SerfRequestProcessor> rReqProc )
-        throw ( DAVException );
+    void HandleError( std::shared_ptr<SerfRequestProcessor> rReqProc );
 
     const ucbhelper::InternetProxyServer & getProxySettings() const;