1 files changed, 15 insertions, 32 deletions
diff --git a/ucb/source/ucp/package/pkgcontent.hxx b/ucb/source/ucp/package/pkgcontent.hxx
index 865fe9167b15..f6b0ad555b56 100644
--- a/ucb/source/ucp/package/pkgcontent.hxx
+++ b/ucb/source/ucp/package/pkgcontent.hxx
@@ -134,8 +134,7 @@ private:
     /// @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 );
 
     css::uno::Reference< css::container::XHierarchicalNameAccess >
     getPackage( const PackageUri& rURI );
@@ -176,25 +175,21 @@ 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, std::exception );
+          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::uno::Exception
     void insert( const css::uno::Reference< css::io::XInputStream >& xStream,
                  sal_Int32 nNameClashResolve,
                  const css::uno::Reference<
-                    css::ucb::XCommandEnvironment > & xEnv )
-        throw( css::uno::Exception, std::exception );
+                    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 );
 
     css::uno::Reference< css::io::XInputStream >
     getInputStream();
@@ -218,43 +213,33 @@ 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;
 
     // 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
@@ -262,11 +247,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.