diff options
Diffstat (limited to 'cppuhelper/source/weak.cxx')
| -rw-r--r-- | cppuhelper/source/weak.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
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<XInterface > & rDelegator ) throw(::com::sun::star::uno::RuntimeException) +void OWeakAggObject::setDelegator( const Reference<XInterface > & 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; { |