cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3

6 files changed, 31 insertions, 31 deletions

diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index ffc3973e2a2b..33c49993f9ae 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -181,7 +181,7 @@ class StringCalculator : public ::cppu::WeakImplHelper1< ::com::sun::star::util:
         {
         }
 
-        sal_Int32 SAL_CALL queryStringWidth( const OUString& sString ) throw( ::com::sun::star::uno::RuntimeException )
+        sal_Int32 SAL_CALL queryStringWidth( const OUString& sString ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
         {
             return (sal_Int32)(m_pDevice->GetTextWidth(sString));
         }
diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx
index 872bf5251f45..5e979eb05206 100644
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
@@ -51,32 +51,32 @@ public:
     virtual ~UUIInteractionHandler() SAL_THROW(());
 
     virtual OUString SAL_CALL getImplementationName()
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual sal_Bool SAL_CALL supportsService(OUString const &
                           rServiceName)
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames()
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL
     initialize(
         com::sun::star::uno::Sequence< com::sun::star::uno::Any > const &
             rArguments)
-        throw (com::sun::star::uno::Exception);
+        throw (com::sun::star::uno::Exception, std::exception);
 
     virtual void SAL_CALL
     handle(com::sun::star::uno::Reference<
            com::sun::star::task::XInteractionRequest > const &
        rRequest)
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual ::sal_Bool SAL_CALL
         handleInteractionRequest(
             const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& _Request
-        )   throw ( ::com::sun::star::uno::RuntimeException );
+        )   throw ( ::com::sun::star::uno::RuntimeException, std::exception );
 };
 
 UUIInteractionHandler::UUIInteractionHandler(
@@ -93,21 +93,21 @@ UUIInteractionHandler::~UUIInteractionHandler()
 }
 
 OUString SAL_CALL UUIInteractionHandler::getImplementationName()
-    throw (uno::RuntimeException)
+    throw (uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.uui.UUIInteractionHandler");
 }
 
 sal_Bool SAL_CALL
 UUIInteractionHandler::supportsService(OUString const & rServiceName)
-    throw (uno::RuntimeException)
+    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
 UUIInteractionHandler::getSupportedServiceNames()
-    throw (uno::RuntimeException)
+    throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aNames(3);
     aNames[0] = "com.sun.star.task.InteractionHandler";
@@ -121,7 +121,7 @@ UUIInteractionHandler::getSupportedServiceNames()
 void SAL_CALL
 UUIInteractionHandler::initialize(
     uno::Sequence< uno::Any > const & rArguments)
