User: rt Date: 2008-01-30 07:51:59+0000 Modified: dba/connectivity/source/drivers/file/FConnection.cxx
Log: INTEGRATION: CWS dba24d (1.48.58); FILE MERGED 2007/11/21 12:40:09 oj 1.48.58.1: #i68854# impl TypeSettingInfo for Oracle and some clean up File Changes: Directory: /dba/connectivity/source/drivers/file/ ================================================= File [changed]: FConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/FConnection.cxx?r1=1.48&r2=1.49 Delta lines: +1 -14 -------------------- --- FConnection.cxx 2007-06-05 14:22:23+0000 1.48 +++ FConnection.cxx 2008-01-30 07:51:57+0000 1.49 @@ -113,7 +113,6 @@ // -------------------------------------------------------------------------------- OConnection::OConnection(OFileDriver* _pDriver) : OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this) - ,m_xMetaData(NULL) ,m_pDriver(_pDriver) ,m_bClosed(sal_False) ,m_bShowDeleted(sal_False) @@ -423,26 +422,14 @@ void OConnection::disposing() { ::osl::MutexGuard aGuard(m_aMutex); - - - // m_aTables.disposing(); - for (OWeakRefArray::iterator i = m_aStatements.begin(); m_aStatements.end() != i; ++i) - { - Reference< XComponent > xComp(i->get(), UNO_QUERY); - if (xComp.is()) - xComp->dispose(); - } - m_aStatements.clear(); + OConnection_BASE::disposing(); m_bClosed = sal_True; - m_xMetaData = WeakReference< XDatabaseMetaData>(); m_xDir = NULL; m_xContent = NULL; - // ::comphelper::disposeComponent(m_xCatalog); m_xCatalog = WeakReference< XTablesSupplier>(); dispose_ChildImpl(); - OConnection_BASE::disposing(); } //------------------------------------------------------------------------------ Reference< XTablesSupplier > OConnection::createCatalog() --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
