cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3

2 files changed, 20 insertions, 20 deletions

diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index 5ff2b182037a..cb32a6deff0c 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -72,7 +72,7 @@ const sal_Char * const MYIMPLNAME = "com.sun.star.comp.ScriptProtocolHandler";
 
 void SAL_CALL ScriptProtocolHandler::initialize(
     const css::uno::Sequence < css::uno::Any >& aArguments )
-    throw ( css::uno::Exception )
+    throw ( css::uno::Exception, std::exception )
 {
     if ( m_bInitialised )
     {
@@ -93,7 +93,7 @@ void SAL_CALL ScriptProtocolHandler::initialize(
 
 Reference< XDispatch > SAL_CALL ScriptProtocolHandler::queryDispatch(
     const URL& aURL, const OUString& sTargetFrameName, sal_Int32 nSearchFlags )
-    throw( ::com::sun::star::uno::RuntimeException )
+    throw( ::com::sun::star::uno::RuntimeException, std::exception )
 {
     (void)sTargetFrameName;
     (void)nSearchFlags;
@@ -118,7 +118,7 @@ Reference< XDispatch > SAL_CALL ScriptProtocolHandler::queryDispatch(
 Sequence< Reference< XDispatch > > SAL_CALL
 ScriptProtocolHandler::queryDispatches(
 const Sequence < DispatchDescriptor >& seqDescriptor )
-throw( RuntimeException )
+throw( RuntimeException, std::exception )
 {
     sal_Int32 nCount = seqDescriptor.getLength();
     Sequence< Reference< XDispatch > > lDispatcher( nCount );
@@ -134,7 +134,7 @@ throw( RuntimeException )
 void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
     const URL& aURL, const Sequence < PropertyValue >& lArgs,
     const Reference< XDispatchResultListener >& xListener )
-    throw ( RuntimeException )
+    throw ( RuntimeException, std::exception )
 {
 
     sal_Bool bSuccess = sal_False;
@@ -297,14 +297,14 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
 
 void SAL_CALL ScriptProtocolHandler::dispatch(
 const URL& aURL, const Sequence< PropertyValue >& lArgs )
-throw ( RuntimeException )
+throw ( RuntimeException, std::exception )
 {
     dispatchWithNotification( aURL, lArgs, Reference< XDispatchResultListener >() );
 }
 
 void SAL_CALL ScriptProtocolHandler::addStatusListener(
 const Reference< XStatusListener >& xControl, const URL& aURL )
-throw ( RuntimeException )
+throw ( RuntimeException, std::exception )
 {
     (void)xControl;
     (void)aURL;
@@ -314,7 +314,7 @@ throw ( RuntimeException )
 
 void SAL_CALL ScriptProtocolHandler::removeStatusListener(
 const Reference< XStatusListener >& xControl, const URL& aURL )
-throw ( RuntimeException )
+throw ( RuntimeException, std::exception )
 {
     (void)xControl;
     (void)aURL;
@@ -410,21 +410,21 @@ ScriptProtocolHandler::~ScriptProtocolHandler()
 
 /* XServiceInfo */
 OUString SAL_CALL ScriptProtocolHandler::getImplementationName( )
-throw( RuntimeException )
+throw( RuntimeException, std::exception )
 {
     return impl_getStaticImplementationName();
 }
 
 /* XServiceInfo */
 sal_Bool SAL_CALL ScriptProtocolHandler::supportsService(const OUString& sServiceName )
-throw( RuntimeException )
+throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 /* XServiceInfo */
 Sequence< OUString > SAL_CALL ScriptProtocolHandler::getSupportedServiceNames()
-throw( RuntimeException )
+throw( RuntimeException, std::exception )
 {
     return impl_getStaticSupportedServiceNames();
 }
diff --git a/scripting/source/protocolhandler/scripthandler.hxx b/scripting/source/protocolhandler/scripthandler.hxx
index fbdfc773a62e..481aba3a4354 100644
--- a/scripting/source/protocolhandler/scripthandler.hxx
+++ b/scripting/source/protocolhandler/scripthandler.hxx
@@ -80,11 +80,11 @@ public:
 
     /* XServiceInfo */
     virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException );
+        throw( css::uno::RuntimeException, std::exception );
     virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName )
-        throw( css::uno::RuntimeException );
+        throw( css::uno::RuntimeException, std::exception );
     virtual css::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException );
+        throw( css::uno::RuntimeException, std::exception );
 
     /* Helper for XServiceInfo */
     static css::uno::Sequence < OUString > impl_getStaticSupportedServiceNames();
@@ -101,35 +101,35 @@ public:
     /* 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 ) ;
+                   sal_Int32 eSearchFlags ) throw( css::uno::RuntimeException, std::exception ) ;
     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 );
+    throw( css::uno::RuntimeException, std::exception );
 
     /* Implementation for X(Notifying)Dispatch */
     virtual void SAL_CALL dispatchWithNotification(
     const css::util::URL& aURL,
     const css::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArgs,
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& Listener )
-    throw ( css::uno::RuntimeException );
+    throw ( css::uno::RuntimeException, std::exception );
     virtual void SAL_CALL dispatch(
         const css::util::URL& aURL,
         const css::uno::Sequence< css::beans::PropertyValue >& lArgs )
-        throw ( css::uno::RuntimeException );
+        throw ( css::uno::RuntimeException, std::exception );
     virtual void SAL_CALL addStatusListener(
         const css::uno::Reference< css::frame::XStatusListener >& xControl,
         const css::util::URL& aURL )
-        throw ( css::uno::RuntimeException );
+        throw ( css::uno::RuntimeException, std::exception );
     virtual void SAL_CALL removeStatusListener(
         const css::uno::Reference< css::frame::XStatusListener >& xControl,
         const css::util::URL& aURL )
-        throw ( css::uno::RuntimeException );
+        throw ( css::uno::RuntimeException, std::exception );
 
     /* Implementation for XInitialization */
     virtual void SAL_CALL initialize(
         const css::uno::Sequence < css::uno::Any >& aArguments )
-        throw ( css::uno::Exception );
+        throw ( css::uno::Exception, std::exception );
 };
 
 }