From 5e21a413c788f839a66d9e4c14e745ed18058db8 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 25 Feb 2014 21:31:58 +0100
Subject: cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
---
 pyuno/source/module/pyuno_adapter.cxx | 14 +++++++-------
 pyuno/source/module/pyuno_impl.hxx    | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'pyuno')

diff --git a/pyuno/source/module/pyuno_adapter.cxx b/pyuno/source/module/pyuno_adapter.cxx
index 070a9ffe7122..934f3130d3a9 100644
--- a/pyuno/source/module/pyuno_adapter.cxx
+++ b/pyuno/source/module/pyuno_adapter.cxx
@@ -70,7 +70,7 @@ Sequence<sal_Int8> Adapter::getUnoTunnelImplementationId()
     return g_id.getImplementationId();
 }
 
-sal_Int64 Adapter::getSomething( const Sequence< sal_Int8 > &id) throw (RuntimeException)
+sal_Int64 Adapter::getSomething( const Sequence< sal_Int8 > &id) throw (RuntimeException, std::exception)
 {
     if( id == g_id.getImplementationId() )
         return reinterpret_cast<sal_Int64>(this);
@@ -92,7 +92,7 @@ void raiseInvocationTargetExceptionWhenNeeded( const Runtime &runtime )
 }
 
 Reference< XIntrospectionAccess > Adapter::getIntrospection()
-    throw ( RuntimeException )
+    throw ( RuntimeException, std::exception )
 {
     // not supported
     return Reference< XIntrospectionAccess > ();
@@ -178,7 +178,7 @@ Any Adapter::invoke( const OUString &aFunctionName,
                      const Sequence< Any >& aParams,
                      Sequence< sal_Int16 > &aOutParamIndex,
                      Sequence< Any > &aOutParam)
-    throw (IllegalArgumentException,CannotConvertException,InvocationTargetException,RuntimeException)
+    throw (IllegalArgumentException,CannotConvertException,InvocationTargetException,RuntimeException, std::exception)
 {
     Any ret;
 
@@ -345,7 +345,7 @@ Any Adapter::invoke( const OUString &aFunctionName,
 }
 
 void Adapter::setValue( const OUString & aPropertyName, const Any & value )
-    throw( UnknownPropertyException, CannotConvertException, InvocationTargetException,RuntimeException)
+    throw( UnknownPropertyException, CannotConvertException, InvocationTargetException,RuntimeException, std::exception)
 {
     if( !hasProperty( aPropertyName ) )
     {
@@ -373,7 +373,7 @@ void Adapter::setValue( const OUString & aPropertyName, const Any & value )
 }
 
 Any Adapter::getValue( const OUString & aPropertyName )
-    throw ( UnknownPropertyException, RuntimeException )
+    throw ( UnknownPropertyException, RuntimeException, std::exception )
 {
     Any ret;
     PyThreadAttach guard( mInterpreter );
@@ -397,13 +397,13 @@ Any Adapter::getValue( const OUString & aPropertyName )
 }
 
 sal_Bool Adapter::hasMethod( const OUString & aMethodName )
-    throw ( RuntimeException )
+    throw ( RuntimeException, std::exception )
 {
     return hasProperty( aMethodName );
 }
 
 sal_Bool Adapter::hasProperty( const OUString & aPropertyName )
-    throw ( RuntimeException )
+    throw ( RuntimeException, std::exception )
 {
     bool bRet = false;
     PyThreadAttach guard( mInterpreter );
diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx
index ae0f85f8723b..106a97c25966 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -322,7 +322,7 @@ public:
 
     // XInvocation
     virtual com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess >
-           SAL_CALL getIntrospection(  ) throw (::com::sun::star::uno::RuntimeException);
+           SAL_CALL getIntrospection(  ) throw (::com::sun::star::uno::RuntimeException, std::exception);
     virtual ::com::sun::star::uno::Any SAL_CALL invoke(
         const OUString& aFunctionName,
         const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams,
@@ -331,7 +331,7 @@ public:
         throw (::com::sun::star::lang::IllegalArgumentException,
                ::com::sun::star::script::CannotConvertException,
                ::com::sun::star::reflection::InvocationTargetException,
-               ::com::sun::star::uno::RuntimeException);
+               ::com::sun::star::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL setValue(
         const OUString& aPropertyName,
@@ -339,20 +339,20 @@ public:
         throw (::com::sun::star::beans::UnknownPropertyException,
                ::com::sun::star::script::CannotConvertException,
                ::com::sun::star::reflection::InvocationTargetException,
-               ::com::sun::star::uno::RuntimeException);
+               ::com::sun::star::uno::RuntimeException, std::exception);
 
     virtual ::com::sun::star::uno::Any SAL_CALL getValue( const OUString& aPropertyName )
         throw (::com::sun::star::beans::UnknownPropertyException,
-               ::com::sun::star::uno::RuntimeException);
+               ::com::sun::star::uno::RuntimeException, std::exception);
     virtual sal_Bool SAL_CALL hasMethod( const OUString& aName )
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::uno::RuntimeException, std::exception);
     virtual sal_Bool SAL_CALL hasProperty( const OUString& aName )
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::uno::RuntimeException, std::exception);
 
     // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething(
         const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::uno::RuntimeException, std::exception);
 };
 
 
-- 
cgit