diff options
Diffstat (limited to 'comphelper/source/property')
| -rw-r--r-- | comphelper/source/property/ChainablePropertySet.cxx | 32 | ||||
| -rw-r--r-- | comphelper/source/property/ChainablePropertySetInfo.cxx | 6 | ||||
| -rw-r--r-- | comphelper/source/property/MasterPropertySet.cxx | 32 | ||||
| -rw-r--r-- | comphelper/source/property/MasterPropertySetInfo.cxx | 6 | ||||
| -rw-r--r-- | comphelper/source/property/genericpropertyset.cxx | 36 | ||||
| -rw-r--r-- | comphelper/source/property/opropertybag.cxx | 40 | ||||
| -rw-r--r-- | comphelper/source/property/opropertybag.hxx | 52 | ||||
| -rw-r--r-- | comphelper/source/property/propagg.cxx | 28 | ||||
| -rw-r--r-- | comphelper/source/property/propertycontainer.cxx | 4 | ||||
| -rw-r--r-- | comphelper/source/property/propertysethelper.cxx | 32 | ||||
| -rw-r--r-- | comphelper/source/property/propertysetinfo.cxx | 6 | ||||
| -rw-r--r-- | comphelper/source/property/propertystatecontainer.cxx | 10 | ||||
| -rw-r--r-- | comphelper/source/property/propmultiplex.cxx | 4 | ||||
| -rw-r--r-- | comphelper/source/property/propstate.cxx | 18 |
14 files changed, 153 insertions, 153 deletions
diff --git a/comphelper/source/property/ChainablePropertySet.cxx b/comphelper/source/property/ChainablePropertySet.cxx index c4cc545d63a6..3448ae4943a4 100644 --- a/comphelper/source/property/ChainablePropertySet.cxx +++ b/comphelper/source/property/ChainablePropertySet.cxx @@ -46,13 +46,13 @@ ChainablePropertySet::~ChainablePropertySet() // XPropertySet Reference< XPropertySetInfo > SAL_CALL ChainablePropertySet::getPropertySetInfo( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return mxInfo; } void SAL_CALL ChainablePropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) - throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard; @@ -70,7 +70,7 @@ void SAL_CALL ChainablePropertySet::setPropertyValue( const OUString& rPropertyN } Any SAL_CALL ChainablePropertySet::getPropertyValue( const OUString& rPropertyName ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard; @@ -91,32 +91,32 @@ Any SAL_CALL ChainablePropertySet::getPropertyValue( const OUString& rPropertyNa } void SAL_CALL ChainablePropertySet::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } void SAL_CALL ChainablePropertySet::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } void SAL_CALL ChainablePropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } void SAL_CALL ChainablePropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } // XMultiPropertySet void SAL_CALL ChainablePropertySet::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) - throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) + throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard; @@ -150,7 +150,7 @@ void SAL_CALL ChainablePropertySet::setPropertyValues( const Sequence< OUString } Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues( const Sequence< OUString >& aPropertyNames ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard; @@ -184,26 +184,26 @@ Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues( const Sequence } void SAL_CALL ChainablePropertySet::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // todo } void SAL_CALL ChainablePropertySet::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // todo } void SAL_CALL ChainablePropertySet::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // todo } // XPropertyState PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const OUString& PropertyName ) - throw(UnknownPropertyException, RuntimeException) + throw(UnknownPropertyException, RuntimeException, std::exception) { PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find( PropertyName ); if( aIter == mpInfo->maMap.end()) @@ -219,7 +219,7 @@ PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const OUString& P } Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( const Sequence< OUString >& rPropertyNames ) - throw(UnknownPropertyException, RuntimeException) + throw(UnknownPropertyException, RuntimeException, std::exception) { const sal_Int32 nCount = rPropertyNames.getLength(); @@ -245,7 +245,7 @@ Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( cons } void SAL_CALL ChainablePropertySet::setPropertyToDefault( const OUString& rPropertyName ) - throw(UnknownPropertyException, RuntimeException) + throw(UnknownPropertyException, RuntimeException, std::exception) { PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName ); @@ -255,7 +255,7 @@ void SAL_CALL ChainablePropertySet::setPropertyToDefault( const OUString& rPrope } Any SAL_CALL ChainablePropertySet::getPropertyDefault( const OUString& rPropertyName ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName ); diff --git a/comphelper/source/property/ChainablePropertySetInfo.cxx b/comphelper/source/property/ChainablePropertySetInfo.cxx index c30df8aea05f..23a8ae272c71 100644 --- a/comphelper/source/property/ChainablePropertySetInfo.cxx +++ b/comphelper/source/property/ChainablePropertySetInfo.cxx @@ -55,7 +55,7 @@ void ChainablePropertySetInfo::remove( const OUString& aName ) } Sequence< ::Property > SAL_CALL ChainablePropertySetInfo::getProperties() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { sal_Int32 nSize = maMap.size(); if( maProperties.getLength() != nSize ) @@ -77,7 +77,7 @@ Sequence< ::Property > SAL_CALL ChainablePropertySetInfo::getProperties() } Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const OUString& rName ) - throw(::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) + throw(::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) { PropertyInfoHash::iterator aIter = maMap.find( rName ); @@ -94,7 +94,7 @@ Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const OUString& r } sal_Bool SAL_CALL ChainablePropertySetInfo::hasPropertyByName( const OUString& rName ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return maMap.find ( rName ) != maMap.end(); } diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx index 3e2f2ca7a11b..e6b0e6ed7179 100644 --- a/comphelper/source/property/MasterPropertySet.cxx +++ b/comphelper/source/property/MasterPropertySet.cxx @@ -89,7 +89,7 @@ MasterPropertySet::~MasterPropertySet() // XPropertySet Reference< XPropertySetInfo > SAL_CALL MasterPropertySet::getPropertySetInfo( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return mxInfo; } @@ -102,7 +102,7 @@ void MasterPropertySet::registerSlave ( ChainablePropertySet *pNewSet ) } void SAL_CALL MasterPropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) - throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard; @@ -136,7 +136,7 @@ void SAL_CALL MasterPropertySet::setPropertyValue( const OUString& rPropertyName } Any SAL_CALL MasterPropertySet::getPropertyValue( const OUString& rPropertyName ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard; @@ -172,32 +172,32 @@ Any SAL_CALL MasterPropertySet::getPropertyValue( const OUString& rPropertyName } void SAL_CALL MasterPropertySet::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } void SAL_CALL MasterPropertySet::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } void SAL_CALL MasterPropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } void SAL_CALL MasterPropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } // XMultiPropertySet void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) - throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) + throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard; @@ -263,7 +263,7 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< OUString >& } Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< OUString >& aPropertyNames ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard; @@ -329,26 +329,26 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< O } void SAL_CALL MasterPropertySet::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // todo } void SAL_CALL MasterPropertySet::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // todo } void SAL_CALL MasterPropertySet::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // todo } // XPropertyState PropertyState SAL_CALL MasterPropertySet::getPropertyState( const OUString& PropertyName ) - throw(UnknownPropertyException, RuntimeException) + throw(UnknownPropertyException, RuntimeException, std::exception) { PropertyDataHash::const_iterator aIter = mpInfo->maMap.find( PropertyName ); if( aIter == mpInfo->maMap.end()) @@ -380,7 +380,7 @@ PropertyState SAL_CALL MasterPropertySet::getPropertyState( const OUString& Prop } Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const Sequence< OUString >& rPropertyNames ) - throw(UnknownPropertyException, RuntimeException) + throw(UnknownPropertyException, RuntimeException, std::exception) { const sal_Int32 nCount = rPropertyNames.getLength(); @@ -427,7 +427,7 @@ Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const S } void SAL_CALL MasterPropertySet::setPropertyToDefault( const OUString& rPropertyName ) - throw(UnknownPropertyException, RuntimeException) + throw(UnknownPropertyException, RuntimeException, std::exception) { PropertyDataHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName ); @@ -437,7 +437,7 @@ void SAL_CALL MasterPropertySet::setPropertyToDefault( const OUString& rProperty } Any SAL_CALL MasterPropertySet::getPropertyDefault( const OUString& rPropertyName ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertyDataHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName ); diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx index 74baf2737726..afbd849eb08d 100644 --- a/comphelper/source/property/MasterPropertySetInfo.cxx +++ b/comphelper/source/property/MasterPropertySetInfo.cxx @@ -70,7 +70,7 @@ void MasterPropertySetInfo::add( PropertyInfoHash &rHash, sal_uInt8 nMapId ) } Sequence< ::Property > SAL_CALL MasterPropertySetInfo::getProperties() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { sal_Int32 nSize = maMap.size(); if( maProperties.getLength() != nSize ) @@ -92,7 +92,7 @@ Sequence< ::Property > SAL_CALL MasterPropertySetInfo::getProperties() } Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const OUString& rName ) - throw(::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) + throw(::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) { PropertyDataHash::iterator aIter = maMap.find( rName ); @@ -110,7 +110,7 @@ Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const OUString& rNam } sal_Bool SAL_CALL MasterPropertySetInfo::hasPropertyByName( const OUString& rName ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return maMap.find ( rName ) != maMap.end(); } diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx index e5d52a7546d0..aa2c6bf9b0b4 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.cxx @@ -72,23 +72,23 @@ namespace comphelper virtual ~GenericPropertySet() throw(); // XInterface - virtual Any SAL_CALL queryAggregation( const Type & rType ) throw( RuntimeException); - virtual Any SAL_CALL queryInterface( const Type & rType ) throw( RuntimeException); + virtual Any SAL_CALL queryAggregation( const Type & rType ) throw( RuntimeException, std::exception); + virtual Any SAL_CALL queryInterface( const Type & rType ) 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); - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw( RuntimeException); + virtual Sequence< Type > SAL_CALL getTypes( ) throw( RuntimeException, std::exception); + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw( RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException ); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception ); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException, std::exception ); // XPropertySet - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); }; } @@ -104,7 +104,7 @@ GenericPropertySet::GenericPropertySet( PropertySetInfo* pInfo ) throw() GenericPropertySet::~GenericPropertySet() throw() { } -void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { Reference < XPropertySetInfo > xInfo = getPropertySetInfo( ); if ( xInfo.is() ) @@ -126,7 +126,7 @@ void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& aPr } } -void SAL_CALL GenericPropertySet::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL GenericPropertySet::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { ResettableMutexGuard aGuard( maMutex ); Reference < XPropertySetInfo > xInfo = getPropertySetInfo( ); @@ -193,13 +193,13 @@ void GenericPropertySet::_getPropertyValues( const comphelper::PropertyMapEntry* // XInterface Any SAL_CALL GenericPropertySet::queryInterface( const Type & rType ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return OWeakAggObject::queryInterface( rType ); } Any SAL_CALL GenericPropertySet::queryAggregation( const Type & rType ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { Any aAny; @@ -228,7 +228,7 @@ void SAL_CALL GenericPropertySet::release() throw() } uno::Sequence< uno::Type > SAL_CALL GenericPropertySet::getTypes() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< uno::Type > aTypes( 5 ); uno::Type* pTypes = aTypes.getArray(); @@ -248,24 +248,24 @@ namespace } uno::Sequence< sal_Int8 > SAL_CALL GenericPropertySet::getImplementationId() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return theGenericPropertySetImplmentationId::get().getSeq(); } // XServiceInfo -sal_Bool SAL_CALL GenericPropertySet::supportsService( const OUString& ServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL GenericPropertySet::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } -OUString SAL_CALL GenericPropertySet::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL GenericPropertySet::getImplementationName() throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.comphelper.GenericPropertySet" ); } Sequence< OUString > SAL_CALL GenericPropertySet::getSupportedServiceNames( ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Sequence< OUString > aSNS( 1 ); aSNS.getArray()[0] = "com.sun.star.beans.XPropertySet"; diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx index 4fb1cc4c95ea..0136f2862b1a 100644 --- a/comphelper/source/property/opropertybag.cxx +++ b/comphelper/source/property/opropertybag.cxx @@ -87,7 +87,7 @@ namespace comphelper } - void SAL_CALL OPropertyBag::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException) + void SAL_CALL OPropertyBag::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception) { Sequence< Type > aTypes; bool AllowEmptyPropertyName(false); @@ -138,18 +138,18 @@ namespace comphelper } - OUString SAL_CALL OPropertyBag::getImplementationName() throw (RuntimeException) + OUString SAL_CALL OPropertyBag::getImplementationName() throw (RuntimeException, std::exception) { return getImplementationName_static(); } - ::sal_Bool SAL_CALL OPropertyBag::supportsService( const OUString& rServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL OPropertyBag::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } - Sequence< OUString > SAL_CALL OPropertyBag::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OPropertyBag::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return getSupportedServiceNames_static(); } @@ -191,40 +191,40 @@ namespace comphelper ::sal_Bool SAL_CALL OPropertyBag::isModified() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return m_isModified; } void SAL_CALL OPropertyBag::setModified( ::sal_Bool bModified ) - throw (PropertyVetoException, RuntimeException) + throw (PropertyVetoException, RuntimeException, std::exception) { setModifiedImpl(bModified, false); } void SAL_CALL OPropertyBag::addModifyListener( const Reference< XModifyListener > & xListener) - throw (RuntimeException) + throw (RuntimeException, std::exception) { m_NotifyListeners.addInterface(xListener); } void SAL_CALL OPropertyBag::removeModifyListener( const Reference< XModifyListener > & xListener) - throw (RuntimeException) + throw (RuntimeException, std::exception) { m_NotifyListeners.removeInterface(xListener); } - Reference< XPropertySetInfo > SAL_CALL OPropertyBag::getPropertySetInfo( ) throw(RuntimeException) + Reference< XPropertySetInfo > SAL_CALL OPropertyBag::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return createPropertySetInfo( getInfoHelper() ); } - ::sal_Bool SAL_CALL OPropertyBag::has( const Any& /*aElement*/ ) throw (RuntimeException) + ::sal_Bool SAL_CALL OPropertyBag::has( const Any& /*aElement*/ ) throw (RuntimeException, std::exception) { // XSet is only a workaround for addProperty not being able to add default-void properties. // So, everything of XSet except insert is implemented empty @@ -232,7 +232,7 @@ namespace comphelper } - void SAL_CALL OPropertyBag::insert( const Any& _element ) throw (IllegalArgumentException, ElementExistException, RuntimeException) + void SAL_CALL OPropertyBag::insert( const Any& _element ) throw (IllegalArgumentException, ElementExistException, RuntimeException, std::exception) { // This is a workaround for addProperty not being able to add default-void properties. // If we ever have a smarter XPropertyContainer::addProperty interface, we can remove this, ehm, well, hack. @@ -259,7 +259,7 @@ namespace comphelper } - void SAL_CALL OPropertyBag::remove( const Any& /*aElement*/ ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException) + void SAL_CALL OPropertyBag::remove( const Any& /*aElement*/ ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { // XSet is only a workaround for addProperty not being able to add default-void properties. // So, everything of XSet except insert is implemented empty @@ -268,7 +268,7 @@ namespace comphelper - Reference< XEnumeration > SAL_CALL OPropertyBag::createEnumeration( ) throw (RuntimeException) + Reference< XEnumeration > SAL_CALL OPropertyBag::createEnumeration( ) throw (RuntimeException, std::exception) { // XSet is only a workaround for addProperty not being able to add default-void properties. // So, everything of XSet except insert is implemented empty @@ -276,7 +276,7 @@ namespace comphelper } - Type SAL_CALL OPropertyBag::getElementType( ) throw (RuntimeException) + Type SAL_CALL OPropertyBag::getElementType( ) throw (RuntimeException, std::exception) { // XSet is only a workaround for addProperty not being able to add default-void properties. // So, everything of XSet except insert is implemented empty @@ -284,7 +284,7 @@ namespace comphelper } - ::sal_Bool SAL_CALL OPropertyBag::hasElements( ) throw (RuntimeException) + ::sal_Bool SAL_CALL OPropertyBag::hasElements( ) throw (RuntimeException, std::exception) { // XSet is only a workaround for addProperty not being able to add default-void properties. // So, everything of XSet except insert is implemented empty @@ -304,7 +304,7 @@ namespace comphelper } - void SAL_CALL OPropertyBag::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception) + void SAL_CALL OPropertyBag::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception) { m_aDynamicProperties.setFastPropertyValue( nHandle, rValue ); } @@ -345,7 +345,7 @@ namespace comphelper } - void SAL_CALL OPropertyBag::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException) + void SAL_CALL OPropertyBag::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) { ::osl::ClearableMutexGuard g( m_aMutex ); @@ -368,7 +368,7 @@ namespace comphelper } - void SAL_CALL OPropertyBag::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException) + void SAL_CALL OPropertyBag::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException, std::exception) { ::osl::ClearableMutexGuard g( m_aMutex ); @@ -411,7 +411,7 @@ namespace comphelper } - Sequence< PropertyValue > SAL_CALL OPropertyBag::getPropertyValues( ) throw (RuntimeException) + Sequence< PropertyValue > SAL_CALL OPropertyBag::getPropertyValues( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -544,7 +544,7 @@ namespace comphelper } - void SAL_CALL OPropertyBag::setPropertyValues( const Sequence< PropertyValue >& _rProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) + void SAL_CALL OPropertyBag::setPropertyValues( const Sequence< PropertyValue >& _rProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); impl_setPropertyValues_throw( _rProps ); diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx index d196e8536ae2..355eeea8a594 100644 --- a/comphelper/source/property/opropertybag.hxx +++ b/comphelper/source/property/opropertybag.hxx @@ -106,64 +106,64 @@ namespace comphelper /** === begin UNO interface implementations == **/ // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XModifiable: virtual ::sal_Bool SAL_CALL isModified( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setModified( ::sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // XModifyBroadcaster virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > & xListener) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > & xListener) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XPropertyContainer - virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeProperty( const OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeProperty( const OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException, std::exception); // XPropertyAccess - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) 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); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) 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); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const com::sun::star::uno::Any& p2) 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) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const com::sun::star::uno::Any& p2) 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) { OPropertyBag_PBase::setPropertyValue(p1, p2); } - virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(const rtl::OUString& p1) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(const rtl::OUString& p1) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { return OPropertyBag_PBase::getPropertyValue(p1); } - virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener>& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener>& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { OPropertyBag_PBase::addPropertyChangeListener(p1, p2); } - virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener>& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener>& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { OPropertyBag_PBase::removePropertyChangeListener(p1, p2); } - virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XVetoableChangeListener>& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XVetoableChangeListener>& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { OPropertyBag_PBase::addVetoableChangeListener(p1, p2); } - virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XVetoableChangeListener>& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XVetoableChangeListener>& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { OPropertyBag_PBase::removeVetoableChangeListener(p1, p2); } // XSet - virtual ::sal_Bool SAL_CALL has( const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insert( const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL remove( const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL has( const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL insert( const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL remove( const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception); // XEnumerationAccess (base of XSet) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess (basf of XEnumerationAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception); /** === UNO interface implementations == **/ // XPropertyState @@ -175,7 +175,7 @@ namespace comphelper // OPropertySetHelper virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any & rConvertedValue, ::com::sun::star::uno::Any & rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::lang::IllegalArgumentException); - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception); + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception); virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); // IEventNotificationHook diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx index c4a66b68d4cb..30fe378a5e59 100644 --- a/comphelper/source/property/propagg.cxx +++ b/comphelper/source/property/propagg.cxx @@ -454,7 +454,7 @@ OPropertySetAggregationHelper::~OPropertySetAggregationHelper() } - ::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::queryInterface(const ::com::sun::star::uno::Type& _rType) throw( ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::queryInterface(const ::com::sun::star::uno::Type& _rType) throw( ::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::uno::Any aReturn = OPropertyStateHelper::queryInterface(_rType); @@ -485,7 +485,7 @@ void OPropertySetAggregationHelper::disposing() } -void SAL_CALL OPropertySetAggregationHelper::disposing(const ::com::sun::star::lang::EventObject& _rSource) throw ( ::com::sun::star::uno::RuntimeException) +void SAL_CALL OPropertySetAggregationHelper::disposing(const ::com::sun::star::lang::EventObject& _rSource) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { OSL_ENSURE(m_xAggregateSet.is(), "OPropertySetAggregationHelper::disposing : don't have an aggregate anymore !"); if (_rSource.Source == m_xAggregateSet) @@ -493,7 +493,7 @@ void SAL_CALL OPropertySetAggregationHelper::disposing(const ::com::sun::star:: } -void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent>& _rEvents) throw( ::com::sun::star::uno::RuntimeException) +void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent>& _rEvents) throw( ::com::sun::star::uno::RuntimeException, std::exception) { OSL_ENSURE(m_xAggregateSet.is(), "OPropertySetAggregationHelper::propertiesChange : have no aggregate !"); @@ -545,7 +545,7 @@ void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const ::com::sun: } -void SAL_CALL OPropertySetAggregationHelper::vetoableChange(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL OPropertySetAggregationHelper::vetoableChange(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) { OSL_ENSURE(m_xAggregateSet.is(), "OPropertySetAggregationHelper::vetoableChange : have no aggregate !"); @@ -597,7 +597,7 @@ void OPropertySetAggregationHelper::startListening() void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& _rxListener) - 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) { OPropertySetHelper::addVetoableChangeListener(_rPropertyName, _rxListener); if (!m_bListening) @@ -607,7 +607,7 @@ void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const OUS void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& _rxListener) - 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) { OPropertySetHelper::addPropertyChangeListener(_rPropertyName, _rxListener); if (!m_bListening) @@ -617,7 +617,7 @@ void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const OUS void SAL_CALL OPropertySetAggregationHelper::addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< OUString >& _rPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener>& _rxListener) - throw( ::com::sun::star::uno::RuntimeException) + throw( ::com::sun::star::uno::RuntimeException, std::exception) { OPropertySetHelper::addPropertiesChangeListener(_rPropertyNames, _rxListener); if (!m_bListening) @@ -646,7 +646,7 @@ OUString OPropertySetAggregationHelper::getPropertyName( sal_Int32 _nHandle ) co void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue(sal_Int32 _nHandle, const ::com::sun::star::uno::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) + ::com::sun::star::uno::RuntimeException, std::exception) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); OUString aPropName; @@ -688,7 +688,7 @@ void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno: ::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::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) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); OUString aPropName; @@ -711,7 +711,7 @@ void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno: void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) - throw ( PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException ) + throw ( PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception ) { OSL_ENSURE( !rBHelper.bInDispose, "OPropertySetAggregationHelper::setPropertyValues : do not use within the dispose call !"); OSL_ENSURE( !rBHelper.bDisposed, "OPropertySetAggregationHelper::setPropertyValues : object is disposed" ); @@ -897,7 +897,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( // XPropertyState ::com::sun::star::beans::PropertyState SAL_CALL OPropertySetAggregationHelper::getPropertyState(const OUString& _rPropertyName) - throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) + throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); sal_Int32 nHandle = rPH.getHandleByName( _rPropertyName ); @@ -922,7 +922,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const OUString& _rPropertyName) - throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) + throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); sal_Int32 nHandle = rPH.getHandleByName(_rPropertyName); @@ -955,7 +955,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const OUString ::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::getPropertyDefault(const OUString& aPropertyName) - 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) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); sal_Int32 nHandle = rPH.getHandleByName( aPropertyName ); @@ -998,7 +998,7 @@ sal_Bool SAL_CALL OPropertySetAggregationHelper::convertFastPropertyValue( Any& } -void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception ) +void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception, std::exception ) { OSL_ENSURE( m_pForwarder->isResponsibleFor( _nHandle ), "OPropertySetAggregationHelper::setFastPropertyValue_NoBroadcast: this is no forwarded property - did you use declareForwardedProperty for it?" ); if ( m_pForwarder->isResponsibleFor( _nHandle ) ) diff --git a/comphelper/source/property/propertycontainer.cxx b/comphelper/source/property/propertycontainer.cxx index c8cc99004556..6fd333525411 100644 --- a/comphelper/source/property/propertycontainer.cxx +++ b/comphelper/source/property/propertycontainer.cxx @@ -52,7 +52,7 @@ OPropertyContainer::~OPropertyContainer() } -Sequence< Type > SAL_CALL OPropertyContainer::getTypes() throw (RuntimeException) +Sequence< Type > SAL_CALL OPropertyContainer::getTypes() throw (RuntimeException, std::exception) { // just the types from our one and only base class ::cppu::OTypeCollection aTypes( @@ -64,7 +64,7 @@ Sequence< Type > SAL_CALL OPropertyContainer::getTypes() throw (RuntimeException } -void SAL_CALL OPropertyContainer::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue ) throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) +void SAL_CALL OPropertyContainer::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue ) throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { OPropertySetHelper::setFastPropertyValue( nHandle, rValue ); } diff --git a/comphelper/source/property/propertysethelper.cxx b/comphelper/source/property/propertysethelper.cxx index beb0358e861a..32cbdac22e05 100644 --- a/comphelper/source/property/propertysethelper.cxx +++ b/comphelper/source/property/propertysethelper.cxx @@ -77,12 +77,12 @@ PropertySetHelper::~PropertySetHelper() throw() } // XPropertySet -Reference< XPropertySetInfo > SAL_CALL PropertySetHelper::getPropertySetInfo( ) throw(RuntimeException) +Reference< XPropertySetInfo > SAL_CALL PropertySetHelper::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return mp->mpInfo; } -void SAL_CALL PropertySetHelper::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) +void SAL_CALL PropertySetHelper::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { PropertyMapEntry const * aEntries[2]; aEntries[0] = mp->find( aPropertyName ); @@ -95,7 +95,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue( const OUString& aPropertyName _setPropertyValues( (const PropertyMapEntry**)aEntries, &aValue ); } -Any SAL_CALL PropertySetHelper::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +Any SAL_CALL PropertySetHelper::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertyMapEntry const * aEntries[2]; aEntries[0] = mp->find( PropertyName ); @@ -111,28 +111,28 @@ Any SAL_CALL PropertySetHelper::getPropertyValue( const OUString& PropertyName ) return aAny; } -void SAL_CALL PropertySetHelper::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL PropertySetHelper::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } -void SAL_CALL PropertySetHelper::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL PropertySetHelper::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } -void SAL_CALL PropertySetHelper::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL PropertySetHelper::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } -void SAL_CALL PropertySetHelper::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL PropertySetHelper::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } // XMultiPropertySet -void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) +void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { const sal_Int32 nCount = aPropertyNames.getLength(); @@ -163,7 +163,7 @@ void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< OUString >& } } -Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw(RuntimeException) +Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw(RuntimeException, std::exception) { const sal_Int32 nCount = aPropertyNames.getLength(); @@ -197,23 +197,23 @@ Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues( const Sequence< O return aValues; } -void SAL_CALL PropertySetHelper::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) +void SAL_CALL PropertySetHelper::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException, std::exception) { // todo } -void SAL_CALL PropertySetHelper::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) +void SAL_CALL PropertySetHelper::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) throw(RuntimeException, std::exception) { // todo } -void SAL_CALL PropertySetHelper::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) +void SAL_CALL PropertySetHelper::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException, std::exception) { // todo } // XPropertyState -PropertyState SAL_CALL PropertySetHelper::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) +PropertyState SAL_CALL PropertySetHelper::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) { PropertyMapEntry const * aEntries[2]; @@ -229,7 +229,7 @@ PropertyState SAL_CALL PropertySetHelper::getPropertyState( const OUString& Prop return aState; } -Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException) +Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) { const sal_Int32 nCount = aPropertyName.getLength(); @@ -264,7 +264,7 @@ Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const S return aStates; } -void SAL_CALL PropertySetHelper::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) +void SAL_CALL PropertySetHelper::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) { PropertyMapEntry const *pEntry = mp->find( PropertyName ); if( NULL == pEntry ) @@ -273,7 +273,7 @@ void SAL_CALL PropertySetHelper::setPropertyToDefault( const OUString& PropertyN _setPropertyToDefault( pEntry ); } -Any SAL_CALL PropertySetHelper::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +Any SAL_CALL PropertySetHelper::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertyMapEntry const * pEntry = mp->find( aPropertyName ); if( NULL == pEntry ) diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx index 4e6a0e977892..779f1df5e0b0 100644 --- a/comphelper/source/property/propertysetinfo.cxx +++ b/comphelper/source/property/propertysetinfo.cxx @@ -171,17 +171,17 @@ void PropertySetInfo::remove( const OUString& aName ) throw() mpMap->remove( aName ); } -Sequence< ::com::sun::star::beans::Property > SAL_CALL PropertySetInfo::getProperties() throw(::com::sun::star::uno::RuntimeException) +Sequence< ::com::sun::star::beans::Property > SAL_CALL PropertySetInfo::getProperties() throw(::com::sun::star::uno::RuntimeException, std::exception) { return mpMap->getProperties(); } -Property SAL_CALL PropertySetInfo::getPropertyByName( const OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) +Property SAL_CALL PropertySetInfo::getPropertyByName( const OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) { return mpMap->getPropertyByName( aName ); } -sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const OUString& Name ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const OUString& Name ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return mpMap->hasPropertyByName( Name ); } diff --git a/comphelper/source/property/propertystatecontainer.cxx b/comphelper/source/property/propertystatecontainer.cxx index ab7774887d00..7c9e7dfece70 100644 --- a/comphelper/source/property/propertystatecontainer.cxx +++ b/comphelper/source/property/propertystatecontainer.cxx @@ -55,7 +55,7 @@ namespace comphelper } - Any SAL_CALL OPropertyStateContainer::queryInterface( const Type& _rType ) throw (RuntimeException) + Any SAL_CALL OPropertyStateContainer::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) { Any aReturn = OPropertyContainer::queryInterface( _rType ); if ( !aReturn.hasValue() ) @@ -80,13 +80,13 @@ namespace comphelper } - PropertyState SAL_CALL OPropertyStateContainer::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + PropertyState SAL_CALL OPropertyStateContainer::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) { return getPropertyStateByHandle( getHandleForName( _rPropertyName ) ); } - Sequence< PropertyState > SAL_CALL OPropertyStateContainer::getPropertyStates( const Sequence< OUString >& _rPropertyNames ) throw (UnknownPropertyException, RuntimeException) + Sequence< PropertyState > SAL_CALL OPropertyStateContainer::getPropertyStates( const Sequence< OUString >& _rPropertyNames ) throw (UnknownPropertyException, RuntimeException, std::exception) { sal_Int32 nProperties = _rPropertyNames.getLength(); Sequence< PropertyState> aStates( nProperties ); @@ -139,13 +139,13 @@ namespace comphelper } - void SAL_CALL OPropertyStateContainer::setPropertyToDefault( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL OPropertyStateContainer::setPropertyToDefault( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) { setPropertyToDefaultByHandle( getHandleForName( _rPropertyName ) ); } - Any SAL_CALL OPropertyStateContainer::getPropertyDefault( const OUString& _rPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + Any SAL_CALL OPropertyStateContainer::getPropertyDefault( const OUString& _rPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { Any aDefault; getPropertyDefaultByHandle( getHandleForName( _rPropertyName ), aDefault ); diff --git a/comphelper/source/property/propmultiplex.cxx b/comphelper/source/property/propmultiplex.cxx index dbeee362caa8..e4f067483d6a 100644 --- a/comphelper/source/property/propmultiplex.cxx +++ b/comphelper/source/property/propmultiplex.cxx @@ -128,7 +128,7 @@ void OPropertyChangeMultiplexer::dispose() // XEventListener -void SAL_CALL OPropertyChangeMultiplexer::disposing( const EventObject& _rSource) throw( RuntimeException) +void SAL_CALL OPropertyChangeMultiplexer::disposing( const EventObject& _rSource) throw( RuntimeException, std::exception) { if (m_pListener) { @@ -149,7 +149,7 @@ void SAL_CALL OPropertyChangeMultiplexer::disposing( const EventObject& _rSourc // XPropertyChangeListener -void SAL_CALL OPropertyChangeMultiplexer::propertyChange( const PropertyChangeEvent& _rEvent ) throw( RuntimeException) +void SAL_CALL OPropertyChangeMultiplexer::propertyChange( const PropertyChangeEvent& _rEvent ) throw( RuntimeException, std::exception) { if (m_pListener && !locked()) m_pListener->_propertyChanged(_rEvent); diff --git a/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx index bafdf1c5b37f..ad84d44e3687 100644 --- a/comphelper/source/property/propstate.cxx +++ b/comphelper/source/property/propstate.cxx @@ -44,7 +44,7 @@ namespace comphelper //===================================================================== - ::com::sun::star::uno::Any SAL_CALL OPropertyStateHelper::queryInterface(const ::com::sun::star::uno::Type& _rType) throw( ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Any SAL_CALL OPropertyStateHelper::queryInterface(const ::com::sun::star::uno::Type& _rType) throw( ::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::uno::Any aReturn = OPropertySetHelper2::queryInterface(_rType); // our own ifaces @@ -55,7 +55,7 @@ namespace comphelper } - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> OPropertyStateHelper::getTypes() throw( ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> OPropertyStateHelper::getTypes() throw( ::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> aTypes(4); ::com::sun::star::uno::Type* pTypes = aTypes.getArray(); @@ -83,7 +83,7 @@ namespace comphelper // XPropertyState - ::com::sun::star::beans::PropertyState SAL_CALL OPropertyStateHelper::getPropertyState(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::beans::PropertyState SAL_CALL OPropertyStateHelper::getPropertyState(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper& rPH = getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName(_rsName); @@ -95,7 +95,7 @@ namespace comphelper } - void SAL_CALL OPropertyStateHelper::setPropertyToDefault(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) + void SAL_CALL OPropertyStateHelper::setPropertyToDefault(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper& rPH = getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName(_rsName); @@ -107,7 +107,7 @@ namespace comphelper } - ::com::sun::star::uno::Any SAL_CALL OPropertyStateHelper::getPropertyDefault(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Any SAL_CALL OPropertyStateHelper::getPropertyDefault(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper& rPH = getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName(_rsName); @@ -119,7 +119,7 @@ namespace comphelper } - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState> SAL_CALL OPropertyStateHelper::getPropertyStates(const ::com::sun::star::uno::Sequence< OUString >& _rPropertyNames) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState> SAL_CALL OPropertyStateHelper::getPropertyStates(const ::com::sun::star::uno::Sequence< OUString >& _rPropertyNames) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int32 nLen = _rPropertyNames.getLength(); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState> aRet(nLen); @@ -191,7 +191,7 @@ namespace comphelper } - Sequence< Type > SAL_CALL OStatefulPropertySet::getTypes() throw(RuntimeException) + Sequence< Type > SAL_CALL OStatefulPropertySet::getTypes() throw(RuntimeException, std::exception) { Sequence< Type > aOwnTypes( 2 ); aOwnTypes[0] = cppu::UnoType<XWeak>::get(); @@ -206,14 +206,14 @@ namespace comphelper namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; } - Sequence< sal_Int8 > SAL_CALL OStatefulPropertySet::getImplementationId() throw(RuntimeException) + Sequence< sal_Int8 > SAL_CALL OStatefulPropertySet::getImplementationId() throw(RuntimeException, std::exception) { ::cppu::OImplementationId &rID = lcl_ImplId::get(); return rID.getImplementationId(); } - Any SAL_CALL OStatefulPropertySet::queryInterface( const Type& _rType ) throw(RuntimeException) + Any SAL_CALL OStatefulPropertySet::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception) { Any aReturn = OWeakObject::queryInterface( _rType ); if ( !aReturn.hasValue() ) |