diff options
Diffstat (limited to 'include/com/sun/star/uno/Reference.hxx')
-rw-r--r-- | include/com/sun/star/uno/Reference.hxx | 77 |
1 files changed, 37 insertions, 40 deletions
diff --git a/include/com/sun/star/uno/Reference.hxx b/include/com/sun/star/uno/Reference.hxx index c26550273abc..69ea87b40c03 100644 --- a/include/com/sun/star/uno/Reference.hxx +++ b/include/com/sun/star/uno/Reference.hxx @@ -36,7 +36,6 @@ namespace uno inline XInterface * BaseReference::iquery( XInterface * pInterface, const Type & rType ) - SAL_THROW( (RuntimeException) ) { if (pInterface) { @@ -53,7 +52,7 @@ inline XInterface * BaseReference::iquery( template< class interface_type > inline XInterface * Reference< interface_type >::iquery( - XInterface * pInterface ) SAL_THROW( (RuntimeException) ) + XInterface * pInterface ) { return BaseReference::iquery(pInterface, interface_type::static_type()); } @@ -66,7 +65,6 @@ extern "C" rtl_uString * SAL_CALL cppu_unsatisfied_iset_msg( inline XInterface * BaseReference::iquery_throw( XInterface * pInterface, const Type & rType ) - SAL_THROW( (RuntimeException) ) { XInterface * pQueried = iquery( pInterface, rType ); if (pQueried) @@ -78,7 +76,7 @@ inline XInterface * BaseReference::iquery_throw( template< class interface_type > inline XInterface * Reference< interface_type >::iquery_throw( - XInterface * pInterface ) SAL_THROW( (RuntimeException) ) + XInterface * pInterface ) { return BaseReference::iquery_throw( pInterface, interface_type::static_type()); @@ -86,7 +84,7 @@ inline XInterface * Reference< interface_type >::iquery_throw( template< class interface_type > inline interface_type * Reference< interface_type >::iset_throw( - interface_type * pInterface ) SAL_THROW( (RuntimeException) ) + interface_type * pInterface ) { if (pInterface) { @@ -100,20 +98,20 @@ inline interface_type * Reference< interface_type >::iset_throw( template< class interface_type > -inline Reference< interface_type >::~Reference() SAL_THROW(()) +inline Reference< interface_type >::~Reference() { if (_pInterface) _pInterface->release(); } template< class interface_type > -inline Reference< interface_type >::Reference() SAL_THROW(()) +inline Reference< interface_type >::Reference() { _pInterface = 0; } template< class interface_type > -inline Reference< interface_type >::Reference( const Reference< interface_type > & rRef ) SAL_THROW(()) +inline Reference< interface_type >::Reference( const Reference< interface_type > & rRef ) { _pInterface = rRef._pInterface; if (_pInterface) @@ -124,7 +122,6 @@ template< class interface_type > template< class derived_type > inline Reference< interface_type >::Reference( const Reference< derived_type > & rRef, typename detail::UpCast< interface_type, derived_type >::t ) - SAL_THROW(()) { interface_type * p = rRef.get(); _pInterface = p; @@ -133,7 +130,7 @@ inline Reference< interface_type >::Reference( } template< class interface_type > -inline Reference< interface_type >::Reference( interface_type * pInterface ) SAL_THROW(()) +inline Reference< interface_type >::Reference( interface_type * pInterface ) { _pInterface = castToXInterface(pInterface); if (_pInterface) @@ -141,70 +138,70 @@ inline Reference< interface_type >::Reference( interface_type * pInterface ) SAL } template< class interface_type > -inline Reference< interface_type >::Reference( interface_type * pInterface, __sal_NoAcquire ) SAL_THROW(()) +inline Reference< interface_type >::Reference( interface_type * pInterface, __sal_NoAcquire ) { _pInterface = castToXInterface(pInterface); } template< class interface_type > -inline Reference< interface_type >::Reference( interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW(()) +inline Reference< interface_type >::Reference( interface_type * pInterface, UnoReference_NoAcquire ) { _pInterface = castToXInterface(pInterface); } template< class interface_type > -inline Reference< interface_type >::Reference( const BaseReference & rRef, UnoReference_Query ) SAL_THROW( (RuntimeException) ) +inline Reference< interface_type >::Reference( const BaseReference & rRef, UnoReference_Query ) { _pInterface = iquery( rRef.get() ); } template< class interface_type > -inline Reference< interface_type >::Reference( XInterface * pInterface, UnoReference_Query ) SAL_THROW( (RuntimeException) ) +inline Reference< interface_type >::Reference( XInterface * pInterface, UnoReference_Query ) { _pInterface = iquery( pInterface ); } template< class interface_type > -inline Reference< interface_type >::Reference( const Any & rAny, UnoReference_Query ) SAL_THROW( (RuntimeException) ) +inline Reference< interface_type >::Reference( const Any & rAny, UnoReference_Query ) { _pInterface = (typelib_TypeClass_INTERFACE == rAny.pType->eTypeClass ? iquery( static_cast< XInterface * >( rAny.pReserved ) ) : 0); } template< class interface_type > -inline Reference< interface_type >::Reference( const BaseReference & rRef, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) +inline Reference< interface_type >::Reference( const BaseReference & rRef, UnoReference_QueryThrow ) { _pInterface = iquery_throw( rRef.get() ); } template< class interface_type > -inline Reference< interface_type >::Reference( XInterface * pInterface, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) +inline Reference< interface_type >::Reference( XInterface * pInterface, UnoReference_QueryThrow ) { _pInterface = iquery_throw( pInterface ); } template< class interface_type > -inline Reference< interface_type >::Reference( const Any & rAny, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) +inline Reference< interface_type >::Reference( const Any & rAny, UnoReference_QueryThrow ) { _pInterface = iquery_throw( typelib_TypeClass_INTERFACE == rAny.pType->eTypeClass ? static_cast< XInterface * >( rAny.pReserved ) : 0 ); } template< class interface_type > -inline Reference< interface_type >::Reference( const Reference< interface_type > & rRef, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) ) +inline Reference< interface_type >::Reference( const Reference< interface_type > & rRef, UnoReference_SetThrow ) { _pInterface = castToXInterface( iset_throw( rRef.get() ) ); } template< class interface_type > -inline Reference< interface_type >::Reference( interface_type * pInterface, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) ) +inline Reference< interface_type >::Reference( interface_type * pInterface, UnoReference_SetThrow ) { _pInterface = castToXInterface( iset_throw( pInterface ) ); } template< class interface_type > -inline void Reference< interface_type >::clear() SAL_THROW(()) +inline void Reference< interface_type >::clear() { if (_pInterface) { @@ -216,7 +213,7 @@ inline void Reference< interface_type >::clear() SAL_THROW(()) template< class interface_type > inline bool Reference< interface_type >::set( - interface_type * pInterface ) SAL_THROW(()) + interface_type * pInterface ) { if (pInterface) castToXInterface(pInterface)->acquire(); @@ -229,7 +226,7 @@ inline bool Reference< interface_type >::set( template< class interface_type > inline bool Reference< interface_type >::set( - interface_type * pInterface, __sal_NoAcquire ) SAL_THROW(()) + interface_type * pInterface, __sal_NoAcquire ) { XInterface * const pOld = _pInterface; _pInterface = castToXInterface(pInterface); @@ -240,7 +237,7 @@ inline bool Reference< interface_type >::set( template< class interface_type > inline bool Reference< interface_type >::set( - interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW(()) + interface_type * pInterface, UnoReference_NoAcquire ) { return set( pInterface, SAL_NO_ACQUIRE ); } @@ -248,21 +245,21 @@ inline bool Reference< interface_type >::set( template< class interface_type > inline bool Reference< interface_type >::set( - const Reference< interface_type > & rRef ) SAL_THROW(()) + const Reference< interface_type > & rRef ) { return set( castFromXInterface( rRef._pInterface ) ); } template< class interface_type > inline bool Reference< interface_type >::set( - XInterface * pInterface, UnoReference_Query ) SAL_THROW( (RuntimeException) ) + XInterface * pInterface, UnoReference_Query ) { return set( castFromXInterface(iquery( pInterface )), SAL_NO_ACQUIRE ); } template< class interface_type > inline bool Reference< interface_type >::set( - const BaseReference & rRef, UnoReference_Query ) SAL_THROW( (RuntimeException) ) + const BaseReference & rRef, UnoReference_Query ) { return set( castFromXInterface(iquery( rRef.get() )), SAL_NO_ACQUIRE ); } @@ -283,14 +280,14 @@ inline bool Reference< interface_type >::set( template< class interface_type > inline void Reference< interface_type >::set( - XInterface * pInterface, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) + XInterface * pInterface, UnoReference_QueryThrow ) { set( castFromXInterface(iquery_throw( pInterface )), SAL_NO_ACQUIRE ); } template< class interface_type > inline void Reference< interface_type >::set( - const BaseReference & rRef, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) + const BaseReference & rRef, UnoReference_QueryThrow ) { set( castFromXInterface(iquery_throw( rRef.get() )), SAL_NO_ACQUIRE ); } @@ -309,14 +306,14 @@ inline void Reference< interface_type >::set( template< class interface_type > inline void Reference< interface_type >::set( - interface_type * pInterface, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) ) + interface_type * pInterface, UnoReference_SetThrow ) { set( iset_throw( pInterface ), SAL_NO_ACQUIRE ); } template< class interface_type > inline void Reference< interface_type >::set( - const Reference< interface_type > & rRef, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) ) + const Reference< interface_type > & rRef, UnoReference_SetThrow ) { set( rRef.get(), UNO_SET_THROW ); } @@ -324,7 +321,7 @@ inline void Reference< interface_type >::set( template< class interface_type > inline Reference< interface_type > & Reference< interface_type >::operator = ( - interface_type * pInterface ) SAL_THROW(()) + interface_type * pInterface ) { set( pInterface ); return *this; @@ -332,7 +329,7 @@ inline Reference< interface_type > & Reference< interface_type >::operator = ( template< class interface_type > inline Reference< interface_type > & Reference< interface_type >::operator = ( - const Reference< interface_type > & rRef ) SAL_THROW(()) + const Reference< interface_type > & rRef ) { set( castFromXInterface( rRef._pInterface ) ); return *this; @@ -341,7 +338,7 @@ inline Reference< interface_type > & Reference< interface_type >::operator = ( template< class interface_type > inline Reference< interface_type > Reference< interface_type >::query( - const BaseReference & rRef ) SAL_THROW( (RuntimeException) ) + const BaseReference & rRef ) { return Reference< interface_type >( castFromXInterface(iquery( rRef.get() )), SAL_NO_ACQUIRE ); @@ -349,7 +346,7 @@ inline Reference< interface_type > Reference< interface_type >::query( template< class interface_type > inline Reference< interface_type > Reference< interface_type >::query( - XInterface * pInterface ) SAL_THROW( (RuntimeException) ) + XInterface * pInterface ) { return Reference< interface_type >( castFromXInterface(iquery( pInterface )), SAL_NO_ACQUIRE ); @@ -358,7 +355,7 @@ inline Reference< interface_type > Reference< interface_type >::query( -inline bool BaseReference::operator == ( XInterface * pInterface ) const SAL_THROW(()) +inline bool BaseReference::operator == ( XInterface * pInterface ) const { if (_pInterface == pInterface) return true; @@ -377,7 +374,7 @@ inline bool BaseReference::operator == ( XInterface * pInterface ) const SAL_THR inline bool BaseReference::operator < ( - const BaseReference & rRef ) const SAL_THROW(()) + const BaseReference & rRef ) const { if (_pInterface == rRef._pInterface) return false; @@ -395,17 +392,17 @@ inline bool BaseReference::operator < ( } -inline bool BaseReference::operator != ( XInterface * pInterface ) const SAL_THROW(()) +inline bool BaseReference::operator != ( XInterface * pInterface ) const { return (! operator == ( pInterface )); } -inline bool BaseReference::operator == ( const BaseReference & rRef ) const SAL_THROW(()) +inline bool BaseReference::operator == ( const BaseReference & rRef ) const { return operator == ( rRef._pInterface ); } -inline bool BaseReference::operator != ( const BaseReference & rRef ) const SAL_THROW(()) +inline bool BaseReference::operator != ( const BaseReference & rRef ) const { return (! operator == ( rRef._pInterface )); } |