diff options
Diffstat (limited to 'framework/source/fwe/classes')
5 files changed, 48 insertions, 48 deletions
diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx index 9889ed9bbae7..815bcfb61859 100644 --- a/framework/source/fwe/classes/actiontriggercontainer.cxx +++ b/framework/source/fwe/classes/actiontriggercontainer.cxx @@ -43,7 +43,7 @@ ActionTriggerContainer::~ActionTriggerContainer() // XInterface Any SAL_CALL ActionTriggerContainer::queryInterface( const Type& aType ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Any a = ::cppu::queryInterface( aType , @@ -71,7 +71,7 @@ void ActionTriggerContainer::release() throw() // XMultiServiceFactory Reference< XInterface > SAL_CALL ActionTriggerContainer::createInstance( const OUString& aServiceSpecifier ) -throw ( ::com::sun::star::uno::Exception, RuntimeException) +throw ( ::com::sun::star::uno::Exception, RuntimeException, std::exception) { if ( aServiceSpecifier.equalsAscii( SERVICENAME_ACTIONTRIGGER )) return (OWeakObject *)( new ActionTriggerPropertySet()); @@ -84,13 +84,13 @@ throw ( ::com::sun::star::uno::Exception, RuntimeException) } Reference< XInterface > SAL_CALL ActionTriggerContainer::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/ ) -throw ( Exception, RuntimeException) +throw ( Exception, RuntimeException, std::exception) { return createInstance( ServiceSpecifier ); } Sequence< OUString > SAL_CALL ActionTriggerContainer::getAvailableServiceNames() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Sequence< OUString > aSeq( 3 ); @@ -103,19 +103,19 @@ throw ( RuntimeException ) // XServiceInfo OUString SAL_CALL ActionTriggerContainer::getImplementationName() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return OUString( IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER ); } sal_Bool SAL_CALL ActionTriggerContainer::supportsService( const OUString& ServiceName ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL ActionTriggerContainer::getSupportedServiceNames() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Sequence< OUString > seqServiceNames( 1 ); @@ -124,7 +124,7 @@ throw ( RuntimeException ) } // XTypeProvider -Sequence< Type > SAL_CALL ActionTriggerContainer::getTypes() throw ( RuntimeException ) +Sequence< Type > SAL_CALL ActionTriggerContainer::getTypes() throw ( RuntimeException, std::exception ) { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! @@ -154,7 +154,7 @@ Sequence< Type > SAL_CALL ActionTriggerContainer::getTypes() throw ( RuntimeExce return pTypeCollection->getTypes() ; } -Sequence< sal_Int8 > SAL_CALL ActionTriggerContainer::getImplementationId() throw ( RuntimeException ) +Sequence< sal_Int8 > SAL_CALL ActionTriggerContainer::getImplementationId() throw ( RuntimeException, std::exception ) { // Create one Id for all instances of this class. // Use ethernet address to do this! (sal_True) diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx index 228345e4c72a..6e649f74a5c0 100644 --- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx @@ -68,7 +68,7 @@ ActionTriggerPropertySet::~ActionTriggerPropertySet() // XInterface Any SAL_CALL ActionTriggerPropertySet::queryInterface( const Type& aType ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Any a = ::cppu::queryInterface( aType, @@ -100,19 +100,19 @@ void SAL_CALL ActionTriggerPropertySet::release() throw () // XServiceInfo OUString SAL_CALL ActionTriggerPropertySet::getImplementationName() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return OUString( IMPLEMENTATIONNAME_ACTIONTRIGGER ); } sal_Bool SAL_CALL ActionTriggerPropertySet::supportsService( const OUString& ServiceName ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL ActionTriggerPropertySet::getSupportedServiceNames() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Sequence< OUString > seqServiceNames( 1 ); seqServiceNames[0] = OUString( SERVICENAME_ACTIONTRIGGER ); @@ -120,7 +120,7 @@ throw ( RuntimeException ) } // XTypeProvider -Sequence< Type > SAL_CALL ActionTriggerPropertySet::getTypes() throw ( RuntimeException ) +Sequence< Type > SAL_CALL ActionTriggerPropertySet::getTypes() throw ( RuntimeException, std::exception ) { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! @@ -151,7 +151,7 @@ Sequence< Type > SAL_CALL ActionTriggerPropertySet::getTypes() throw ( RuntimeEx return pTypeCollection->getTypes() ; } -Sequence< sal_Int8 > SAL_CALL ActionTriggerPropertySet::getImplementationId() throw ( RuntimeException ) +Sequence< sal_Int8 > SAL_CALL ActionTriggerPropertySet::getImplementationId() throw ( RuntimeException, std::exception ) { // Create one Id for all instances of this class. // Use ethernet address to do this! (sal_True) @@ -222,7 +222,7 @@ throw( IllegalArgumentException ) void SAL_CALL ActionTriggerPropertySet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& aValue ) -throw( Exception ) +throw( Exception, std::exception ) { ::osl::MutexGuard aGuard( LockHelper::getGlobalLock().getShareableOslMutex() ); @@ -307,7 +307,7 @@ void SAL_CALL ActionTriggerPropertySet::getFastPropertyValue( } Reference< XPropertySetInfo > SAL_CALL ActionTriggerPropertySet::getPropertySetInfo() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx index c234772b8ce3..5917b2a5a201 100644 --- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx @@ -61,7 +61,7 @@ ActionTriggerSeparatorPropertySet::~ActionTriggerSeparatorPropertySet() // XInterface Any SAL_CALL ActionTriggerSeparatorPropertySet::queryInterface( const Type& aType ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Any a = ::cppu::queryInterface( aType, @@ -93,19 +93,19 @@ void ActionTriggerSeparatorPropertySet::release() throw() // XServiceInfo OUString SAL_CALL ActionTriggerSeparatorPropertySet::getImplementationName() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return OUString( IMPLEMENTATIONNAME_ACTIONTRIGGERSEPARATOR ); } sal_Bool SAL_CALL ActionTriggerSeparatorPropertySet::supportsService( const OUString& ServiceName ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL ActionTriggerSeparatorPropertySet::getSupportedServiceNames() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Sequence< OUString > seqServiceNames( 1 ); seqServiceNames[0] = OUString( SERVICENAME_ACTIONTRIGGERSEPARATOR ); @@ -113,7 +113,7 @@ throw ( RuntimeException ) } // XTypeProvider -Sequence< Type > SAL_CALL ActionTriggerSeparatorPropertySet::getTypes() throw ( RuntimeException ) +Sequence< Type > SAL_CALL ActionTriggerSeparatorPropertySet::getTypes() throw ( RuntimeException, std::exception ) { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! @@ -144,7 +144,7 @@ Sequence< Type > SAL_CALL ActionTriggerSeparatorPropertySet::getTypes() throw ( return pTypeCollection->getTypes() ; } -Sequence< sal_Int8 > SAL_CALL ActionTriggerSeparatorPropertySet::getImplementationId() throw ( RuntimeException ) +Sequence< sal_Int8 > SAL_CALL ActionTriggerSeparatorPropertySet::getImplementationId() throw ( RuntimeException, std::exception ) { // Create one Id for all instances of this class. // Use ethernet address to do this! (sal_True) @@ -199,7 +199,7 @@ throw( IllegalArgumentException ) void SAL_CALL ActionTriggerSeparatorPropertySet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& aValue ) -throw( Exception ) +throw( Exception, std::exception ) { ::osl::MutexGuard aGuard( LockHelper::getGlobalLock().getShareableOslMutex() ); @@ -252,7 +252,7 @@ void SAL_CALL ActionTriggerSeparatorPropertySet::getFastPropertyValue( } Reference< XPropertySetInfo > SAL_CALL ActionTriggerSeparatorPropertySet::getPropertySetInfo() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! diff --git a/framework/source/fwe/classes/imagewrapper.cxx b/framework/source/fwe/classes/imagewrapper.cxx index 42b2586d10a5..77a1988663d3 100644 --- a/framework/source/fwe/classes/imagewrapper.cxx +++ b/framework/source/fwe/classes/imagewrapper.cxx @@ -58,7 +58,7 @@ Sequence< sal_Int8 > ImageWrapper::GetUnoTunnelId() } // XBitmap -com::sun::star::awt::Size SAL_CALL ImageWrapper::getSize() throw ( RuntimeException ) +com::sun::star::awt::Size SAL_CALL ImageWrapper::getSize() throw ( RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -68,7 +68,7 @@ com::sun::star::awt::Size SAL_CALL ImageWrapper::getSize() throw ( RuntimeExcept return com::sun::star::awt::Size( aBitmapSize.Width(), aBitmapSize.Height() ); } -Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB() throw ( RuntimeException ) +Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB() throw ( RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -77,7 +77,7 @@ Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB() throw ( RuntimeException ) return Sequence< sal_Int8 >( (sal_Int8*) aMem.GetData(), aMem.Tell() ); } -Sequence< sal_Int8 > SAL_CALL ImageWrapper::getMaskDIB() throw ( RuntimeException ) +Sequence< sal_Int8 > SAL_CALL ImageWrapper::getMaskDIB() throw ( RuntimeException, std::exception ) { SolarMutexGuard aGuard; BitmapEx aBmpEx( m_aImage.GetBitmapEx() ); @@ -99,7 +99,7 @@ Sequence< sal_Int8 > SAL_CALL ImageWrapper::getMaskDIB() throw ( RuntimeExceptio } // XUnoTunnel -sal_Int64 SAL_CALL ImageWrapper::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw ( RuntimeException ) +sal_Int64 SAL_CALL ImageWrapper::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw ( RuntimeException, std::exception ) { if ( aIdentifier == impl_getStaticIdentifier() ) return reinterpret_cast< sal_Int64 >( this ); diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx index 45802e16a0b6..6a951dcf2dab 100644 --- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx +++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx @@ -62,7 +62,7 @@ RootActionTriggerContainer::~RootActionTriggerContainer() // XInterface Any SAL_CALL RootActionTriggerContainer::queryInterface( const Type& aType ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Any a = ::cppu::queryInterface( aType , @@ -92,7 +92,7 @@ void SAL_CALL RootActionTriggerContainer::release() throw () // XMultiServiceFactory Reference< XInterface > SAL_CALL RootActionTriggerContainer::createInstance( const OUString& aServiceSpecifier ) -throw ( Exception, RuntimeException ) +throw ( Exception, RuntimeException, std::exception ) { if ( aServiceSpecifier.equalsAscii( SERVICENAME_ACTIONTRIGGER )) return (OWeakObject *)( new ActionTriggerPropertySet()); @@ -105,13 +105,13 @@ throw ( Exception, RuntimeException ) } Reference< XInterface > SAL_CALL RootActionTriggerContainer::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/ ) -throw ( Exception, RuntimeException ) +throw ( Exception, RuntimeException, std::exception ) { return createInstance( ServiceSpecifier ); } Sequence< OUString > SAL_CALL RootActionTriggerContainer::getAvailableServiceNames() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Sequence< OUString > aSeq( 3 ); @@ -124,7 +124,7 @@ throw ( RuntimeException ) // XIndexContainer void SAL_CALL RootActionTriggerContainer::insertByIndex( sal_Int32 Index, const Any& Element ) -throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -137,7 +137,7 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept } void SAL_CALL RootActionTriggerContainer::removeByIndex( sal_Int32 Index ) -throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -151,7 +151,7 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) // XIndexReplace void SAL_CALL RootActionTriggerContainer::replaceByIndex( sal_Int32 Index, const Any& Element ) -throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -165,7 +165,7 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept // XIndexAccess sal_Int32 SAL_CALL RootActionTriggerContainer::getCount() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -186,7 +186,7 @@ throw ( RuntimeException ) } Any SAL_CALL RootActionTriggerContainer::getByIndex( sal_Int32 Index ) -throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -198,13 +198,13 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) // XElementAccess Type SAL_CALL RootActionTriggerContainer::getElementType() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return ::getCppuType(( Reference< XPropertySet >*)0); } sal_Bool SAL_CALL RootActionTriggerContainer::hasElements() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( m_pMenu ) { @@ -217,19 +217,19 @@ throw (::com::sun::star::uno::RuntimeException) // XServiceInfo OUString SAL_CALL RootActionTriggerContainer::getImplementationName() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return OUString( IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER ); } sal_Bool SAL_CALL RootActionTriggerContainer::supportsService( const OUString& ServiceName ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL RootActionTriggerContainer::getSupportedServiceNames() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Sequence< OUString > seqServiceNames( 1 ); @@ -238,7 +238,7 @@ throw ( RuntimeException ) } // XUnoTunnel -sal_Int64 SAL_CALL RootActionTriggerContainer::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw ( RuntimeException ) +sal_Int64 SAL_CALL RootActionTriggerContainer::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw ( RuntimeException, std::exception ) { if ( aIdentifier == impl_getStaticIdentifier() ) return reinterpret_cast< sal_Int64 >( this ); @@ -247,7 +247,7 @@ sal_Int64 SAL_CALL RootActionTriggerContainer::getSomething( const Sequence< sal } // XTypeProvider -Sequence< Type > SAL_CALL RootActionTriggerContainer::getTypes() throw ( RuntimeException ) +Sequence< Type > SAL_CALL RootActionTriggerContainer::getTypes() throw ( RuntimeException, std::exception ) { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! @@ -279,7 +279,7 @@ Sequence< Type > SAL_CALL RootActionTriggerContainer::getTypes() throw ( Runtime return pTypeCollection->getTypes() ; } -Sequence< sal_Int8 > SAL_CALL RootActionTriggerContainer::getImplementationId() throw ( RuntimeException ) +Sequence< sal_Int8 > SAL_CALL RootActionTriggerContainer::getImplementationId() throw ( RuntimeException, std::exception ) { // Create one Id for all instances of this class. // Use ethernet address to do this! (sal_True) @@ -318,7 +318,7 @@ void RootActionTriggerContainer::FillContainer() m_pMenu ); m_bInContainerCreation = sal_False; } -OUString RootActionTriggerContainer::getName() throw ( RuntimeException ) +OUString RootActionTriggerContainer::getName() throw ( RuntimeException, std::exception ) { OUString sRet; if( m_pMenuIdentifier ) @@ -326,7 +326,7 @@ OUString RootActionTriggerContainer::getName() throw ( RuntimeException ) return sRet; } -void RootActionTriggerContainer::setName( const OUString& ) throw ( RuntimeException) +void RootActionTriggerContainer::setName( const OUString& ) throw ( RuntimeException, std::exception) { throw RuntimeException(); } |