diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-21 15:38:47 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-21 15:38:47 +0000 |
| commit | bb7d7cbe3a85bdb60fc41c7c3719917099952cfb (patch) | |
| tree | c62b6da9ebb3d52ea6eff27ed1982edb9b1eb69c /connectivity/source/cpool/ZConnectionWrapper.cxx | |
| parent | 05509186f320bf6e05a2690dec7538f8bdfe9a68 (diff) | |
INTEGRATION: CWS dba22 (1.6.44); FILE MERGED
2004/12/16 09:03:38 oj 1.6.44.1: #i39123# some clean ups
Diffstat (limited to 'connectivity/source/cpool/ZConnectionWrapper.cxx')
| -rw-r--r-- | connectivity/source/cpool/ZConnectionWrapper.cxx | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/connectivity/source/cpool/ZConnectionWrapper.cxx b/connectivity/source/cpool/ZConnectionWrapper.cxx index 667a9e4a7e20..0222cb78c28c 100644 --- a/connectivity/source/cpool/ZConnectionWrapper.cxx +++ b/connectivity/source/cpool/ZConnectionWrapper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ZConnectionWrapper.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2004-08-02 16:54:00 $ + * last change: $Author: kz $ $Date: 2005-01-21 16:38:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,6 +96,11 @@ OConnectionWeakWrapper::OConnectionWeakWrapper(Reference< XAggregation >& _xConn //----------------------------------------------------------------------------- OConnectionWeakWrapper::~OConnectionWeakWrapper() { + if ( !OConnectionWeakWrapper_BASE::rBHelper.bDisposed ) + { + osl_incrementInterlockedCount( &m_refCount ); + dispose(); + } } // XServiceInfo // -------------------------------------------------------------------------------- @@ -281,7 +286,18 @@ void OConnectionWeakWrapper::disposing() } // ----------------------------------------------------------------------------- // com::sun::star::lang::XUnoTunnel +#ifdef N_DEBUG IMPLEMENT_FORWARD_XINTERFACE2(OConnectionWeakWrapper,OConnectionWeakWrapper_BASE,OConnectionWrapper) +#else +IMPLEMENT_FORWARD_REFCOUNT( OConnectionWeakWrapper, OConnectionWeakWrapper_BASE ) \ +::com::sun::star::uno::Any SAL_CALL OConnectionWeakWrapper::queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException) \ +{ \ + ::com::sun::star::uno::Any aReturn = OConnectionWeakWrapper_BASE::queryInterface( _rType ); \ + if ( !aReturn.hasValue() ) \ + aReturn = OConnectionWrapper::queryInterface( _rType ); \ + return aReturn; \ +} +#endif IMPLEMENT_FORWARD_XTYPEPROVIDER2(OConnectionWeakWrapper,OConnectionWeakWrapper_BASE,OConnectionWrapper) |