cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3

1 files changed, 52 insertions, 52 deletions

diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index 25930907b18c..620ed6d3661c 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -104,101 +104,101 @@ public:
     virtual ~Invocation_Impl();
 
     // XInterface
-    virtual Any         SAL_CALL queryInterface( const Type & aType) throw( RuntimeException );
+    virtual Any         SAL_CALL queryInterface( const Type & aType) throw( RuntimeException, std::exception );
     virtual void        SAL_CALL acquire() throw() { OWeakObject::acquire(); }
     virtual void        SAL_CALL release() throw() { OWeakObject::release(); }
 
 
     // XTypeProvider
     virtual Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  )
-       throw(RuntimeException);
+       throw(RuntimeException, std::exception);
     virtual Sequence< sal_Int8 > SAL_CALL getImplementationId(  )
-       throw( RuntimeException);
+       throw( RuntimeException, std::exception);
 
     // Methoden von XMaterialHolder
-    virtual Any         SAL_CALL getMaterial(void) throw(RuntimeException);
+    virtual Any         SAL_CALL getMaterial(void) throw(RuntimeException, std::exception);
 
     // ? XTool
     virtual void        SAL_CALL setMaterial( const Any& rMaterial );
 
     // XInvocation
-    virtual Reference<XIntrospectionAccess> SAL_CALL getIntrospection(void) throw( RuntimeException );
+    virtual Reference<XIntrospectionAccess> SAL_CALL getIntrospection(void) throw( RuntimeException, std::exception );
     virtual Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam)
-        throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException );
+        throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception );
     virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value)
-        throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException );
+        throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception );
     virtual Any SAL_CALL getValue(const OUString& PropertyName)
-        throw( UnknownPropertyException, RuntimeException );
-    virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw( RuntimeException );
-    virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw( RuntimeException );
+        throw( UnknownPropertyException, RuntimeException, std::exception );
+    virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw( RuntimeException, std::exception );
+    virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw( RuntimeException, std::exception );
 
     // XInvocation2
     virtual Sequence< OUString > SAL_CALL getMemberNames(  )
-        throw( RuntimeException );
+        throw( RuntimeException, std::exception );
     virtual Sequence< InvocationInfo > SAL_CALL getInfo(  )
-        throw( RuntimeException );
+        throw( RuntimeException, std::exception );
     virtual InvocationInfo SAL_CALL getInfoForName( const OUString& aName, sal_Bool bExact )
-        throw( IllegalArgumentException, RuntimeException );
+        throw( IllegalArgumentException, RuntimeException, std::exception );
 
     // All Access and Container methods are not thread save
     // XElementAccess
-    virtual Type SAL_CALL getElementType(void) throw( RuntimeException )
+    virtual Type SAL_CALL getElementType(void) throw( RuntimeException, std::exception )
         { return _xElementAccess->getElementType(); }
 
-    virtual sal_Bool SAL_CALL hasElements(void) throw( RuntimeException )
+    virtual sal_Bool SAL_CALL hasElements(void) throw( RuntimeException, std::exception )
         { return _xElementAccess->hasElements(); }
 
     // XNameContainer
     virtual void SAL_CALL insertByName( const OUString& Name, const Any& Element )
-        throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException )
+        throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception )
         { _xNameContainer->insertByName( Name, Element ); }
 
     virtual void SAL_CALL replaceByName( const OUString& Name, const Any& Element )
-        throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException )
+        throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception )
         { _xNameContainer->replaceByName( Name, Element ); }
 
     virtual void SAL_CALL removeByName( const OUString& Name )
-        throw( NoSuchElementException, WrappedTargetException, RuntimeException )
+        throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception )
         { _xNameContainer->removeByName( Name ); }
 
     // XNameAccess
     virtual Any SAL_CALL getByName( const OUString& Name )
-        throw( NoSuchElementException, WrappedTargetException, RuntimeException )
+        throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception )
         { return _xNameAccess->getByName( Name ); }
 
-    virtual Sequence<OUString> SAL_CALL getElementNames(void) throw( RuntimeException )
+    virtual Sequence<OUString> SAL_CALL getElementNames(void) throw( RuntimeException, std::exception )
         { return _xNameAccess->getElementNames(); }
 
-    virtual sal_Bool SAL_CALL hasByName( const OUString& Name ) throw( RuntimeException )
+    virtual sal_Bool SAL_CALL hasByName( const OUString& Name ) throw( RuntimeException, std::exception )
         { return _xNameAccess->hasByName( Name ); }
 
     // XIndexContainer
     virtual void SAL_CALL insertByIndex( sal_Int32 Index, const Any& Element )
