diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-21 15:42:39 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-21 15:42:39 +0000 |
| commit | 4d3134798d1685c5f5e75507facf59a0f935cfa9 (patch) | |
| tree | 395f3b0b243c236f0ca4a3eaed80d864b5123ed7 /unotools | |
| parent | 7556e243fa92f1c98f6b22aa74e6f808bbcadf30 (diff) | |
INTEGRATION: CWS dba24c (1.4.60); FILE MERGED
2007/10/30 06:07:03 fs 1.4.60.2: #i10000#
2007/10/29 11:31:54 fs 1.4.60.1: allow .set( ..., UNO_SET_THROW )
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/inc/unotools/sharedunocomponent.hxx | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/unotools/inc/unotools/sharedunocomponent.hxx b/unotools/inc/unotools/sharedunocomponent.hxx index fef974db1596..fd60f6f0c76a 100644 --- a/unotools/inc/unotools/sharedunocomponent.hxx +++ b/unotools/inc/unotools/sharedunocomponent.hxx @@ -4,9 +4,9 @@ * * $RCSfile: sharedunocomponent.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2006-07-10 15:57:02 $ + * last change: $Author: ihi $ $Date: 2007-11-21 16:42:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -212,6 +212,9 @@ namespace utl inline void set( const ::com::sun::star::uno::XInterface* _pInterface, ::com::sun::star::uno::UnoReference_QueryThrow _queryThrow ); inline void set( const ::com::sun::star::uno::BaseReference & _rRef, ::com::sun::star::uno::UnoReference_QueryThrow _queryThrow ); inline void set( const ::com::sun::star::uno::Any& _rAny, ::com::sun::star::uno::UnoReference_QueryThrow _queryThrow ); + + inline void set( const INTERFACE* _pInterface, ::com::sun::star::uno::UnoReference_SetThrow _setThrow ); + inline void set( const ::com::sun::star::uno::Reference< INTERFACE >& _rRef, ::com::sun::star::uno::UnoReference_SetThrow _setThrow ); #endif INTERFACE* SAL_CALL operator->() const; @@ -304,6 +307,20 @@ namespace utl { reset( ::com::sun::star::uno::Reference< INTERFACE >( _rAny, _queryThrow ), TakeOwnership ); } + + //------------------------------------------------------------------------- + template < class INTERFACE, class COMPONENT > + void SharedUNOComponent< INTERFACE, COMPONENT >::set( const INTERFACE* _pInterface, ::com::sun::star::uno::UnoReference_SetThrow _setThrow ) + { + reset( ::com::sun::star::uno::Reference< INTERFACE >( _pInterface, _setThrow ), TakeOwnership ); + } + + //------------------------------------------------------------------------- + template < class INTERFACE, class COMPONENT > + void SharedUNOComponent< INTERFACE, COMPONENT >::set( const ::com::sun::star::uno::Reference< INTERFACE >& _rRef, ::com::sun::star::uno::UnoReference_SetThrow _setThrow ) + { + reset( ::com::sun::star::uno::Reference< INTERFACE >( _rRef, _setThrow ), TakeOwnership ); + } #endif //------------------------------------------------------------------------- |