User: rt Date: 05/10/24 01:28:15 Modified: /dba/dbaccess/source/core/dataaccess/ ModelImpl.cxx
Log: INTEGRATION: CWS dba201d (1.7.10); FILE MERGED 2005/10/07 06:08:09 fs 1.7.10.1: also dispose m_pStorageAccess when the model is disposed (was a resource leak) File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: ModelImpl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.cxx?r1=1.8&r2=1.9 Delta lines: +18 -1 -------------------- --- ModelImpl.cxx 19 Oct 2005 12:13:31 -0000 1.8 +++ ModelImpl.cxx 24 Oct 2005 08:28:12 -0000 1.9 @@ -343,6 +343,16 @@ ODatabaseModelImpl* pImpl = m_pModelImplementation; if ( pImpl ) pImpl->disposing( Source ); + + for ( NamedStorages::iterator find = m_aExposedStorages.begin(); + find != m_aExposedStorages.end(); + ++find + ) + if ( find->second == Source.Source ) + { + m_aExposedStorages.erase( find ); + break; + } } //============================================================ @@ -531,6 +541,13 @@ { } m_xStorage = NULL; + + if ( m_pStorageAccess ) + { + m_pStorageAccess->dispose(); + m_pStorageAccess->release(); + m_pStorageAccess = NULL; + } } // ----------------------------------------------------------------------------- const Reference< XNumberFormatsSupplier > & ODatabaseModelImpl::getNumberFormatsSupplier() --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
