1 files changed, 18 insertions, 35 deletions
diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx
index 9f505364484b..366eb721f0c7 100644
--- a/ucb/source/ucp/gio/gio_content.hxx
+++ b/ucb/source/ucp/gio/gio_content.hxx
@@ -58,8 +58,7 @@ css::uno::Any convertToException(GError *pError,
 /// @throws css::io::IOException
 /// @throws css::uno::RuntimeException
 void convertToIOException(GError *pError,
-    const css::uno::Reference< css::uno::XInterface >& rContext)
-        throw (css::io::IOException, css::uno::RuntimeException, std::exception);
+    const css::uno::Reference< css::uno::XInterface >& rContext);
 
 class ContentProvider;
 class Content : public ::ucbhelper::ContentImplHelper, public css::ucb::XContentCreator
@@ -91,21 +90,18 @@ private:
 
     /// @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 transfer( const css::ucb::TransferInfo& rTransferInfo,
-        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 insert( const css::uno::Reference< css::io::XInputStream > & xInputStream,
-        bool bReplaceExisting, const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-            throw( css::uno::Exception );
+        bool bReplaceExisting, const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws css::uno::Exception
-    void destroy( bool bDeletePhysical ) throw( css::uno::Exception, std::exception );
+    void destroy( bool bDeletePhysical );
 
     static void copyData( const css::uno::Reference< css::io::XInputStream >& xIn,
         const css::uno::Reference< css::io::XOutputStream >& xOut );
@@ -125,15 +121,13 @@ public:
     /// @throws css::ucb::ContentCreationException
     Content( const css::uno::Reference<
         css::uno::XComponentContext >& rxContext, ContentProvider *pProvider,
-        const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier)
-            throw ( css::ucb::ContentCreationException );
+        const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier);
 
     /// @throws css::ucb::ContentCreationException
     Content( const css::uno::Reference<
         css::uno::XComponentContext >& rxContext, ContentProvider *pProvider,
         const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier,
-        bool bIsFolder)
-            throw ( css::ucb::ContentCreationException );
+        bool bIsFolder);
 
     virtual ~Content() override;
 
@@ -153,51 +147,40 @@ public:
     virtual OUString getParentURL() 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;
 
-    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;
 
     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;
 
     virtual OUString SAL_CALL
-    getContentType()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    getContentType() 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;
+    virtual void SAL_CALL abort( sal_Int32 CommandId ) override;
 
     virtual css::uno::Sequence< css::ucb::ContentInfo >
-        SAL_CALL queryCreatableContentsInfo()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        SAL_CALL queryCreatableContentsInfo() override;
     virtual css::uno::Reference< css::ucb::XContent >
-        SAL_CALL createNewContent( const css::ucb::ContentInfo& Info )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        SAL_CALL createNewContent( const css::ucb::ContentInfo& Info ) override;
 
     /// @throws css::uno::RuntimeException
     css::uno::Sequence< css::ucb::ContentInfo >
         queryCreatableContentsInfo(
-        const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv)
-            throw( css::uno::RuntimeException );
+        const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv);
 
     GFile* getGFile();
 };