From 5e21a413c788f839a66d9e4c14e745ed18058db8 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 25 Feb 2014 21:31:58 +0100 Subject: cppuhelper: retrofit std::exception into overriding exception specs Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3 --- cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx | 2 +- cppuhelper/source/component.cxx | 12 +- cppuhelper/source/component_context.cxx | 44 ++-- cppuhelper/source/exc_thrower.cxx | 12 +- cppuhelper/source/factory.cxx | 128 +++++----- cppuhelper/source/implbase.cxx | 18 +- cppuhelper/source/macro_expander.cxx | 16 +- cppuhelper/source/propertysetmixin.cxx | 10 +- cppuhelper/source/propshlp.cxx | 44 ++-- cppuhelper/source/servicemanager.cxx | 96 +++---- cppuhelper/source/servicemanager.hxx | 52 ++-- cppuhelper/source/tdmgr.cxx | 4 +- cppuhelper/source/typemanager.cxx | 338 ++++++++++++------------- cppuhelper/source/typemanager.hxx | 24 +- cppuhelper/source/weak.cxx | 34 +-- 15 files changed, 417 insertions(+), 417 deletions(-) (limited to 'cppuhelper') diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx index 3a5c8cf1ea20..92453c99608d 100644 --- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx +++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx @@ -50,7 +50,7 @@ public: : m_pStats(pStats) { m_pStats->m_nAlive++; } virtual ~ContainerListener() { m_pStats->m_nAlive--; } virtual void SAL_CALL disposing( const EventObject& ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { m_pStats->m_nDisposed++; } diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx index 6d13d89355a6..9ce2cc4150d9 100644 --- a/cppuhelper/source/component.cxx +++ b/cppuhelper/source/component.cxx @@ -48,11 +48,11 @@ OComponentHelper::~OComponentHelper() SAL_THROW( (RuntimeException) ) { } -Any OComponentHelper::queryInterface( Type const & rType ) throw (RuntimeException) +Any OComponentHelper::queryInterface( Type const & rType ) throw (RuntimeException, std::exception) { return OWeakAggObject::queryInterface( rType ); } -Any OComponentHelper::queryAggregation( Type const & rType ) throw (RuntimeException) +Any OComponentHelper::queryAggregation( Type const & rType ) throw (RuntimeException, std::exception) { if (rType == ::getCppuType( (Reference< lang::XComponent > const *)0 )) { @@ -113,7 +113,7 @@ void OComponentHelper::release() throw() OWeakAggObject::release(); } -Sequence< Type > OComponentHelper::getTypes() throw (RuntimeException) +Sequence< Type > OComponentHelper::getTypes() throw (RuntimeException, std::exception) { static OTypeCollection * s_pTypes = 0; if (! s_pTypes) @@ -139,7 +139,7 @@ void OComponentHelper::disposing() // XComponent void OComponentHelper::dispose() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { // An frequently programming error is to release the last // reference to this object in the disposing message. @@ -214,7 +214,7 @@ void OComponentHelper::dispose() // XComponent void OComponentHelper::addEventListener( const Reference & rxListener ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { ClearableMutexGuard aGuard( rBHelper.rMutex ); if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -232,7 +232,7 @@ void OComponentHelper::addEventListener( // XComponent void OComponentHelper::removeEventListener( const Reference & rxListener ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { rBHelper.removeListener( ::getCppuType( &rxListener ) , rxListener ); } diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx index b1983ee34fe8..7892b69d31e3 100644 --- a/cppuhelper/source/component_context.cxx +++ b/cppuhelper/source/component_context.cxx @@ -303,7 +303,7 @@ public: SAL_THROW( (RuntimeException) ); virtual void SAL_CALL disposing( lang::EventObject const & rSource ) - throw (RuntimeException); + throw (RuntimeException, std::exception); }; inline void DisposingForwarder::listen( @@ -318,7 +318,7 @@ inline void DisposingForwarder::listen( } void DisposingForwarder::disposing( lang::EventObject const & ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { m_xTarget->dispose(); m_xTarget.clear(); @@ -369,34 +369,34 @@ public: // XComponentContext virtual Any SAL_CALL getValueByName( OUString const & rName ) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual Reference SAL_CALL getServiceManager() - throw (RuntimeException); + throw (RuntimeException, std::exception); // XNameContainer virtual void SAL_CALL insertByName( OUString const & name, Any const & element ) throw (lang::IllegalArgumentException, container::ElementExistException, - lang::WrappedTargetException, RuntimeException); + lang::WrappedTargetException, RuntimeException, std::exception); virtual void SAL_CALL removeByName( OUString const & name ) throw (container::NoSuchElementException, - lang::WrappedTargetException, RuntimeException); + lang::WrappedTargetException, RuntimeException, std::exception); // XNameReplace virtual void SAL_CALL replaceByName( OUString const & name, Any const & element ) throw (lang::IllegalArgumentException,container::NoSuchElementException, - lang::WrappedTargetException, RuntimeException); + lang::WrappedTargetException, RuntimeException, std::exception); // XNameAccess virtual Any SAL_CALL getByName( OUString const & name ) throw (container::NoSuchElementException, - lang::WrappedTargetException, RuntimeException); + lang::WrappedTargetException, RuntimeException, std::exception); virtual Sequence SAL_CALL getElementNames() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName( OUString const & name ) - throw (RuntimeException); + throw (RuntimeException, std::exception); // XElementAccess - virtual Type SAL_CALL getElementType() throw (RuntimeException); - virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException); + virtual Type SAL_CALL getElementType() throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException, std::exception); }; // XNameContainer @@ -404,7 +404,7 @@ public: void ComponentContext::insertByName( OUString const & name, Any const & element ) throw (lang::IllegalArgumentException, container::ElementExistException, - lang::WrappedTargetException, RuntimeException) + lang::WrappedTargetException, RuntimeException, std::exception) { t_map::mapped_type entry( new ContextEntry( @@ -424,7 +424,7 @@ void ComponentContext::insertByName( void ComponentContext::removeByName( OUString const & name ) throw (container::NoSuchElementException, - lang::WrappedTargetException, RuntimeException) + lang::WrappedTargetException, RuntimeException, std::exception) { MutexGuard guard( m_mutex ); t_map::iterator iFind( m_map.find( name ) ); @@ -442,7 +442,7 @@ void ComponentContext::removeByName( OUString const & name ) void ComponentContext::replaceByName( OUString const & name, Any const & element ) throw (lang::IllegalArgumentException,container::NoSuchElementException, - lang::WrappedTargetException, RuntimeException) + lang::WrappedTargetException, RuntimeException, std::exception) { MutexGuard guard( m_mutex ); t_map::const_iterator const iFind( m_map.find( name ) ); @@ -467,14 +467,14 @@ void ComponentContext::replaceByName( Any ComponentContext::getByName( OUString const & name ) throw (container::NoSuchElementException, - lang::WrappedTargetException, RuntimeException) + lang::WrappedTargetException, RuntimeException, std::exception) { return getValueByName( name ); } Sequence ComponentContext::getElementNames() - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard guard( m_mutex ); Sequence ret( m_map.size() ); @@ -489,7 +489,7 @@ Sequence ComponentContext::getElementNames() sal_Bool ComponentContext::hasByName( OUString const & name ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard guard( m_mutex ); return m_map.find( name ) != m_map.end(); @@ -497,13 +497,13 @@ sal_Bool ComponentContext::hasByName( OUString const & name ) // XElementAccess -Type ComponentContext::getElementType() throw (RuntimeException) +Type ComponentContext::getElementType() throw (RuntimeException, std::exception) { return ::getVoidCppuType(); } -sal_Bool ComponentContext::hasElements() throw (RuntimeException) +sal_Bool ComponentContext::hasElements() throw (RuntimeException, std::exception) { MutexGuard guard( m_mutex ); return ! m_map.empty(); @@ -631,7 +631,7 @@ Any ComponentContext::lookupMap( OUString const & rName ) Any ComponentContext::getValueByName( OUString const & rName ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { // to determine the root context: if ( rName == "_root" ) @@ -651,7 +651,7 @@ Any ComponentContext::getValueByName( OUString const & rName ) } Reference< lang::XMultiComponentFactory > ComponentContext::getServiceManager() - throw (RuntimeException) + throw (RuntimeException, std::exception) { if ( !m_xSMgr.is() ) { diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx index 0e18f5d070d0..4cc2d9389434 100644 --- a/cppuhelper/source/exc_thrower.cxx +++ b/cppuhelper/source/exc_thrower.cxx @@ -55,13 +55,13 @@ struct ExceptionThrower : public uno_Interface, XExceptionThrower // XInterface virtual Any SAL_CALL queryInterface( Type const & type ) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); // XExceptionThrower - virtual void SAL_CALL throwException( Any const & exc ) throw (Exception); - virtual void SAL_CALL rethrowException() throw (Exception); + virtual void SAL_CALL throwException( Any const & exc ) throw (Exception, std::exception); + virtual void SAL_CALL rethrowException() throw (Exception, std::exception); }; extern "C" @@ -133,7 +133,7 @@ static void SAL_CALL ExceptionThrower_dispatch( Any ExceptionThrower::queryInterface( Type const & type ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (type.equals( ::getCppuType( reinterpret_cast< Reference< XInterface > const * >(0) ) ) || @@ -155,14 +155,14 @@ void ExceptionThrower::release() throw () } -void ExceptionThrower::throwException( Any const & exc ) throw (Exception) +void ExceptionThrower::throwException( Any const & exc ) throw (Exception, std::exception) { OSL_FAIL( "unexpected!" ); throwException( exc ); } -void ExceptionThrower::rethrowException() throw (Exception) +void ExceptionThrower::rethrowException() throw (Exception, std::exception) { throw; } diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index b2d18af32aaa..40c12591ba04 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -95,29 +95,29 @@ public: // XInterface Any SAL_CALL queryInterface( const Type & rType ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // XSingleServiceFactory Reference SAL_CALL createInstance() - throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); virtual Reference SAL_CALL createInstanceWithArguments(const Sequence& Arguments) - throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // XSingleComponentFactory virtual Reference< XInterface > SAL_CALL createInstanceWithContext( Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException); + throw (Exception, RuntimeException, std::exception); virtual Reference< XInterface > SAL_CALL createInstanceWithArgumentsAndContext( Sequence< Any > const & rArguments, Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException); + throw (Exception, RuntimeException, std::exception); // XServiceInfo OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); Sequence< OUString > SAL_CALL getSupportedServiceNames(void) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); protected: /** @@ -142,7 +142,7 @@ OSingleFactoryHelper::~OSingleFactoryHelper() Any OSingleFactoryHelper::queryInterface( const Type & rType ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return ::cppu::queryInterface( rType, @@ -180,7 +180,7 @@ Reference OSingleFactoryHelper::createInstanceEveryTime( // XSingleServiceFactory Reference OSingleFactoryHelper::createInstance() - throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { return createInstanceWithContext( Reference< XComponentContext >() ); } @@ -188,7 +188,7 @@ Reference OSingleFactoryHelper::createInstance() // XSingleServiceFactory Reference OSingleFactoryHelper::createInstanceWithArguments( const Sequence& Arguments ) - throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { return createInstanceWithArgumentsAndContext( Arguments, Reference< XComponentContext >() ); @@ -198,7 +198,7 @@ Reference OSingleFactoryHelper::createInstanceWithArguments( Reference< XInterface > OSingleFactoryHelper::createInstanceWithContext( Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { return createInstanceEveryTime( xContext ); } @@ -206,7 +206,7 @@ Reference< XInterface > OSingleFactoryHelper::createInstanceWithContext( Reference< XInterface > OSingleFactoryHelper::createInstanceWithArgumentsAndContext( Sequence< Any > const & rArguments, Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { Reference< XInterface > xRet( createInstanceWithContext( xContext ) ); @@ -238,7 +238,7 @@ Reference< XInterface > OSingleFactoryHelper::createInstanceWithArgumentsAndCont // XServiceInfo OUString OSingleFactoryHelper::getImplementationName() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return aImplementationName; } @@ -246,14 +246,14 @@ OUString OSingleFactoryHelper::getImplementationName() // XServiceInfo sal_Bool OSingleFactoryHelper::supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } // XServiceInfo Sequence< OUString > OSingleFactoryHelper::getSupportedServiceNames(void) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return aServiceNames; } @@ -285,7 +285,7 @@ public: // XInterface Any SAL_CALL queryInterface( const Type & rType ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL acquire() throw() { OComponentHelper::acquire(); } void SAL_CALL release() throw() @@ -293,32 +293,32 @@ public: // XSingleServiceFactory Reference SAL_CALL createInstance() - throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); Reference SAL_CALL createInstanceWithArguments( const Sequence& Arguments ) - throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // XSingleComponentFactory virtual Reference< XInterface > SAL_CALL createInstanceWithContext( Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException); + throw (Exception, RuntimeException, std::exception); virtual Reference< XInterface > SAL_CALL createInstanceWithArgumentsAndContext( Sequence< Any > const & rArguments, Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException); + throw (Exception, RuntimeException, std::exception); // XTypeProvider - virtual Sequence< Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException); - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + virtual Sequence< Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); // XAggregation Any SAL_CALL queryAggregation( const Type & rType ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // XUnloadingPreference virtual sal_Bool SAL_CALL releaseOnNotification() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper - void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception); private: Reference xTheInstance; @@ -331,7 +331,7 @@ protected: Any SAL_CALL OFactoryComponentHelper::queryInterface( const Type & rType ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { if( rType == ::getCppuType( (Reference*)0)) { @@ -344,7 +344,7 @@ Any SAL_CALL OFactoryComponentHelper::queryInterface( const Type & rType ) // XAggregation Any OFactoryComponentHelper::queryAggregation( const Type & rType ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { Any aRet( OComponentHelper::queryAggregation( rType ) ); return (aRet.hasValue() ? aRet : OSingleFactoryHelper::queryInterface( rType )); @@ -352,7 +352,7 @@ Any OFactoryComponentHelper::queryAggregation( const Type & rType ) // XTypeProvider Sequence< Type > OFactoryComponentHelper::getTypes() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { Type ar[ 4 ]; ar[ 0 ] = ::getCppuType( (const Reference< XSingleServiceFactory > *)0 ); @@ -372,14 +372,14 @@ namespace } Sequence< sal_Int8 > OFactoryComponentHelper::getImplementationId() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return theOFactoryComponentHelperImplementationId::get().getImplementationId(); } // XSingleServiceFactory Reference OFactoryComponentHelper::createInstance() - throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { if( bOneInstance ) { @@ -396,7 +396,7 @@ Reference OFactoryComponentHelper::createInstance() Reference OFactoryComponentHelper::createInstanceWithArguments( const Sequence& Arguments ) - throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { if( bOneInstance ) { @@ -416,7 +416,7 @@ Reference OFactoryComponentHelper::createInstanceWithArguments( Reference< XInterface > OFactoryComponentHelper::createInstanceWithContext( Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { if( bOneInstance ) { @@ -435,7 +435,7 @@ Reference< XInterface > OFactoryComponentHelper::createInstanceWithContext( Reference< XInterface > OFactoryComponentHelper::createInstanceWithArgumentsAndContext( Sequence< Any > const & rArguments, Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { if( bOneInstance ) { @@ -454,7 +454,7 @@ Reference< XInterface > OFactoryComponentHelper::createInstanceWithArgumentsAndC // OComponentHelper void OFactoryComponentHelper::dispose() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { OComponentHelper::dispose(); @@ -478,7 +478,7 @@ void OFactoryComponentHelper::dispose() // one-instance factory: sal_False // single factory: sal_True // component factory: sal_True -sal_Bool SAL_CALL OFactoryComponentHelper::releaseOnNotification() throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL OFactoryComponentHelper::releaseOnNotification() throw(::com::sun::star::uno::RuntimeException, std::exception) { if( bOneInstance) return sal_False; @@ -503,15 +503,15 @@ public: // XInterface virtual Any SAL_CALL queryInterface( Type const & type ) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); // XTypeProvider virtual Sequence< Type > SAL_CALL getTypes() - throw (RuntimeException); + throw (RuntimeException, std::exception); // XPropertySet virtual Reference< beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (RuntimeException); + throw (RuntimeException, std::exception); // OPropertySetHelper virtual IPropertyArrayHelper & SAL_CALL getInfoHelper(); @@ -521,7 +521,7 @@ public: throw (lang::IllegalArgumentException); virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, Any const & rValue ) - throw (Exception); + throw (Exception, std::exception); using OPropertySetHelper::getFastPropertyValue; virtual void SAL_CALL getFastPropertyValue( Any & rValue, sal_Int32 nHandle ) const; @@ -533,19 +533,19 @@ public: // XSingleServiceFactory Reference SAL_CALL createInstanceWithArguments(const Sequence& Arguments) - throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // XSingleComponentFactory Reference< XInterface > SAL_CALL createInstanceWithArgumentsAndContext( Sequence< Any > const & rArguments, Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException); + throw (Exception, RuntimeException, std::exception); // XServiceInfo Sequence< OUString > SAL_CALL getSupportedServiceNames(void) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // XUnloadingPreference sal_Bool SAL_CALL releaseOnNotification() - throw( RuntimeException); + throw( RuntimeException, std::exception); private: @@ -566,7 +566,7 @@ protected: // XInterface Any SAL_CALL ORegistryFactoryHelper::queryInterface( - Type const & type ) throw (RuntimeException) + Type const & type ) throw (RuntimeException, std::exception) { Any ret( OFactoryComponentHelper::queryInterface( type ) ); if (ret.hasValue()) @@ -589,7 +589,7 @@ void ORegistryFactoryHelper::release() throw () // XTypeProvider -Sequence< Type > ORegistryFactoryHelper::getTypes() throw (RuntimeException) +Sequence< Type > ORegistryFactoryHelper::getTypes() throw (RuntimeException, std::exception) { Sequence< Type > types( OFactoryComponentHelper::getTypes() ); sal_Int32 pos = types.getLength(); @@ -607,7 +607,7 @@ Sequence< Type > ORegistryFactoryHelper::getTypes() throw (RuntimeException) // XPropertySet Reference< beans::XPropertySetInfo > -ORegistryFactoryHelper::getPropertySetInfo() throw (RuntimeException) +ORegistryFactoryHelper::getPropertySetInfo() throw (RuntimeException, std::exception) { ::osl::MutexGuard guard( aMutex ); if (! m_xInfo.is()) @@ -646,7 +646,7 @@ sal_Bool ORegistryFactoryHelper::convertFastPropertyValue( void ORegistryFactoryHelper::setFastPropertyValue_NoBroadcast( sal_Int32, Any const & ) - throw (Exception) + throw (Exception, std::exception) { throw beans::PropertyVetoException( "unexpected: only readonly properties!", @@ -701,7 +701,7 @@ Reference ORegistryFactoryHelper::createInstanceEveryTime( Reference SAL_CALL ORegistryFactoryHelper::createInstanceWithArguments( const Sequence& Arguments ) - throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { if( !xModuleFactory.is() && !xModuleFactoryDepr.is() ) { @@ -734,7 +734,7 @@ Reference SAL_CALL ORegistryFactoryHelper::createInstanceWithArgume Reference< XInterface > ORegistryFactoryHelper::createInstanceWithArgumentsAndContext( Sequence< Any > const & rArguments, Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { if( !xModuleFactory.is() && !xModuleFactoryDepr.is() ) { @@ -834,7 +834,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory() // XServiceInfo Sequence< OUString > ORegistryFactoryHelper::getSupportedServiceNames(void) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { MutexGuard aGuard( aMutex ); if( aServiceNames.getLength() == 0 ) @@ -866,7 +866,7 @@ Sequence< OUString > ORegistryFactoryHelper::getSupportedServiceNames(void) return aServiceNames; } -sal_Bool SAL_CALL ORegistryFactoryHelper::releaseOnNotification() throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL ORegistryFactoryHelper::releaseOnNotification() throw(::com::sun::star::uno::RuntimeException, std::exception) { bool retVal= true; if( isOneInstance() && isInstance()) @@ -906,26 +906,26 @@ public: // XSingleServiceFactory Reference SAL_CALL createInstance() - throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); Reference SAL_CALL createInstanceWithArguments(const Sequence& Arguments) - throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); Sequence< OUString > SAL_CALL getSupportedServiceNames(void) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); //XUnloadingPreference sal_Bool SAL_CALL releaseOnNotification() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); }; // XSingleServiceFactory Reference OFactoryProxyHelper::createInstance() - throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { return xFactory->createInstance(); } @@ -935,14 +935,14 @@ Reference OFactoryProxyHelper::createInstanceWithArguments ( const Sequence& Arguments ) - throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { return xFactory->createInstanceWithArguments( Arguments ); } // XServiceInfo OUString OFactoryProxyHelper::getImplementationName() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { Reference xInfo( xFactory, UNO_QUERY ); if( xInfo.is() ) @@ -952,14 +952,14 @@ OUString OFactoryProxyHelper::getImplementationName() // XServiceInfo sal_Bool OFactoryProxyHelper::supportsService(const OUString& ServiceName) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } // XServiceInfo Sequence< OUString > OFactoryProxyHelper::getSupportedServiceNames(void) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { Reference xInfo( xFactory, UNO_QUERY ); if( xInfo.is() ) @@ -967,7 +967,7 @@ Sequence< OUString > OFactoryProxyHelper::getSupportedServiceNames(void) return Sequence< OUString >(); } -sal_Bool SAL_CALL OFactoryProxyHelper::releaseOnNotification() throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL OFactoryProxyHelper::releaseOnNotification() throw(::com::sun::star::uno::RuntimeException, std::exception) { Reference pref( xFactory, UNO_QUERY); diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx index ecf7f9a36b15..dbd11f9a1245 100644 --- a/cppuhelper/source/implbase.cxx +++ b/cppuhelper/source/implbase.cxx @@ -213,7 +213,7 @@ void WeakComponentImplHelperBase::disposing() } Any WeakComponentImplHelperBase::queryInterface( Type const & rType ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rType == ::getCppuType( (Reference< lang::XComponent > const *)0 )) { @@ -254,7 +254,7 @@ void WeakComponentImplHelperBase::release() } void WeakComponentImplHelperBase::dispose() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ClearableMutexGuard aGuard( rBHelper.rMutex ); if (!rBHelper.bDisposed && !rBHelper.bInDispose) @@ -299,7 +299,7 @@ void WeakComponentImplHelperBase::dispose() void WeakComponentImplHelperBase::addEventListener( Reference< lang::XEventListener > const & xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ClearableMutexGuard aGuard( rBHelper.rMutex ); if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -316,7 +316,7 @@ void WeakComponentImplHelperBase::addEventListener( void WeakComponentImplHelperBase::removeEventListener( Reference< lang::XEventListener > const & xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { rBHelper.removeListener( ::getCppuType( &xListener ), xListener ); } @@ -339,13 +339,13 @@ void WeakAggComponentImplHelperBase::disposing() } Any WeakAggComponentImplHelperBase::queryInterface( Type const & rType ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return OWeakAggObject::queryInterface( rType ); } Any WeakAggComponentImplHelperBase::queryAggregation( Type const & rType ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rType == ::getCppuType( (Reference< lang::XComponent > const *)0 )) { @@ -390,7 +390,7 @@ void WeakAggComponentImplHelperBase::release() } void WeakAggComponentImplHelperBase::dispose() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ClearableMutexGuard aGuard( rBHelper.rMutex ); if (!rBHelper.bDisposed && !rBHelper.bInDispose) @@ -435,7 +435,7 @@ void WeakAggComponentImplHelperBase::dispose() void WeakAggComponentImplHelperBase::addEventListener( Reference< lang::XEventListener > const & xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ClearableMutexGuard aGuard( rBHelper.rMutex ); if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -452,7 +452,7 @@ void WeakAggComponentImplHelperBase::addEventListener( void WeakAggComponentImplHelperBase::removeEventListener( Reference< lang::XEventListener > const & xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { rBHelper.removeListener( ::getCppuType( &xListener ), xListener ); } diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx index f290fb71982e..d9bd34608163 100644 --- a/cppuhelper/source/macro_expander.cxx +++ b/cppuhelper/source/macro_expander.cxx @@ -134,14 +134,14 @@ public: // XMacroExpander impl virtual OUString SAL_CALL expandMacros( OUString const & exp ) - throw (lang::IllegalArgumentException); + throw (lang::IllegalArgumentException, std::exception); // XServiceInfo impl virtual OUString SAL_CALL getImplementationName() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (RuntimeException); + throw (RuntimeException, std::exception); }; @@ -154,19 +154,19 @@ Bootstrap_MacroExpander::~Bootstrap_MacroExpander() SAL_THROW(()) // XServiceInfo impl OUString Bootstrap_MacroExpander::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return s_impl_name(); } sal_Bool Bootstrap_MacroExpander::supportsService( OUString const & serviceName ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } Sequence< OUString > Bootstrap_MacroExpander::getSupportedServiceNames() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return s_get_service_names(); } @@ -174,7 +174,7 @@ Sequence< OUString > Bootstrap_MacroExpander::getSupportedServiceNames() // XMacroExpander impl OUString Bootstrap_MacroExpander::expandMacros( OUString const & exp ) - throw (lang::IllegalArgumentException) + throw (lang::IllegalArgumentException, std::exception) { return cppuhelper::detail::expandMacros( exp ); } diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx index 466b53067394..97bdc3f53ff7 100644 --- a/cppuhelper/source/propertysetmixin.cxx +++ b/cppuhelper/source/propertysetmixin.cxx @@ -288,10 +288,10 @@ public: virtual css::beans::Property SAL_CALL getPropertyByName( rtl::OUString const & name) throw ( - css::beans::UnknownPropertyException, css::uno::RuntimeException); + css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasPropertyByName(rtl::OUString const & name) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); private: rtl::Reference< Data > m_data; @@ -316,14 +316,14 @@ css::uno::Sequence< css::beans::Property > Info::getProperties() } css::beans::Property Info::getPropertyByName(rtl::OUString const & name) - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) + throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) { return m_data->get(static_cast< cppu::OWeakObject * >(this), name)-> second.property; } sal_Bool Info::hasPropertyByName(rtl::OUString const & name) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { Data::PropertyMap::iterator i(m_data->properties.find(name)); return i != m_data->properties.end() && i->second.present; @@ -962,7 +962,7 @@ void PropertySetMixinImpl::dispose() { } css::uno::Any PropertySetMixinImpl::queryInterface(css::uno::Type const & type) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { if (((m_impl->implements & IMPLEMENTS_PROPERTY_SET) != 0 && type == css::beans::XPropertySet::static_type())) diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx index d276a9b5eb9c..49a98ffe2c52 100644 --- a/cppuhelper/source/propshlp.cxx +++ b/cppuhelper/source/propshlp.cxx @@ -77,9 +77,9 @@ public: OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ ) SAL_THROW(()); // XPropertySetInfo-methods - virtual Sequence< Property > SAL_CALL getProperties(void) throw(::com::sun::star::uno::RuntimeException); - virtual Property SAL_CALL getPropertyByName(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& PropertyName) throw(::com::sun::star::uno::RuntimeException); + virtual Sequence< Property > SAL_CALL getProperties(void) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual Property SAL_CALL getPropertyByName(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& PropertyName) throw(::com::sun::star::uno::RuntimeException, std::exception); }; @@ -96,7 +96,7 @@ OPropertySetHelperInfo_Impl::OPropertySetHelperInfo_Impl( /** * Return the sequence of properties, which are provided throug the constructor. */ -Sequence< Property > OPropertySetHelperInfo_Impl::getProperties(void) throw(::com::sun::star::uno::RuntimeException) +Sequence< Property > OPropertySetHelperInfo_Impl::getProperties(void) throw(::com::sun::star::uno::RuntimeException, std::exception) { return aInfos; @@ -105,7 +105,7 @@ Sequence< Property > OPropertySetHelperInfo_Impl::getProperties(void) throw(::co /** * Return the sequence of properties, which are provided throug the constructor. */ -Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) +Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) { Property * pR; pR = (Property *)bsearch( &PropertyName, aInfos.getConstArray(), aInfos.getLength(), @@ -121,7 +121,7 @@ Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & Proper /** * Return the sequence of properties, which are provided throug the constructor. */ -sal_Bool OPropertySetHelperInfo_Impl::hasPropertyByName( const OUString & PropertyName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool OPropertySetHelperInfo_Impl::hasPropertyByName( const OUString & PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) { Property * pR; pR = (Property *)bsearch( &PropertyName, aInfos.getConstArray(), aInfos.getLength(), @@ -207,7 +207,7 @@ OPropertySetHelper2::~OPropertySetHelper2() SAL_THROW(()) // XInterface Any OPropertySetHelper::queryInterface( const ::com::sun::star::uno::Type & rType ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return ::cppu::queryInterface( rType, @@ -217,7 +217,7 @@ Any OPropertySetHelper::queryInterface( const ::com::sun::star::uno::Type & rTyp } Any OPropertySetHelper2::queryInterface( const ::com::sun::star::uno::Type & rType ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Any cnd(cppu::queryInterface(rType, static_cast< XPropertySetOption * >(this))); if ( cnd.hasValue() ) @@ -263,7 +263,7 @@ Reference < XPropertySetInfo > OPropertySetHelper::createPropertySetInfo( // XPropertySet void OPropertySetHelper::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { // get the map table IPropertyArrayHelper & rPH = getInfoHelper(); @@ -276,7 +276,7 @@ void OPropertySetHelper::setPropertyValue( // XPropertySet Any OPropertySetHelper::getPropertyValue( const OUString& rPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { // get the map table IPropertyArrayHelper & rPH = getInfoHelper(); @@ -292,7 +292,7 @@ void OPropertySetHelper::addPropertyChangeListener( const Reference < XPropertyChangeListener > & rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { MutexGuard aGuard( rBHelper.rMutex ); OSL_ENSURE( !rBHelper.bInDispose, "do not addPropertyChangeListener in the dispose call" ); @@ -340,7 +340,7 @@ void OPropertySetHelper::removePropertyChangeListener( const Reference < XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { MutexGuard aGuard( rBHelper.rMutex ); OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" ); @@ -374,7 +374,7 @@ void OPropertySetHelper::addVetoableChangeListener( const Reference< XVetoableChangeListener > & rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { MutexGuard aGuard( rBHelper.rMutex ); OSL_ENSURE( !rBHelper.bInDispose, "do not addVetoableChangeListener in the dispose call" ); @@ -420,7 +420,7 @@ void OPropertySetHelper::removeVetoableChangeListener( const Reference < XVetoableChangeListener > & rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { MutexGuard aGuard( rBHelper.rMutex ); OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" ); @@ -506,7 +506,7 @@ void OPropertySetHelper::setFastPropertyValue( sal_Int32 nHandle, const Any& rVa ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { OSL_ENSURE( !rBHelper.bInDispose, "do not setFastPropertyValue in the dispose call" ); OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" ); @@ -574,7 +574,7 @@ void OPropertySetHelper::setFastPropertyValue( sal_Int32 nHandle, const Any& rVa Any OPropertySetHelper::getFastPropertyValue( sal_Int32 nHandle ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { IPropertyArrayHelper & rInfo = getInfoHelper(); @@ -916,7 +916,7 @@ void OPropertySetHelper::setFastPropertyValues( void OPropertySetHelper::setPropertyValues( const Sequence& rPropertyNames, const Sequence& rValues ) - throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int32 * pHandles = NULL; try @@ -940,7 +940,7 @@ void OPropertySetHelper::setPropertyValues( // XMultiPropertySet Sequence OPropertySetHelper::getPropertyValues( const Sequence& rPropertyNames ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { sal_Int32 nSeqLen = rPropertyNames.getLength(); sal_Int32 * pHandles = new sal_Int32[ nSeqLen ]; @@ -966,7 +966,7 @@ Sequence OPropertySetHelper::getPropertyValues( const Sequence& r void OPropertySetHelper::addPropertiesChangeListener( const Sequence & , const Reference < XPropertiesChangeListener > & rListener ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { rBHelper.addListener( getCppuType(&rListener) , rListener ); } @@ -974,7 +974,7 @@ void OPropertySetHelper::addPropertiesChangeListener( // XMultiPropertySet void OPropertySetHelper::removePropertiesChangeListener( const Reference < XPropertiesChangeListener > & rListener ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { rBHelper.removeListener( getCppuType(&rListener) , rListener ); } @@ -983,7 +983,7 @@ void OPropertySetHelper::removePropertiesChangeListener( void OPropertySetHelper::firePropertiesChangeEvent( const Sequence& rPropertyNames, const Reference < XPropertiesChangeListener >& rListener ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { sal_Int32 nLen = rPropertyNames.getLength(); sal_Int32 * pHandles = new sal_Int32[nLen]; @@ -1027,7 +1027,7 @@ void OPropertySetHelper::firePropertiesChangeEvent( } void OPropertySetHelper2::enableChangeListenerNotification( sal_Bool bEnable ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { m_pReserved->m_bFireEvents = bEnable; } diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx index 973201d0f3c2..6a4618cca476 100644 --- a/cppuhelper/source/servicemanager.cxx +++ b/cppuhelper/source/servicemanager.cxx @@ -479,12 +479,12 @@ private: virtual ~ContentEnumeration() {} virtual sal_Bool SAL_CALL hasMoreElements() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Any SAL_CALL nextElement() throw ( css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException); + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); osl::Mutex mutex_; std::vector< css::uno::Any > factories_; @@ -492,7 +492,7 @@ private: }; sal_Bool ContentEnumeration::hasMoreElements() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard g(mutex_); return iterator_ != factories_.end(); @@ -501,7 +501,7 @@ sal_Bool ContentEnumeration::hasMoreElements() css::uno::Any ContentEnumeration::nextElement() throw ( css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(mutex_); if (iterator_ == factories_.end()) { @@ -538,13 +538,13 @@ private: virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( css::uno::Sequence< css::uno::Any > const & Arguments, css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); rtl::Reference< cppuhelper::ServiceManager > manager_; boost::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > @@ -554,7 +554,7 @@ private: css::uno::Reference< css::uno::XInterface > SingletonFactory::createInstanceWithContext( css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { manager_->loadImplementation(Context, implementation_); return implementation_->createInstance(Context, true); @@ -564,7 +564,7 @@ css::uno::Reference< css::uno::XInterface > SingletonFactory::createInstanceWithArgumentsAndContext( css::uno::Sequence< css::uno::Any > const & Arguments, css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { manager_->loadImplementation(Context, implementation_); return implementation_->createInstanceWithArguments( @@ -592,30 +592,30 @@ private: virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( css::uno::Sequence< css::uno::Any > const & Arguments, css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::uno::XInterface > SAL_CALL - createInstance() throw (css::uno::Exception, css::uno::RuntimeException); + createInstance() throw (css::uno::Exception, css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( css::uno::Sequence< css::uno::Any > const & Arguments) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); virtual rtl::OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< rtl::OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException); + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception); rtl::Reference< cppuhelper::ServiceManager > manager_; boost::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > @@ -625,7 +625,7 @@ private: css::uno::Reference< css::uno::XInterface > ImplementationWrapper::createInstanceWithContext( css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { manager_->loadImplementation(Context, implementation_); return implementation_->createInstance(Context, false); @@ -635,7 +635,7 @@ css::uno::Reference< css::uno::XInterface > ImplementationWrapper::createInstanceWithArgumentsAndContext( css::uno::Sequence< css::uno::Any > const & Arguments, css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { manager_->loadImplementation(Context, implementation_); return implementation_->createInstanceWithArguments( @@ -644,7 +644,7 @@ ImplementationWrapper::createInstanceWithArgumentsAndContext( css::uno::Reference< css::uno::XInterface > ImplementationWrapper::createInstance() - throw (css::uno::Exception, css::uno::RuntimeException) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { return createInstanceWithContext(manager_->getContext()); } @@ -652,27 +652,27 @@ ImplementationWrapper::createInstance() css::uno::Reference< css::uno::XInterface > ImplementationWrapper::createInstanceWithArguments( css::uno::Sequence< css::uno::Any > const & Arguments) - throw (css::uno::Exception, css::uno::RuntimeException) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { return createInstanceWithArgumentsAndContext( Arguments, manager_->getContext()); } rtl::OUString ImplementationWrapper::getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return implementation_->info->name; } sal_Bool ImplementationWrapper::supportsService(rtl::OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence< rtl::OUString > ImplementationWrapper::getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { if (implementation_->info->services.size() > static_cast< sal_uInt32 >(SAL_MAX_INT32)) @@ -964,7 +964,7 @@ void cppuhelper::ServiceManager::disposing() { } rtl::OUString cppuhelper::ServiceManager::getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return rtl::OUString( "com.sun.star.comp.cppuhelper.bootstrap.ServiceManager"); @@ -972,14 +972,14 @@ rtl::OUString cppuhelper::ServiceManager::getImplementationName() sal_Bool cppuhelper::ServiceManager::supportsService( rtl::OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence< rtl::OUString > cppuhelper::ServiceManager::getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< rtl::OUString > names(2); names[0] = "com.sun.star.lang.MultiServiceFactory"; @@ -990,7 +990,7 @@ cppuhelper::ServiceManager::getSupportedServiceNames() css::uno::Reference< css::uno::XInterface > cppuhelper::ServiceManager::createInstance( rtl::OUString const & aServiceSpecifier) - throw (css::uno::Exception, css::uno::RuntimeException) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { assert(context_.is()); return createInstanceWithContext(aServiceSpecifier, context_); @@ -1000,7 +1000,7 @@ css::uno::Reference< css::uno::XInterface > cppuhelper::ServiceManager::createInstanceWithArguments( rtl::OUString const & ServiceSpecifier, css::uno::Sequence< css::uno::Any > const & Arguments) - throw (css::uno::Exception, css::uno::RuntimeException) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { assert(context_.is()); return createInstanceWithArgumentsAndContext( @@ -1009,7 +1009,7 @@ cppuhelper::ServiceManager::createInstanceWithArguments( css::uno::Sequence< rtl::OUString > cppuhelper::ServiceManager::getAvailableServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard g(rBHelper.rMutex); if (isDisposed()) { @@ -1036,7 +1036,7 @@ css::uno::Reference< css::uno::XInterface > cppuhelper::ServiceManager::createInstanceWithContext( rtl::OUString const & aServiceSpecifier, css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { boost::shared_ptr< Data::Implementation > impl( findServiceImplementation(Context, aServiceSpecifier)); @@ -1050,7 +1050,7 @@ cppuhelper::ServiceManager::createInstanceWithArgumentsAndContext( rtl::OUString const & ServiceSpecifier, css::uno::Sequence< css::uno::Any > const & Arguments, css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { boost::shared_ptr< Data::Implementation > impl( findServiceImplementation(Context, ServiceSpecifier)); @@ -1060,13 +1060,13 @@ cppuhelper::ServiceManager::createInstanceWithArgumentsAndContext( } css::uno::Type cppuhelper::ServiceManager::getElementType() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::uno::Type(); } sal_Bool cppuhelper::ServiceManager::hasElements() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard g(rBHelper.rMutex); return @@ -1076,7 +1076,7 @@ sal_Bool cppuhelper::ServiceManager::hasElements() css::uno::Reference< css::container::XEnumeration > cppuhelper::ServiceManager::createEnumeration() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "ServiceManager createEnumeration: method not supported", @@ -1084,7 +1084,7 @@ cppuhelper::ServiceManager::createEnumeration() } sal_Bool cppuhelper::ServiceManager::has(css::uno::Any const &) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "ServiceManager has: method not supported", @@ -1094,7 +1094,7 @@ sal_Bool cppuhelper::ServiceManager::has(css::uno::Any const &) void cppuhelper::ServiceManager::insert(css::uno::Any const & aElement) throw ( css::lang::IllegalArgumentException, - css::container::ElementExistException, css::uno::RuntimeException) + css::container::ElementExistException, css::uno::RuntimeException, std::exception) { css::uno::Sequence< css::beans::NamedValue > args; if (aElement >>= args) { @@ -1160,7 +1160,7 @@ void cppuhelper::ServiceManager::insert(css::uno::Any const & aElement) void cppuhelper::ServiceManager::remove(css::uno::Any const & aElement) throw ( css::lang::IllegalArgumentException, - css::container::NoSuchElementException, css::uno::RuntimeException) + css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) { css::uno::Sequence< css::beans::NamedValue > args; if (aElement >>= args) { @@ -1205,7 +1205,7 @@ void cppuhelper::ServiceManager::remove(css::uno::Any const & aElement) css::uno::Reference< css::container::XEnumeration > cppuhelper::ServiceManager::createContentEnumeration( rtl::OUString const & aServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { std::vector< boost::shared_ptr< Data::Implementation > > impls; { @@ -1257,7 +1257,7 @@ cppuhelper::ServiceManager::createContentEnumeration( css::uno::Reference< css::beans::XPropertySetInfo > cppuhelper::ServiceManager::getPropertySetInfo() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return this; } @@ -1267,7 +1267,7 @@ void cppuhelper::ServiceManager::setPropertyValue( throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { if (aPropertyName == "DefaultContext") { throw css::beans::PropertyVetoException( @@ -1282,7 +1282,7 @@ css::uno::Any cppuhelper::ServiceManager::getPropertyValue( rtl::OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { if (PropertyName != "DefaultContext") { throw css::beans::UnknownPropertyException( @@ -1298,7 +1298,7 @@ void cppuhelper::ServiceManager::addPropertyChangeListener( xListener) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { if (!aPropertyName.isEmpty() && aPropertyName != "DefaultContext") { throw css::beans::UnknownPropertyException( @@ -1314,7 +1314,7 @@ void cppuhelper::ServiceManager::removePropertyChangeListener( aListener) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { if (!aPropertyName.isEmpty() && aPropertyName != "DefaultContext") { throw css::beans::UnknownPropertyException( @@ -1330,7 +1330,7 @@ void cppuhelper::ServiceManager::addVetoableChangeListener( aListener) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { if (!PropertyName.isEmpty() && PropertyName != "DefaultContext") { throw css::beans::UnknownPropertyException( @@ -1346,7 +1346,7 @@ void cppuhelper::ServiceManager::removeVetoableChangeListener( aListener) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { if (!PropertyName.isEmpty() && PropertyName != "DefaultContext") { throw css::beans::UnknownPropertyException( @@ -1357,7 +1357,7 @@ void cppuhelper::ServiceManager::removeVetoableChangeListener( } css::uno::Sequence< css::beans::Property > -cppuhelper::ServiceManager::getProperties() throw (css::uno::RuntimeException) { +cppuhelper::ServiceManager::getProperties() throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< css::beans::Property > props(1); props[0] = getDefaultContextProperty(); return props; @@ -1365,7 +1365,7 @@ cppuhelper::ServiceManager::getProperties() throw (css::uno::RuntimeException) { css::beans::Property cppuhelper::ServiceManager::getPropertyByName( rtl::OUString const & aName) - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) + throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) { if (aName != "DefaultContext") { throw css::beans::UnknownPropertyException( @@ -1376,14 +1376,14 @@ css::beans::Property cppuhelper::ServiceManager::getPropertyByName( sal_Bool cppuhelper::ServiceManager::hasPropertyByName( rtl::OUString const & Name) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return Name == "DefaultContext"; } void cppuhelper::ServiceManager::disposing( css::lang::EventObject const & Source) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { removeLegacyFactory( css::uno::Reference< css::lang::XServiceInfo >( diff --git a/cppuhelper/source/servicemanager.hxx b/cppuhelper/source/servicemanager.hxx index 1e760ca78310..e8446d6d7873 100644 --- a/cppuhelper/source/servicemanager.hxx +++ b/cppuhelper/source/servicemanager.hxx @@ -207,67 +207,67 @@ private: virtual void SAL_CALL disposing(); virtual rtl::OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< rtl::OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException); + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( rtl::OUString const & aServiceSpecifier) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( rtl::OUString const & ServiceSpecifier, css::uno::Sequence< css::uno::Any > const & Arguments) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< rtl::OUString > SAL_CALL - getAvailableServiceNames() throw (css::uno::RuntimeException); + getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( rtl::OUString const & aServiceSpecifier, css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( rtl::OUString const & ServiceSpecifier, css::uno::Sequence< css::uno::Any > const & Arguments, css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); virtual css::uno::Type SAL_CALL getElementType() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL - createEnumeration() throw (css::uno::RuntimeException); + createEnumeration() throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL has(css::uno::Any const & aElement) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL insert(css::uno::Any const & aElement) throw ( css::lang::IllegalArgumentException, - css::container::ElementExistException, css::uno::RuntimeException); + css::container::ElementExistException, css::uno::RuntimeException, std::exception); virtual void SAL_CALL remove(css::uno::Any const & aElement) throw ( css::lang::IllegalArgumentException, - css::container::NoSuchElementException, css::uno::RuntimeException); + css::container::NoSuchElementException, css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createContentEnumeration(rtl::OUString const & aServiceName) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() throw (css::uno::RuntimeException); + getPropertySetInfo() throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setPropertyValue( rtl::OUString const & aPropertyName, css::uno::Any const & aValue) @@ -275,13 +275,13 @@ private: css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, css::uno::RuntimeException); + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); virtual css::uno::Any SAL_CALL getPropertyValue( rtl::OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException); + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); virtual void SAL_CALL addPropertyChangeListener( rtl::OUString const & aPropertyName, @@ -289,7 +289,7 @@ private: xListener) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException); + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); virtual void SAL_CALL removePropertyChangeListener( rtl::OUString const & aPropertyName, @@ -297,7 +297,7 @@ private: aListener) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException); + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); virtual void SAL_CALL addVetoableChangeListener( rtl::OUString const & PropertyName, @@ -305,7 +305,7 @@ private: aListener) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException); + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeVetoableChangeListener( rtl::OUString const & PropertyName, @@ -313,21 +313,21 @@ private: aListener) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException); + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::beans::Property SAL_CALL getPropertyByName( rtl::OUString const & aName) throw ( - css::beans::UnknownPropertyException, css::uno::RuntimeException); + css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasPropertyByName(rtl::OUString const & Name) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL disposing(css::lang::EventObject const & Source) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // needs to be called with rBHelper.rMutex locked: bool isDisposed() { return rBHelper.bDisposed || rBHelper.bInDispose; } diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx index 582e3f5699dc..5ff8190fa2c3 100644 --- a/cppuhelper/source/tdmgr.cxx +++ b/cppuhelper/source/tdmgr.cxx @@ -626,11 +626,11 @@ public: // XEventListener virtual void SAL_CALL disposing( lang::EventObject const & rEvt ) - throw (RuntimeException); + throw (RuntimeException, std::exception); }; void EventListenerImpl::disposing( lang::EventObject const & rEvt ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rEvt.Source != m_xTDMgr) { OSL_ASSERT(false); diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx index 7fa6737e90f1..57a67bb98fd1 100644 --- a/cppuhelper/source/typemanager.cxx +++ b/cppuhelper/source/typemanager.cxx @@ -92,10 +92,10 @@ private: virtual ~SimpleTypeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return typeClass_; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException) + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) { return name_; } css::uno::TypeClass typeClass_; @@ -116,14 +116,14 @@ private: virtual ~SequenceTypeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::uno::TypeClass_SEQUENCE; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException) + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getReferencedType() throw (css::uno::RuntimeException) + getReferencedType() throw (css::uno::RuntimeException, std::exception) { return manager_->resolve(componentType_); } rtl::Reference< cppuhelper::TypeManager > manager_; @@ -140,7 +140,7 @@ protected: virtual ~PublishableDescription() {} private: - virtual sal_Bool SAL_CALL isPublished() throw (css::uno::RuntimeException) + virtual sal_Bool SAL_CALL isPublished() throw (css::uno::RuntimeException, std::exception) { return published_; } bool published_; @@ -161,16 +161,16 @@ private: virtual ~ModuleDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::uno::TypeClass_MODULE; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException) + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) { return name_; } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getMembers() throw (css::uno::RuntimeException); + SAL_CALL getMembers() throw (css::uno::RuntimeException, std::exception); rtl::Reference< cppuhelper::TypeManager > manager_; rtl::OUString name_; @@ -178,7 +178,7 @@ private: }; css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > -ModuleDescription::getMembers() throw (css::uno::RuntimeException) { +ModuleDescription::getMembers() throw (css::uno::RuntimeException, std::exception) { try { std::vector< rtl::OUString > names(entity_->getMemberNames()); assert(names.size() <= SAL_MAX_INT32); @@ -213,28 +213,28 @@ private: virtual ~EnumTypeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::uno::TypeClass_ENUM; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException) + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) { return name_; } virtual sal_Int32 SAL_CALL getDefaultEnumValue() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return entity_->getMembers()[0].value; } virtual css::uno::Sequence< rtl::OUString > SAL_CALL getEnumNames() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< sal_Int32 > SAL_CALL getEnumValues() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); rtl::OUString name_; rtl::Reference< unoidl::EnumTypeEntity > entity_; }; css::uno::Sequence< rtl::OUString > EnumTypeDescription::getEnumNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(entity_->getMembers().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size()); @@ -246,7 +246,7 @@ css::uno::Sequence< rtl::OUString > EnumTypeDescription::getEnumNames() } css::uno::Sequence< sal_Int32 > EnumTypeDescription::getEnumValues() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(entity_->getMembers().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size()); @@ -275,14 +275,14 @@ private: virtual ~PlainStructTypeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::uno::TypeClass_STRUCT; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException) + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getBaseType() throw (css::uno::RuntimeException) { + getBaseType() throw (css::uno::RuntimeException, std::exception) { return entity_->getDirectBase().isEmpty() ? css::uno::Reference< css::reflection::XTypeDescription >() : manager_->resolve(entity_->getDirectBase()); @@ -291,19 +291,19 @@ private: virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getMemberTypes() throw (css::uno::RuntimeException); + SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence< rtl::OUString >(); } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getTypeArguments() throw (css::uno::RuntimeException) { + SAL_CALL getTypeArguments() throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >(); } @@ -314,7 +314,7 @@ private: }; css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > -PlainStructTypeDescription::getMemberTypes() throw (css::uno::RuntimeException) +PlainStructTypeDescription::getMemberTypes() throw (css::uno::RuntimeException, std::exception) { assert(entity_->getDirectMembers().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(entity_->getDirectMembers().size()); @@ -327,7 +327,7 @@ PlainStructTypeDescription::getMemberTypes() throw (css::uno::RuntimeException) } css::uno::Sequence< rtl::OUString > PlainStructTypeDescription::getMemberNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(entity_->getDirectMembers().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(entity_->getDirectMembers().size()); @@ -351,10 +351,10 @@ private: virtual ~ParameterizedMemberTypeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::uno::TypeClass_UNKNOWN; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException) + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) { return typeParameterName_; } rtl::OUString typeParameterName_; @@ -381,31 +381,31 @@ private: virtual ~PolymorphicStructTypeTemplateDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::uno::TypeClass_STRUCT; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException) + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getBaseType() throw (css::uno::RuntimeException) + getBaseType() throw (css::uno::RuntimeException, std::exception) { return css::uno::Reference< css::reflection::XTypeDescription >(); } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getMemberTypes() throw (css::uno::RuntimeException); + SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getTypeArguments() throw (css::uno::RuntimeException) { + SAL_CALL getTypeArguments() throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >(); } @@ -417,7 +417,7 @@ private: css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > PolymorphicStructTypeTemplateDescription::getMemberTypes() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(entity_->getMembers().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size()); @@ -434,7 +434,7 @@ PolymorphicStructTypeTemplateDescription::getMemberTypes() css::uno::Sequence< rtl::OUString > PolymorphicStructTypeTemplateDescription::getMemberNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(entity_->getMembers().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size()); @@ -447,7 +447,7 @@ PolymorphicStructTypeTemplateDescription::getMemberNames() css::uno::Sequence< rtl::OUString > PolymorphicStructTypeTemplateDescription::getTypeParameters() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(entity_->getTypeParameters().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(entity_->getTypeParameters().size()); @@ -479,32 +479,32 @@ private: virtual ~InstantiatedPolymorphicStructTypeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::uno::TypeClass_STRUCT; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException) + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getBaseType() throw (css::uno::RuntimeException) + getBaseType() throw (css::uno::RuntimeException, std::exception) { return css::uno::Reference< css::reflection::XTypeDescription >(); } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getMemberTypes() throw (css::uno::RuntimeException); + SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence< rtl::OUString >(); } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getTypeArguments() throw (css::uno::RuntimeException); + SAL_CALL getTypeArguments() throw (css::uno::RuntimeException, std::exception); rtl::Reference< cppuhelper::TypeManager > manager_; rtl::OUString name_; @@ -514,7 +514,7 @@ private: css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > InstantiatedPolymorphicStructTypeDescription::getMemberTypes() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(entity_->getMembers().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size()); @@ -542,7 +542,7 @@ InstantiatedPolymorphicStructTypeDescription::getMemberTypes() css::uno::Sequence< rtl::OUString > InstantiatedPolymorphicStructTypeDescription::getMemberNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(entity_->getMembers().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size()); @@ -554,7 +554,7 @@ InstantiatedPolymorphicStructTypeDescription::getMemberNames() } css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > InstantiatedPolymorphicStructTypeDescription::getTypeArguments() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(arguments_.size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(arguments_.size()); @@ -584,14 +584,14 @@ private: virtual ~ExceptionTypeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::uno::TypeClass_EXCEPTION; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException) + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getBaseType() throw (css::uno::RuntimeException) { + getBaseType() throw (css::uno::RuntimeException, std::exception) { return entity_->getDirectBase().isEmpty() ? css::uno::Reference< css::reflection::XTypeDescription >() : manager_->resolve(entity_->getDirectBase()); @@ -600,10 +600,10 @@ private: virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getMemberTypes() throw (css::uno::RuntimeException); + SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); rtl::Reference< cppuhelper::TypeManager > manager_; rtl::OUString name_; @@ -611,7 +611,7 @@ private: }; css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > -ExceptionTypeDescription::getMemberTypes() throw (css::uno::RuntimeException) { +ExceptionTypeDescription::getMemberTypes() throw (css::uno::RuntimeException, std::exception) { assert(entity_->getDirectMembers().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(entity_->getDirectMembers().size()); css::uno::Sequence< @@ -623,7 +623,7 @@ ExceptionTypeDescription::getMemberTypes() throw (css::uno::RuntimeException) { } css::uno::Sequence< rtl::OUString > ExceptionTypeDescription::getMemberNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(entity_->getDirectMembers().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(entity_->getDirectMembers().size()); @@ -652,38 +652,38 @@ private: virtual ~AttributeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::uno::TypeClass_INTERFACE_ATTRIBUTE; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException) + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) { return name_; } virtual rtl::OUString SAL_CALL getMemberName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return attribute_.name; } - virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException) + virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) { return position_; } - virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException) + virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception) { return attribute_.readOnly; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getType() throw (css::uno::RuntimeException) + getType() throw (css::uno::RuntimeException, std::exception) { return manager_->resolve(attribute_.type); } - virtual sal_Bool SAL_CALL isBound() throw (css::uno::RuntimeException) + virtual sal_Bool SAL_CALL isBound() throw (css::uno::RuntimeException, std::exception) { return attribute_.bound; } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XCompoundTypeDescription > > - SAL_CALL getGetExceptions() throw (css::uno::RuntimeException); + SAL_CALL getGetExceptions() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::uno::Reference< css::reflection::XCompoundTypeDescription > > - SAL_CALL getSetExceptions() throw (css::uno::RuntimeException); + SAL_CALL getSetExceptions() throw (css::uno::RuntimeException, std::exception); rtl::Reference< cppuhelper::TypeManager > manager_; rtl::OUString name_; @@ -693,7 +693,7 @@ private: css::uno::Sequence< css::uno::Reference< css::reflection::XCompoundTypeDescription > > -AttributeDescription::getGetExceptions() throw (css::uno::RuntimeException) { +AttributeDescription::getGetExceptions() throw (css::uno::RuntimeException, std::exception) { assert(attribute_.getExceptions.size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(attribute_.getExceptions.size()); css::uno::Sequence< @@ -708,7 +708,7 @@ AttributeDescription::getGetExceptions() throw (css::uno::RuntimeException) { css::uno::Sequence< css::uno::Reference< css::reflection::XCompoundTypeDescription > > -AttributeDescription::getSetExceptions() throw (css::uno::RuntimeException) { +AttributeDescription::getSetExceptions() throw (css::uno::RuntimeException, std::exception) { assert(attribute_.setExceptions.size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(attribute_.setExceptions.size()); css::uno::Sequence< @@ -735,14 +735,14 @@ public: private: virtual ~MethodParameter() {} - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException) + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) { return parameter_.name; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getType() throw (css::uno::RuntimeException) + getType() throw (css::uno::RuntimeException, std::exception) { return manager_->resolve(parameter_.type); } - virtual sal_Bool SAL_CALL isIn() throw (css::uno::RuntimeException) { + virtual sal_Bool SAL_CALL isIn() throw (css::uno::RuntimeException, std::exception) { return (parameter_.direction == unoidl::InterfaceTypeEntity::Method::Parameter::DIRECTION_IN) @@ -751,7 +751,7 @@ private: DIRECTION_IN_OUT); } - virtual sal_Bool SAL_CALL isOut() throw (css::uno::RuntimeException) { + virtual sal_Bool SAL_CALL isOut() throw (css::uno::RuntimeException, std::exception) { return (parameter_.direction == unoidl::InterfaceTypeEntity::Method::Parameter::DIRECTION_OUT) @@ -760,7 +760,7 @@ private: DIRECTION_IN_OUT); } - virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException) + virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) { return position_; } rtl::Reference< cppuhelper::TypeManager > manager_; @@ -784,35 +784,35 @@ private: virtual ~MethodDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::uno::TypeClass_INTERFACE_METHOD; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException) + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) { return name_; } virtual rtl::OUString SAL_CALL getMemberName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return method_.name; } - virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException) + virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) { return position_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getReturnType() throw (css::uno::RuntimeException) + getReturnType() throw (css::uno::RuntimeException, std::exception) { return manager_->resolve(method_.returnType); } - virtual sal_Bool SAL_CALL isOneway() throw (css::uno::RuntimeException) + virtual sal_Bool SAL_CALL isOneway() throw (css::uno::RuntimeException, std::exception) { return false; } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XMethodParameter > > - SAL_CALL getParameters() throw (css::uno::RuntimeException); + SAL_CALL getParameters() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getExceptions() throw (css::uno::RuntimeException); + SAL_CALL getExceptions() throw (css::uno::RuntimeException, std::exception); rtl::Reference< cppuhelper::TypeManager > manager_; rtl::OUString name_; @@ -821,7 +821,7 @@ private: }; css::uno::Sequence< css::uno::Reference< css::reflection::XMethodParameter > > -MethodDescription::getParameters() throw (css::uno::RuntimeException) { +MethodDescription::getParameters() throw (css::uno::RuntimeException, std::exception) { assert(method_.parameters.size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(method_.parameters.size()); css::uno::Sequence< @@ -833,7 +833,7 @@ MethodDescription::getParameters() throw (css::uno::RuntimeException) { } css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > -MethodDescription::getExceptions() throw (css::uno::RuntimeException) { +MethodDescription::getExceptions() throw (css::uno::RuntimeException, std::exception) { assert(method_.exceptions.size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(method_.exceptions.size()); css::uno::Sequence< @@ -916,37 +916,37 @@ private: virtual ~InterfaceTypeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::uno::TypeClass_INTERFACE; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException) + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getBaseType() throw (css::uno::RuntimeException) { + getBaseType() throw (css::uno::RuntimeException, std::exception) { return entity_->getDirectMandatoryBases().empty() ? css::uno::Reference< css::reflection::XTypeDescription >() : manager_->resolve(entity_->getDirectMandatoryBases()[0].name); } - virtual css::uno::Uik SAL_CALL getUik() throw (css::uno::RuntimeException) + virtual css::uno::Uik SAL_CALL getUik() throw (css::uno::RuntimeException, std::exception) { return css::uno::Uik(); } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XInterfaceMemberTypeDescription > > - SAL_CALL getMembers() throw (css::uno::RuntimeException); + SAL_CALL getMembers() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getBaseTypes() throw (css::uno::RuntimeException); + SAL_CALL getBaseTypes() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getOptionalBaseTypes() throw (css::uno::RuntimeException); + SAL_CALL getOptionalBaseTypes() throw (css::uno::RuntimeException, std::exception); rtl::Reference< cppuhelper::TypeManager > manager_; rtl::OUString name_; @@ -955,7 +955,7 @@ private: css::uno::Sequence< css::uno::Reference< css::reflection::XInterfaceMemberTypeDescription > > -InterfaceTypeDescription::getMembers() throw (css::uno::RuntimeException) { +InterfaceTypeDescription::getMembers() throw (css::uno::RuntimeException, std::exception) { assert( entity_->getDirectAttributes().size() <= SAL_MAX_INT32 && (entity_->getDirectMethods().size() @@ -981,7 +981,7 @@ InterfaceTypeDescription::getMembers() throw (css::uno::RuntimeException) { } css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > -InterfaceTypeDescription::getBaseTypes() throw (css::uno::RuntimeException) { +InterfaceTypeDescription::getBaseTypes() throw (css::uno::RuntimeException, std::exception) { assert(entity_->getDirectMandatoryBases().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >( entity_->getDirectMandatoryBases().size()); @@ -995,7 +995,7 @@ InterfaceTypeDescription::getBaseTypes() throw (css::uno::RuntimeException) { css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > InterfaceTypeDescription::getOptionalBaseTypes() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(entity_->getDirectOptionalBases().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >( @@ -1020,14 +1020,14 @@ private: virtual ~ConstantDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::uno::TypeClass_CONSTANT; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException) + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) { return name_; } virtual css::uno::Any SAL_CALL getConstantValue() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return value_; } rtl::OUString name_; @@ -1092,16 +1092,16 @@ private: virtual ~ConstantGroupDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::uno::TypeClass_CONSTANTS; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException) + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) { return name_; } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XConstantTypeDescription > > - SAL_CALL getConstants() throw (css::uno::RuntimeException); + SAL_CALL getConstants() throw (css::uno::RuntimeException, std::exception); rtl::OUString name_; rtl::Reference< unoidl::ConstantGroupEntity > entity_; @@ -1109,7 +1109,7 @@ private: css::uno::Sequence< css::uno::Reference< css::reflection::XConstantTypeDescription > > -ConstantGroupDescription::getConstants() throw (css::uno::RuntimeException) { +ConstantGroupDescription::getConstants() throw (css::uno::RuntimeException, std::exception) { assert(entity_->getMembers().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size()); css::uno::Sequence< @@ -1138,14 +1138,14 @@ private: virtual ~TypedefDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::uno::TypeClass_TYPEDEF; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException) + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getReferencedType() throw (css::uno::RuntimeException) + getReferencedType() throw (css::uno::RuntimeException, std::exception) { return manager_->resolve(entity_->getType()); } rtl::Reference< cppuhelper::TypeManager > manager_; @@ -1168,24 +1168,24 @@ public: private: virtual ~ConstructorParameter() {} - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException) + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) { return parameter_.name; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getType() throw (css::uno::RuntimeException) + getType() throw (css::uno::RuntimeException, std::exception) { return manager_->resolve(parameter_.type); } - virtual sal_Bool SAL_CALL isIn() throw (css::uno::RuntimeException) + virtual sal_Bool SAL_CALL isIn() throw (css::uno::RuntimeException, std::exception) { return true; } - virtual sal_Bool SAL_CALL isOut() throw (css::uno::RuntimeException) + virtual sal_Bool SAL_CALL isOut() throw (css::uno::RuntimeException, std::exception) { return false; } - virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException) + virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) { return position_; } virtual sal_Bool SAL_CALL isRestParameter() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return parameter_.rest; } rtl::Reference< cppuhelper::TypeManager > manager_; @@ -1210,28 +1210,28 @@ private: virtual ~ConstructorDescription() {} virtual sal_Bool SAL_CALL isDefaultConstructor() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return constructor_.defaultConstructor; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException) + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) { return constructor_.name; } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XParameter > > - SAL_CALL getParameters() throw (css::uno::RuntimeException); + SAL_CALL getParameters() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::uno::Reference< css::reflection::XCompoundTypeDescription > > - SAL_CALL getExceptions() throw (css::uno::RuntimeException); + SAL_CALL getExceptions() throw (css::uno::RuntimeException, std::exception); rtl::Reference< cppuhelper::TypeManager > manager_; unoidl::SingleInterfaceBasedServiceEntity::Constructor constructor_; }; css::uno::Sequence< css::uno::Reference< css::reflection::XParameter > > -ConstructorDescription::getParameters() throw (css::uno::RuntimeException) { +ConstructorDescription::getParameters() throw (css::uno::RuntimeException, std::exception) { assert(constructor_.parameters.size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(constructor_.parameters.size()); css::uno::Sequence< css::uno::Reference< css::reflection::XParameter > > s( @@ -1245,7 +1245,7 @@ ConstructorDescription::getParameters() throw (css::uno::RuntimeException) { css::uno::Sequence< css::uno::Reference< css::reflection::XCompoundTypeDescription > > -ConstructorDescription::getExceptions() throw (css::uno::RuntimeException) { +ConstructorDescription::getExceptions() throw (css::uno::RuntimeException, std::exception) { assert(constructor_.exceptions.size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(constructor_.exceptions.size()); css::uno::Sequence< @@ -1279,16 +1279,16 @@ private: virtual ~SingleInterfaceBasedServiceDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::uno::TypeClass_SERVICE; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException) + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) { return name_; } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XServiceTypeDescription > > - SAL_CALL getMandatoryServices() throw (css::uno::RuntimeException) + SAL_CALL getMandatoryServices() throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence< css::uno::Reference< css::reflection::XServiceTypeDescription > >(); @@ -1297,7 +1297,7 @@ private: virtual css::uno::Sequence< css::uno::Reference< css::reflection::XServiceTypeDescription > > - SAL_CALL getOptionalServices() throw (css::uno::RuntimeException) + SAL_CALL getOptionalServices() throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence< css::uno::Reference< css::reflection::XServiceTypeDescription > >(); @@ -1306,7 +1306,7 @@ private: virtual css::uno::Sequence< css::uno::Reference< css::reflection::XInterfaceTypeDescription > > - SAL_CALL getMandatoryInterfaces() throw (css::uno::RuntimeException) + SAL_CALL getMandatoryInterfaces() throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence< css::uno::Reference< @@ -1316,7 +1316,7 @@ private: virtual css::uno::Sequence< css::uno::Reference< css::reflection::XInterfaceTypeDescription > > - SAL_CALL getOptionalInterfaces() throw (css::uno::RuntimeException) + SAL_CALL getOptionalInterfaces() throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence< css::uno::Reference< @@ -1326,7 +1326,7 @@ private: virtual css::uno::Sequence< css::uno::Reference< css::reflection::XPropertyTypeDescription > > - SAL_CALL getProperties() throw (css::uno::RuntimeException) + SAL_CALL getProperties() throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence< css::uno::Reference< @@ -1334,17 +1334,17 @@ private: } virtual sal_Bool SAL_CALL isSingleInterfaceBased() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return true; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getInterface() throw (css::uno::RuntimeException) + getInterface() throw (css::uno::RuntimeException, std::exception) { return manager_->resolve(entity_->getBase()); } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XServiceConstructorDescription > > - SAL_CALL getConstructors() throw (css::uno::RuntimeException); + SAL_CALL getConstructors() throw (css::uno::RuntimeException, std::exception); rtl::Reference< cppuhelper::TypeManager > manager_; rtl::OUString name_; @@ -1354,7 +1354,7 @@ private: css::uno::Sequence< css::uno::Reference< css::reflection::XServiceConstructorDescription > > SingleInterfaceBasedServiceDescription::getConstructors() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(entity_->getConstructors().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(entity_->getConstructors().size()); @@ -1382,18 +1382,18 @@ private: virtual ~PropertyDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::uno::TypeClass_PROPERTY; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException) + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) { return property_.name; } virtual sal_Int16 SAL_CALL getPropertyFlags() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return property_.attributes; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getPropertyTypeDescription() throw (css::uno::RuntimeException) + getPropertyTypeDescription() throw (css::uno::RuntimeException, std::exception) { return manager_->resolve(property_.type); } rtl::Reference< cppuhelper::TypeManager > manager_; @@ -1421,49 +1421,49 @@ private: virtual ~AccumulationBasedServiceDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::uno::TypeClass_SERVICE; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException) + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) { return name_; } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XServiceTypeDescription > > - SAL_CALL getMandatoryServices() throw (css::uno::RuntimeException); + SAL_CALL getMandatoryServices() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::uno::Reference< css::reflection::XServiceTypeDescription > > - SAL_CALL getOptionalServices() throw (css::uno::RuntimeException); + SAL_CALL getOptionalServices() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::uno::Reference< css::reflection::XInterfaceTypeDescription > > - SAL_CALL getMandatoryInterfaces() throw (css::uno::RuntimeException); + SAL_CALL getMandatoryInterfaces() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::uno::Reference< css::reflection::XInterfaceTypeDescription > > - SAL_CALL getOptionalInterfaces() throw (css::uno::RuntimeException); + SAL_CALL getOptionalInterfaces() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::uno::Reference< css::reflection::XPropertyTypeDescription > > - SAL_CALL getProperties() throw (css::uno::RuntimeException); + SAL_CALL getProperties() throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isSingleInterfaceBased() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return false; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getInterface() throw (css::uno::RuntimeException) + getInterface() throw (css::uno::RuntimeException, std::exception) { return css::uno::Reference< css::reflection::XTypeDescription >(); } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XServiceConstructorDescription > > - SAL_CALL getConstructors() throw (css::uno::RuntimeException) + SAL_CALL getConstructors() throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence< css::uno::Reference< @@ -1478,7 +1478,7 @@ private: css::uno::Sequence< css::uno::Reference< css::reflection::XServiceTypeDescription > > AccumulationBasedServiceDescription::getMandatoryServices() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(entity_->getDirectMandatoryBaseServices().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >( @@ -1497,7 +1497,7 @@ AccumulationBasedServiceDescription::getMandatoryServices() css::uno::Sequence< css::uno::Reference< css::reflection::XServiceTypeDescription > > AccumulationBasedServiceDescription::getOptionalServices() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(entity_->getDirectOptionalBaseServices().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >( @@ -1515,7 +1515,7 @@ AccumulationBasedServiceDescription::getOptionalServices() css::uno::Sequence< css::uno::Reference< css::reflection::XInterfaceTypeDescription > > AccumulationBasedServiceDescription::getMandatoryInterfaces() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(entity_->getDirectMandatoryBaseInterfaces().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >( @@ -1536,7 +1536,7 @@ AccumulationBasedServiceDescription::getMandatoryInterfaces() css::uno::Sequence< css::uno::Reference< css::reflection::XInterfaceTypeDescription > > AccumulationBasedServiceDescription::getOptionalInterfaces() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(entity_->getDirectOptionalBaseInterfaces().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >( @@ -1557,7 +1557,7 @@ AccumulationBasedServiceDescription::getOptionalInterfaces() css::uno::Sequence< css::uno::Reference< css::reflection::XPropertyTypeDescription > > AccumulationBasedServiceDescription::getProperties() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(entity_->getDirectProperties().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >( @@ -1591,25 +1591,25 @@ private: virtual ~InterfaceBasedSingletonDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::uno::TypeClass_SINGLETON; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException) + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) { return name_; } virtual css::uno::Reference< css::reflection::XServiceTypeDescription > - SAL_CALL getService() throw (css::uno::RuntimeException) + SAL_CALL getService() throw (css::uno::RuntimeException, std::exception) { return css::uno::Reference< css::reflection::XServiceTypeDescription >(); } virtual sal_Bool SAL_CALL isInterfaceBased() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return true; } virtual css::uno::Reference< css::reflection::XTypeDescription > - SAL_CALL getInterface() throw (css::uno::RuntimeException) + SAL_CALL getInterface() throw (css::uno::RuntimeException, std::exception) { return manager_->resolve(entity_->getBase()); } rtl::Reference< cppuhelper::TypeManager > manager_; @@ -1637,25 +1637,25 @@ private: virtual ~ServiceBasedSingletonDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::uno::TypeClass_SINGLETON; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException) + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) { return name_; } virtual css::uno::Reference< css::reflection::XServiceTypeDescription > - SAL_CALL getService() throw (css::uno::RuntimeException) + SAL_CALL getService() throw (css::uno::RuntimeException, std::exception) { return css::uno::Reference< css::reflection::XServiceTypeDescription >( manager_->resolve(entity_->getBase()), css::uno::UNO_QUERY_THROW); } virtual sal_Bool SAL_CALL isInterfaceBased() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return false; } virtual css::uno::Reference< css::reflection::XTypeDescription > - SAL_CALL getInterface() throw (css::uno::RuntimeException) + SAL_CALL getInterface() throw (css::uno::RuntimeException, std::exception) { return css::uno::Reference< css::reflection::XTypeDescription >(); } rtl::Reference< cppuhelper::TypeManager > manager_; @@ -1683,19 +1683,19 @@ private: virtual ~Enumeration() {} virtual sal_Bool SAL_CALL hasMoreElements() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return !positions_.empty(); } virtual css::uno::Any SAL_CALL nextElement() throw ( css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { return css::uno::makeAny(nextTypeDescription()); } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL nextTypeDescription() throw ( - css::container::NoSuchElementException, css::uno::RuntimeException); + css::container::NoSuchElementException, css::uno::RuntimeException, std::exception); bool matches(css::uno::TypeClass tc) const; @@ -1743,7 +1743,7 @@ private: css::uno::Reference< css::reflection::XTypeDescription > Enumeration::nextTypeDescription() - throw (css::container::NoSuchElementException, css::uno::RuntimeException) + throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) { rtl::OUString name; { @@ -1960,7 +1960,7 @@ cppuhelper::TypeManager::~TypeManager() throw () {} void cppuhelper::TypeManager::disposing() {} //TODO rtl::OUString cppuhelper::TypeManager::getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return rtl::OUString( "com.sun.star.comp.cppuhelper.bootstrap.TypeManager"); @@ -1968,14 +1968,14 @@ rtl::OUString cppuhelper::TypeManager::getImplementationName() sal_Bool cppuhelper::TypeManager::supportsService( rtl::OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence< rtl::OUString > cppuhelper::TypeManager::getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< rtl::OUString > names(1); names[0] = "com.sun.star.reflection.TypeDescriptionManager"; //TODO @@ -1984,7 +1984,7 @@ cppuhelper::TypeManager::getSupportedServiceNames() css::uno::Any cppuhelper::TypeManager::getByHierarchicalName( rtl::OUString const & aName) - throw (css::container::NoSuchElementException, css::uno::RuntimeException) + throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) { css::uno::Any desc(find(aName)); if (!desc.hasValue()) { @@ -1996,19 +1996,19 @@ css::uno::Any cppuhelper::TypeManager::getByHierarchicalName( sal_Bool cppuhelper::TypeManager::hasByHierarchicalName( rtl::OUString const & aName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return find(aName).hasValue(); } css::uno::Type cppuhelper::TypeManager::getElementType() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::UnoType< rtl::OUString >::get(); } sal_Bool cppuhelper::TypeManager::hasElements() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "TypeManager hasElements: method not supported", @@ -2017,7 +2017,7 @@ sal_Bool cppuhelper::TypeManager::hasElements() css::uno::Reference< css::container::XEnumeration > cppuhelper::TypeManager::createEnumeration() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "TypeManager createEnumeration: method not supported", @@ -2025,7 +2025,7 @@ cppuhelper::TypeManager::createEnumeration() } sal_Bool cppuhelper::TypeManager::has(css::uno::Any const &) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "TypeManager has: method not supported", @@ -2035,7 +2035,7 @@ sal_Bool cppuhelper::TypeManager::has(css::uno::Any const &) void cppuhelper::TypeManager::insert(css::uno::Any const & aElement) throw ( css::lang::IllegalArgumentException, - css::container::ElementExistException, css::uno::RuntimeException) + css::container::ElementExistException, css::uno::RuntimeException, std::exception) { rtl::OUString uri; if (!(aElement >>= uri)) { @@ -2052,7 +2052,7 @@ void cppuhelper::TypeManager::insert(css::uno::Any const & aElement) void cppuhelper::TypeManager::remove(css::uno::Any const & aElement) throw ( css::lang::IllegalArgumentException, - css::container::NoSuchElementException, css::uno::RuntimeException) + css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) { rtl::OUString uri; if (!(aElement >>= uri)) { @@ -2072,7 +2072,7 @@ cppuhelper::TypeManager::createTypeDescriptionEnumeration( throw ( css::reflection::NoSuchTypeNameException, css::reflection::InvalidTypeNameException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { rtl::Reference< unoidl::MapCursor > cursor; try { diff --git a/cppuhelper/source/typemanager.hxx b/cppuhelper/source/typemanager.hxx index 3cd6a7519364..14a41542cb9e 100644 --- a/cppuhelper/source/typemanager.hxx +++ b/cppuhelper/source/typemanager.hxx @@ -69,42 +69,42 @@ private: virtual void SAL_CALL disposing(); virtual rtl::OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< rtl::OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException); + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Any SAL_CALL getByHierarchicalName( rtl::OUString const & aName) throw ( - css::container::NoSuchElementException, css::uno::RuntimeException); + css::container::NoSuchElementException, css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByHierarchicalName(rtl::OUString const & aName) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Type SAL_CALL getElementType() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL - createEnumeration() throw (css::uno::RuntimeException); + createEnumeration() throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL has(css::uno::Any const & aElement) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL insert(css::uno::Any const & aElement) throw ( css::lang::IllegalArgumentException, - css::container::ElementExistException, css::uno::RuntimeException); + css::container::ElementExistException, css::uno::RuntimeException, std::exception); virtual void SAL_CALL remove(css::uno::Any const & aElement) throw ( css::lang::IllegalArgumentException, - css::container::NoSuchElementException, css::uno::RuntimeException); + css::container::NoSuchElementException, css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::reflection::XTypeDescriptionEnumeration > SAL_CALL createTypeDescriptionEnumeration( @@ -114,7 +114,7 @@ private: throw ( css::reflection::NoSuchTypeNameException, css::reflection::InvalidTypeNameException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); void readRdbs(rtl::OUString const & uris); diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx index 857f64d50a4b..37051c8db2e5 100644 --- a/cppuhelper/source/weak.cxx +++ b/cppuhelper/source/weak.cxx @@ -54,14 +54,14 @@ public: {} // XInterface - Any SAL_CALL queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException); + Any SAL_CALL queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL acquire() throw(); void SAL_CALL release() throw(); // XAdapter - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL queryAdapted() throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL addReference( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XReference >& xRef ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL removeReference( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XReference >& xRef ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL queryAdapted() throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addReference( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XReference >& xRef ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL removeReference( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XReference >& xRef ) throw(::com::sun::star::uno::RuntimeException, std::exception); /// Called from the weak object if the reference count goes to zero. void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); @@ -82,7 +82,7 @@ private: // XInterface Any SAL_CALL OWeakConnectionPoint::queryInterface( const Type & rType ) - throw(com::sun::star::uno::RuntimeException) + throw(com::sun::star::uno::RuntimeException, std::exception) { return ::cppu::queryInterface( rType, static_cast< XAdapter * >( this ), static_cast< XInterface * >( this ) ); @@ -124,7 +124,7 @@ void SAL_CALL OWeakConnectionPoint::dispose() throw(::com::sun::star::uno::Runti } // XInterface -Reference< XInterface > SAL_CALL OWeakConnectionPoint::queryAdapted() throw(::com::sun::star::uno::RuntimeException) +Reference< XInterface > SAL_CALL OWeakConnectionPoint::queryAdapted() throw(::com::sun::star::uno::RuntimeException, std::exception) { Reference< XInterface > ret; @@ -153,14 +153,14 @@ Reference< XInterface > SAL_CALL OWeakConnectionPoint::queryAdapted() throw(::co // XInterface void SAL_CALL OWeakConnectionPoint::addReference(const Reference< XReference >& rRef) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { m_aReferences.addInterface( (const Reference< XInterface > &)rRef ); } // XInterface void SAL_CALL OWeakConnectionPoint::removeReference(const Reference< XReference >& rRef) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { m_aReferences.removeInterface( (const Reference< XInterface > &)rRef ); } @@ -180,7 +180,7 @@ OWeakObject::OWeakObject() SAL_THROW(()) #endif // XInterface -Any SAL_CALL OWeakObject::queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException) +Any SAL_CALL OWeakObject::queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return ::cppu::queryInterface( rType, @@ -230,7 +230,7 @@ OWeakObject::~OWeakObject() SAL_THROW( (RuntimeException) ) // XWeak Reference< XAdapter > SAL_CALL OWeakObject::queryAdapter() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { if (!m_pWeakConnectionPoint) { @@ -275,14 +275,14 @@ void OWeakAggObject::release() throw() } // XInterface -Any OWeakAggObject::queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException) +Any OWeakAggObject::queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { Reference< XInterface > x( xDelegator ); // harden ref return (x.is() ? x->queryInterface( rType ) : queryAggregation( rType )); } // XAggregation -Any OWeakAggObject::queryAggregation( const Type & rType ) throw(::com::sun::star::uno::RuntimeException) +Any OWeakAggObject::queryAggregation( const Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return ::cppu::queryInterface( rType, @@ -292,7 +292,7 @@ Any OWeakAggObject::queryAggregation( const Type & rType ) throw(::com::sun::sta } // XAggregation -void OWeakAggObject::setDelegator( const Reference & rDelegator ) throw(::com::sun::star::uno::RuntimeException) +void OWeakAggObject::setDelegator( const Reference & rDelegator ) throw(::com::sun::star::uno::RuntimeException, std::exception) { xDelegator = rDelegator; } @@ -324,12 +324,12 @@ public: virtual ~OWeakRefListener() SAL_THROW(()); // XInterface - Any SAL_CALL queryInterface( const Type & rType ) throw(RuntimeException); + Any SAL_CALL queryInterface( const Type & rType ) throw(RuntimeException, std::exception); void SAL_CALL acquire() throw(); void SAL_CALL release() throw(); // XReference - void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception); /// The reference counter. oslInterlockedCount m_aRefCount; @@ -392,7 +392,7 @@ OWeakRefListener::~OWeakRefListener() SAL_THROW(()) } // XInterface -Any SAL_CALL OWeakRefListener::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OWeakRefListener::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { return ::cppu::queryInterface( rType, static_cast< XReference * >( this ), static_cast< XInterface * >( this ) ); @@ -412,7 +412,7 @@ void SAL_CALL OWeakRefListener::release() throw() } void SAL_CALL OWeakRefListener::dispose() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { Reference< XAdapter > xAdp; { -- cgit