-        throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
+        throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
         { _xIndexContainer->insertByIndex( Index, Element ); }
 
     virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const Any& Element )
-        throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
+        throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
         { _xIndexContainer->replaceByIndex( Index, Element ); }
 
     virtual void SAL_CALL removeByIndex( sal_Int32 Index )
-        throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
+        throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
         { _xIndexContainer->removeByIndex( Index ); }
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(void) throw( RuntimeException )
+    virtual sal_Int32 SAL_CALL getCount(void) throw( RuntimeException, std::exception )
         { return _xIndexAccess->getCount(); }
 
     virtual Any SAL_CALL getByIndex( sal_Int32 Index )
-        throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
+        throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
         { return _xIndexAccess->getByIndex( Index ); }
 
     // XEnumerationAccess
-    virtual Reference<XEnumeration> SAL_CALL createEnumeration(void) throw( RuntimeException )
+    virtual Reference<XEnumeration> SAL_CALL createEnumeration(void) throw( RuntimeException, std::exception )
         { return _xEnumerationAccess->createEnumeration(); }
 
     // XExactName
-    virtual OUString SAL_CALL getExactName( const OUString& rApproximateName ) throw( RuntimeException );
+    virtual OUString SAL_CALL getExactName( const OUString& rApproximateName ) throw( RuntimeException, std::exception );
 
 
 