-    throw (uno::Exception)
+    throw (uno::Exception, std::exception)
 {
     uno::Reference<uno::XComponentContext> xContext = m_pImpl->getORB();
     delete m_pImpl;
@@ -153,7 +153,7 @@ UUIInteractionHandler::initialize(
 void SAL_CALL
 UUIInteractionHandler::handle(
     uno::Reference< task::XInteractionRequest > const & rRequest)
-    throw (uno::RuntimeException)
+    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -166,7 +166,7 @@ UUIInteractionHandler::handle(
 }
 
 ::sal_Bool SAL_CALL UUIInteractionHandler::handleInteractionRequest(
-    const uno::Reference< task::XInteractionRequest >& _Request ) throw ( uno::RuntimeException )
+    const uno::Reference< task::XInteractionRequest >& _Request ) throw ( uno::RuntimeException, std::exception )
 {
     try
     {
diff --git a/uui/source/passwordcontainer.cxx b/uui/source/passwordcontainer.cxx
index ee35a5389cec..3a5986df78a3 100644
--- a/uui/source/passwordcontainer.cxx
+++ b/uui/source/passwordcontainer.cxx
@@ -297,7 +297,7 @@ PasswordContainerInteractionHandler::~PasswordContainerInteractionHandler()
 // virtual
 OUString SAL_CALL
 PasswordContainerInteractionHandler::getImplementationName()
-    throw ( uno::RuntimeException )
+    throw ( uno::RuntimeException, std::exception )
 {
     return getImplementationName_Static();
 }
@@ -307,7 +307,7 @@ PasswordContainerInteractionHandler::getImplementationName()
 sal_Bool SAL_CALL
 PasswordContainerInteractionHandler::supportsService(
         const OUString& ServiceName )
-    throw ( uno::RuntimeException )
+    throw ( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
@@ -316,7 +316,7 @@ PasswordContainerInteractionHandler::supportsService(
 // virtual
 uno::Sequence< OUString > SAL_CALL
 PasswordContainerInteractionHandler::getSupportedServiceNames()
-    throw ( uno::RuntimeException )
+    throw ( uno::RuntimeException, std::exception )
 {
     return getSupportedServiceNames_Static();
 }
@@ -350,7 +350,7 @@ PasswordContainerInteractionHandler::getSupportedServiceNames_Static()
 void SAL_CALL
 PasswordContainerInteractionHandler::handle(
         const uno::Reference< task::XInteractionRequest >& rRequest )
-    throw ( uno::RuntimeException )
+    throw ( uno::RuntimeException, std::exception )
 {
     handleInteractionRequest( rRequest );
 }
@@ -359,7 +359,7 @@ PasswordContainerInteractionHandler::handle(
 sal_Bool SAL_CALL
 PasswordContainerInteractionHandler::handleInteractionRequest(
         const uno::Reference< task::XInteractionRequest >& rRequest )
-    throw ( uno::RuntimeException )
+    throw ( uno::RuntimeException, std::exception )
 {
     if ( !rRequest.is() )
         return false;
diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx
index f4f5b1970c3e..9fc73bd3b6c6 100644
--- a/uui/source/passwordcontainer.hxx
+++ b/uui/source/passwordcontainer.hxx
@@ -150,26 +150,26 @@ public:
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName()
-        throw ( com::sun::star::uno::RuntimeException );
+        throw ( com::sun::star::uno::RuntimeException, std::exception );
 
     virtual sal_Bool SAL_CALL
     supportsService( const OUString& ServiceName )
-        throw ( com::sun::star::uno::RuntimeException );
+        throw ( com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames()
-        throw ( com::sun::star::uno::RuntimeException );
+        throw ( com::sun::star::uno::RuntimeException, std::exception );
 
     // XInteractionHandler2
     virtual void SAL_CALL
     handle( const ::com::sun::star::uno::Reference<
                 ::com::sun::star::task::XInteractionRequest >& Request )
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::uno::RuntimeException, std::exception);
 
     virtual sal_Bool SAL_CALL
     handleInteractionRequest( const ::com::sun::star::uno::Reference<
                 ::com::sun::star::task::XInteractionRequest >& Request )
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::uno::RuntimeException, std::exception);
 
     // Non-UNO interfaces
     static OUString
diff --git a/uui/source/requeststringresolver.cxx b/uui/source/requeststringresolver.cxx
index 28698a1106ed..00706bf7d252 100644
--- a/uui/source/requeststringresolver.cxx
+++ b/uui/source/requeststringresolver.cxx
@@ -39,7 +39,7 @@ UUIInteractionRequestStringResolver::~UUIInteractionRequestStringResolver()
 
 OUString SAL_CALL
 UUIInteractionRequestStringResolver::getImplementationName()
-    throw (star::uno::RuntimeException)
+    throw (star::uno::RuntimeException, std::exception)
 {
     return OUString::createFromAscii(m_aImplementationName);
 }
@@ -47,14 +47,14 @@ UUIInteractionRequestStringResolver::getImplementationName()
 sal_Bool SAL_CALL
 UUIInteractionRequestStringResolver::supportsService(
         OUString const & rServiceName)
-    throw (star::uno::RuntimeException)
+    throw (star::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 star::uno::Sequence< OUString > SAL_CALL
 UUIInteractionRequestStringResolver::getSupportedServiceNames()
-    throw (star::uno::RuntimeException)
+    throw (star::uno::RuntimeException, std::exception)
 {
     return getSupportedServiceNames_static();
 }
@@ -63,7 +63,7 @@ star::beans::Optional< OUString > SAL_CALL
 UUIInteractionRequestStringResolver::getStringFromInformationalRequest(
     const star::uno::Reference<
         star::task::XInteractionRequest >& Request )
-    throw (star::uno::RuntimeException)
+    throw (star::uno::RuntimeException, std::exception)
 {
     try
     {
diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx
index 377d2c0b5934..de94d8d5ef49 100644
--- a/uui/source/requeststringresolver.hxx
+++ b/uui/source/requeststringresolver.hxx
@@ -61,21 +61,21 @@ private:
     virtual ~UUIInteractionRequestStringResolver() SAL_THROW(());
 
     virtual OUString SAL_CALL getImplementationName()
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual sal_Bool SAL_CALL supportsService(OUString const &
                           rServiceName)
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames()
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual com::sun::star::beans::Optional< OUString > SAL_CALL
     getStringFromInformationalRequest(
         const com::sun::star::uno::Reference<
             com::sun::star::task::XInteractionRequest >& Request )
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 };
 
 #endif // UUI_REQUESTSTRINGRESOLVER_HXX