1 files changed, 20 insertions, 50 deletions
diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx
index 45be23bc6bc3..25502ba5499b 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.hxx
@@ -124,10 +124,7 @@ private:
     /// @throws css::task::DocumentPasswordRequest
     /// @throws css::uno::RuntimeException
     bool storeData( const css::uno::Reference< css::io::XInputStream >& xData,
-                    const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw ( css::ucb::CommandFailedException,
-                css::task::DocumentPasswordRequest,
-                css::uno::RuntimeException );
+                    const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
     void renameData( const css::uno::Reference< css::ucb::XContentIdentifier >& xOldId,
                      const css::uno::Reference< css::ucb::XContentIdentifier >& xNewId );
     bool removeData();
@@ -150,30 +147,25 @@ private:
     /// @throws css::uno::Exception
     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 );
 
     /// @throws css::uno::Exception
     css::uno::Any
     open( const css::ucb::OpenCommandArgument2& rArg,
-          const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw( css::uno::Exception );
+          const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws css::uno::Exception
     void insert( const css::uno::Reference< css::io::XInputStream >& xData,
                  sal_Int32 nNameClashResolve,
-                 const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw( css::uno::Exception );
+                 const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::uno::Exception
     void destroy( bool bDeletePhysical,
-                  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
     void transfer( const css::ucb::TransferInfo& rInfo,
-                   const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw( css::uno::Exception, std::exception );
+                   const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     static css::uno::Reference< css::sdbc::XRow >
     getPropertyValues( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
@@ -193,20 +185,14 @@ private:
     /// @throws css::task::DocumentPasswordRequest
     /// @throws css::uno::RuntimeException
     css::uno::Reference< css::io::XInputStream >
-    getInputStream( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( css::ucb::CommandFailedException,
-                css::task::DocumentPasswordRequest,
-                css::uno::RuntimeException );
+    getInputStream( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::ucb::CommandFailedException
     /// @throws css::task::DocumentPasswordRequest
     /// @throws css::uno::RuntimeException
     css::uno::Reference< css::io::XOutputStream >
     getTruncatedOutputStream(
-        const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( css::ucb::CommandFailedException,
-                css::task::DocumentPasswordRequest,
-                css::uno::RuntimeException );
+        const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     css::uno::Reference< css::ucb::XContent >
     queryChildContent( const OUString & rRelativeChildUri );
@@ -215,10 +201,7 @@ private:
     /// @throws css::task::DocumentPasswordRequest
     /// @throws css::uno::RuntimeException
     css::uno::Reference< css::io::XStream >
-    getStream( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( css::ucb::CommandFailedException,
-                css::task::DocumentPasswordRequest,
-                css::uno::RuntimeException );
+    getStream( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
 public:
     // Create existing content. Fail, if not already exists.
@@ -237,46 +220,35 @@ public:
     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;
     virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
-    getIdentifier()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getIdentifier() 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;
 
 
     // Additional interfaces
@@ -284,11 +256,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.