Tag: cws_src680_dba201d User: fs Date: 05/10/06 23:24:08 Modified: /dba/dbaccess/source/core/dataaccess/ intercept.cxx
Log: remove the unused implementation of XComponent / supersede DisconnectContentHolder by calling dispose -> no leaking instances anymore File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: intercept.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/intercept.cxx?r1=1.5.2.1&r2=1.5.2.2 Delta lines: +10 -42 --------------------- --- intercept.cxx 6 Oct 2005 14:09:26 -0000 1.5.2.1 +++ intercept.cxx 7 Oct 2005 06:24:04 -0000 1.5.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: intercept.cxx,v $ * - * $Revision: 1.5.2.1 $ + * $Revision: 1.5.2.2 $ * - * last change: $Author: fs $ $Date: 2005/10/06 14:09:26 $ + * last change: $Author: fs $ $Date: 2005/10/07 06:24:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -80,55 +80,23 @@ #define DISPATCH_RELOAD 5 // the OSL_ENSURE in CTOR has to be changed too, when adding new defines -void OInterceptor::DisconnectContentHolder() -{ - osl::MutexGuard aGuard( m_aMutex ); - m_pContentHolder = NULL; -} - -void SAL_CALL -OInterceptor::addEventListener( - const Reference< com::sun::star::lang::XEventListener >& Listener ) - throw( RuntimeException ) -{ - osl::MutexGuard aGuard( m_aMutex ); - - if ( ! m_pDisposeEventListeners ) - m_pDisposeEventListeners = - new cppu::OInterfaceContainerHelper( m_aMutex ); - - m_pDisposeEventListeners->addInterface( Listener ); -} - - -void SAL_CALL -OInterceptor::removeEventListener( - const Reference< com::sun::star::lang::XEventListener >& Listener ) - throw( RuntimeException ) -{ - osl::MutexGuard aGuard( m_aMutex ); - - if ( m_pDisposeEventListeners ) - m_pDisposeEventListeners->removeInterface( Listener ); -} - - void SAL_CALL OInterceptor::dispose() throw( RuntimeException ) { - EventObject aEvt; - aEvt.Source = static_cast< XDispatch* >( this ); + EventObject aEvt( *this ); osl::MutexGuard aGuard(m_aMutex); if ( m_pDisposeEventListeners && m_pDisposeEventListeners->getLength() ) m_pDisposeEventListeners->disposeAndClear( aEvt ); - if(m_pStatCL) + if ( m_pStatCL ) m_pStatCL->disposeAndClear( aEvt ); - m_xSlaveDispatchProvider = 0; - m_xMasterDispatchProvider = 0; + m_xSlaveDispatchProvider.clear(); + m_xMasterDispatchProvider.clear(); + + m_pContentHolder = NULL; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
