2 files changed, 11 insertions, 32 deletions
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index 2dff3383e348..28064c02fe48 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -69,7 +69,6 @@ namespace scripting_protocolhandler
 
 void SAL_CALL ScriptProtocolHandler::initialize(
     const css::uno::Sequence < css::uno::Any >& aArguments )
-    throw ( css::uno::Exception, std::exception )
 {
     if ( m_bInitialised )
     {
@@ -90,7 +89,6 @@ void SAL_CALL ScriptProtocolHandler::initialize(
 
 Reference< XDispatch > SAL_CALL ScriptProtocolHandler::queryDispatch(
     const URL& aURL, const OUString& sTargetFrameName, sal_Int32 nSearchFlags )
-    throw( css::uno::RuntimeException, std::exception )
 {
     (void)sTargetFrameName;
     (void)nSearchFlags;
@@ -115,7 +113,6 @@ Reference< XDispatch > SAL_CALL ScriptProtocolHandler::queryDispatch(
 Sequence< Reference< XDispatch > > SAL_CALL
 ScriptProtocolHandler::queryDispatches(
 const Sequence < DispatchDescriptor >& seqDescriptor )
-throw( RuntimeException, std::exception )
 {
     sal_Int32 nCount = seqDescriptor.getLength();
     Sequence< Reference< XDispatch > > lDispatcher( nCount );
@@ -131,7 +128,6 @@ throw( RuntimeException, std::exception )
 void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
     const URL& aURL, const Sequence < PropertyValue >& lArgs,
     const Reference< XDispatchResultListener >& xListener )
-    throw ( RuntimeException, std::exception )
 {
 
     bool bSuccess = false;
@@ -309,14 +305,12 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
 
 void SAL_CALL ScriptProtocolHandler::dispatch(
 const URL& aURL, const Sequence< PropertyValue >& lArgs )
-throw ( RuntimeException, std::exception )
 {
     dispatchWithNotification( aURL, lArgs, Reference< XDispatchResultListener >() );
 }
 
 void SAL_CALL ScriptProtocolHandler::addStatusListener(
 const Reference< XStatusListener >& xControl, const URL& aURL )
-throw ( RuntimeException, std::exception )
 {
     (void)xControl;
     (void)aURL;
@@ -326,7 +320,6 @@ throw ( RuntimeException, std::exception )
 
 void SAL_CALL ScriptProtocolHandler::removeStatusListener(
 const Reference< XStatusListener >& xControl, const URL& aURL )
-throw ( RuntimeException, std::exception )
 {
     (void)xControl;
     (void)aURL;
@@ -440,21 +433,18 @@ ScriptProtocolHandler::~ScriptProtocolHandler()
 
 /* XServiceInfo */
 OUString SAL_CALL ScriptProtocolHandler::getImplementationName( )
-throw( RuntimeException, std::exception )
 {
     return impl_getStaticImplementationName();
 }
 
 /* XServiceInfo */
 sal_Bool SAL_CALL ScriptProtocolHandler::supportsService(const OUString& sServiceName )
-throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 /* XServiceInfo */
 Sequence< OUString > SAL_CALL ScriptProtocolHandler::getSupportedServiceNames()
-throw( RuntimeException, std::exception )
 {
     return impl_getStaticSupportedServiceNames();
 }
@@ -474,7 +464,6 @@ OUString ScriptProtocolHandler::impl_getStaticImplementationName()
 /* Helper for registry */
 Reference< XInterface > SAL_CALL ScriptProtocolHandler::impl_createInstance(
 const Reference< css::lang::XMultiServiceFactory >& xServiceManager )
-throw( RuntimeException )
 {
     return Reference< XInterface > ( *new ScriptProtocolHandler( comphelper::getComponentContext(xServiceManager) ) );
 }
diff --git a/scripting/source/protocolhandler/scripthandler.hxx b/scripting/source/protocolhandler/scripthandler.hxx
index 70fe12843040..825f5ab75379 100644
--- a/scripting/source/protocolhandler/scripthandler.hxx
+++ b/scripting/source/protocolhandler/scripthandler.hxx
@@ -79,12 +79,9 @@ public:
     virtual ~ScriptProtocolHandler() override;
 
     /* XServiceInfo */
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName )
-        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& sServiceName ) override;
+    virtual css::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() override;
 
     /* Helper for XServiceInfo */
     static css::uno::Sequence < OUString > impl_getStaticSupportedServiceNames();
@@ -94,43 +91,36 @@ public:
     /// @throws css::uno::RuntimeException
     static css::uno::Reference < css::uno::XInterface > SAL_CALL
     impl_createInstance(
-        const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager )
-    throw( css::uno::RuntimeException );
+        const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
     static css::uno::Reference < css::lang::XSingleServiceFactory > impl_createFactory(
         const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
     /* Implementation for XDispatchProvider */
     virtual css::uno::Reference < css::frame::XDispatch > SAL_CALL
     queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName,
-                   sal_Int32 eSearchFlags ) throw( css::uno::RuntimeException, std::exception ) override ;
+                   sal_Int32 eSearchFlags ) override ;
     virtual css::uno::Sequence< css::uno::Reference < css::frame::XDispatch > > SAL_CALL
     queryDispatches(
-        const css::uno::Sequence < css::frame::DispatchDescriptor >& seqDescriptor )
-    throw( css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Sequence < css::frame::DispatchDescriptor >& seqDescriptor ) override;
 
     /* Implementation for X(Notifying)Dispatch */
     virtual void SAL_CALL dispatchWithNotification(
         const css::util::URL& aURL,
         const css::uno::Sequence< css::beans::PropertyValue >& lArgs,
-        const css::uno::Reference< css::frame::XDispatchResultListener >& Listener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::frame::XDispatchResultListener >& Listener ) override;
     virtual void SAL_CALL dispatch(
         const css::util::URL& aURL,
-        const css::uno::Sequence< css::beans::PropertyValue >& lArgs )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& lArgs ) override;
     virtual void SAL_CALL addStatusListener(
         const css::uno::Reference< css::frame::XStatusListener >& xControl,
-        const css::util::URL& aURL )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+        const css::util::URL& aURL ) override;
     virtual void SAL_CALL removeStatusListener(
         const css::uno::Reference< css::frame::XStatusListener >& xControl,
-        const css::util::URL& aURL )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+        const css::util::URL& aURL ) override;
 
     /* Implementation for XInitialization */
     virtual void SAL_CALL initialize(
-        const css::uno::Sequence < css::uno::Any >& aArguments )
-        throw ( css::uno::Exception, std::exception ) override;
+        const css::uno::Sequence < css::uno::Any >& aArguments ) override;
 };
 
 }