@@ -259,7 +259,7 @@ Invocation_Impl::~Invocation_Impl() {}
 
 
 Any SAL_CALL Invocation_Impl::queryInterface( const Type & aType )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     // PropertySet-Implementation
     Any a = ::cppu::queryInterface( aType,
@@ -330,7 +330,7 @@ Any SAL_CALL Invocation_Impl::queryInterface( const Type & aType )
 
 
 
-Any Invocation_Impl::getMaterial(void) throw(RuntimeException)
+Any Invocation_Impl::getMaterial(void) throw(RuntimeException, std::exception)
 {
     // AB, 12.2.1999  Sicherstellen, dass das Material wenn moeglich
     // aus der direkten Invocation bzw. von der Introspection geholt
@@ -443,7 +443,7 @@ void Invocation_Impl::setMaterial( const Any& rMaterial )
 
 
 OUString Invocation_Impl::getExactName( const OUString& rApproximateName )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     if (_xENDirect.is())
         return _xENDirect->getExactName( rApproximateName );
@@ -458,7 +458,7 @@ OUString Invocation_Impl::getExactName( const OUString& rApproximateName )
 
 
 Reference<XIntrospectionAccess> Invocation_Impl::getIntrospection(void)
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     if( _xDirect.is() )
         return _xDirect->getIntrospection();
@@ -468,7 +468,7 @@ Reference<XIntrospectionAccess> Invocation_Impl::getIntrospection(void)
 
 
 sal_Bool Invocation_Impl::hasMethod( const OUString& Name )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     if (_xDirect.is())
         return _xDirect->hasMethod( Name );
@@ -479,7 +479,7 @@ sal_Bool Invocation_Impl::hasMethod( const OUString& Name )
 
 
 sal_Bool Invocation_Impl::hasProperty( const OUString& Name )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     if (_xDirect.is())
         return _xDirect->hasProperty( Name );
@@ -495,7 +495,7 @@ sal_Bool Invocation_Impl::hasProperty( const OUString& Name )
 
 
 Any Invocation_Impl::getValue( const OUString& PropertyName )
-    throw( UnknownPropertyException, RuntimeException )
+    throw( UnknownPropertyException, RuntimeException, std::exception )
 {
     if (_xDirect.is())
         return _xDirect->getValue( PropertyName );
@@ -531,7 +531,7 @@ Any Invocation_Impl::getValue( const OUString& PropertyName )
 
 
 void Invocation_Impl::setValue( const OUString& PropertyName, const Any& Value )
-    throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException )
+    throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception )
 {
     if (_xDirect.is())
         _xDirect->setValue( PropertyName, Value );
@@ -611,7 +611,7 @@ void Invocation_Impl::setValue( const OUString& PropertyName, const Any& Value )
 
 Any Invocation_Impl::invoke( const OUString& FunctionName, const Sequence<Any>& InParams,
                                 Sequence<sal_Int16>& OutIndices, Sequence<Any>& OutParams )
-    throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException )
+    throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception )
 {
     if (_xDirect.is())
         return _xDirect->invoke( FunctionName, InParams, OutIndices, OutParams );
@@ -846,7 +846,7 @@ void Invocation_Impl::getInfoSequenceImpl
 
 // XInvocation2
 Sequence< OUString > SAL_CALL Invocation_Impl::getMemberNames(  )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     if( _xDirect2.is() )
     {
@@ -858,7 +858,7 @@ Sequence< OUString > SAL_CALL Invocation_Impl::getMemberNames(  )
 }
 
 Sequence< InvocationInfo > SAL_CALL Invocation_Impl::getInfo(  )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     if( _xDirect2.is() )
     {
@@ -870,7 +870,7 @@ Sequence< InvocationInfo > SAL_CALL Invocation_Impl::getInfo(  )
 }
 
 InvocationInfo SAL_CALL Invocation_Impl::getInfoForName( const OUString& aName, sal_Bool bExact )
-    throw( IllegalArgumentException, RuntimeException )
+    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     if( _xDirect2.is() )
     {
@@ -982,7 +982,7 @@ void Invocation_Impl::fillInfoForMethod
 
 
 // XTypeProvider
-Sequence< Type > SAL_CALL Invocation_Impl::getTypes(void) throw( RuntimeException )
+Sequence< Type > SAL_CALL Invocation_Impl::getTypes(void) throw( RuntimeException, std::exception )
 {
     static Sequence< Type > const * s_pTypes = 0;
     if (! s_pTypes)
@@ -1048,7 +1048,7 @@ Sequence< Type > SAL_CALL Invocation_Impl::getTypes(void) throw( RuntimeExceptio
     return *s_pTypes;
 }
 
-Sequence< sal_Int8 > SAL_CALL Invocation_Impl::getImplementationId(  ) throw( RuntimeException)
+Sequence< sal_Int8 > SAL_CALL Invocation_Impl::getImplementationId(  ) throw( RuntimeException, std::exception)
 {
     static OImplementationId *pId = 0;
     if( ! pId )
@@ -1074,14 +1074,14 @@ public:
     virtual ~InvocationService();
 
     // XServiceInfo
-    OUString                    SAL_CALL getImplementationName() throw( RuntimeException );
-    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) throw( RuntimeException );
-    Sequence< OUString >        SAL_CALL getSupportedServiceNames(void) throw( RuntimeException );
+    OUString                    SAL_CALL getImplementationName() throw( RuntimeException, std::exception );
+    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception );
+    Sequence< OUString >        SAL_CALL getSupportedServiceNames(void) throw( RuntimeException, std::exception );
 
     // XSingleServiceFactory
-    Reference<XInterface>       SAL_CALL createInstance(void) throw( Exception, RuntimeException );
+    Reference<XInterface>       SAL_CALL createInstance(void) throw( Exception, RuntimeException, std::exception );
     Reference<XInterface>       SAL_CALL createInstanceWithArguments(
-        const Sequence<Any>& rArguments ) throw( Exception, RuntimeException );
+        const Sequence<Any>& rArguments ) throw( Exception, RuntimeException, std::exception );
 private:
     Reference<XComponentContext> mxCtx;
     Reference<XMultiComponentFactory> mxSMgr;
@@ -1106,25 +1106,25 @@ InvocationService::InvocationService( const Reference<XComponentContext> & xCtx
 InvocationService::~InvocationService() {}
 
 // XServiceInfo
-OUString InvocationService::getImplementationName() throw( RuntimeException )
+OUString InvocationService::getImplementationName() throw( RuntimeException, std::exception )
 {
     return inv_getImplementationName();
 }
 
 // XServiceInfo
-sal_Bool InvocationService::supportsService(const OUString& ServiceName) throw( RuntimeException )
+sal_Bool InvocationService::supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > InvocationService::getSupportedServiceNames(void) throw( RuntimeException )
+Sequence< OUString > InvocationService::getSupportedServiceNames(void) throw( RuntimeException, std::exception )
 {
     return inv_getSupportedServiceNames();
 }
 
 
-Reference<XInterface> InvocationService::createInstance(void) throw( Exception, RuntimeException )
+Reference<XInterface> InvocationService::createInstance(void) throw( Exception, RuntimeException, std::exception )
 {
     //TODO:throw( Exception("no default construction of invocation adapter possible!", *this) );
     return Reference<XInterface>(); // dummy
@@ -1132,7 +1132,7 @@ Reference<XInterface> InvocationService::createInstance(void) throw( Exception,
 
 
 Reference<XInterface> InvocationService::createInstanceWithArguments(
-    const Sequence<Any>& rArguments ) throw( Exception, RuntimeException )
+    const Sequence<Any>& rArguments ) throw( Exception, RuntimeException, std::exception )
 {
     if (rArguments.getLength() == 1)
     {