diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-01-30 06:51:57 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-01-30 06:51:57 +0000 |
| commit | 57ed4e404644d21e40b028221b2cf7a5ea64ff41 (patch) | |
| tree | 65e7b15c57addab9c3eb807602bf7782b7d4db28 /connectivity/source/drivers/file/FConnection.cxx | |
| parent | 420f8851ec213f28e08e9eed4f8f56d36c9cbf95 (diff) | |
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
Diffstat (limited to 'connectivity/source/drivers/file/FConnection.cxx')
| -rw-r--r-- | connectivity/source/drivers/file/FConnection.cxx | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx index 54041b6989bf..0124ab87ab44 100644 --- a/connectivity/source/drivers/file/FConnection.cxx +++ b/connectivity/source/drivers/file/FConnection.cxx @@ -4,9 +4,9 @@ * * $RCSfile: FConnection.cxx,v $ * - * $Revision: 1.48 $ + * $Revision: 1.49 $ * - * last change: $Author: ihi $ $Date: 2007-06-05 14:22:23 $ + * last change: $Author: rt $ $Date: 2008-01-30 07:51:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -113,7 +113,6 @@ typedef connectivity::OMetaConnection OConnection_BASE; // -------------------------------------------------------------------------------- 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 SAL_CALL OConnection::clearWarnings( ) throw(SQLException, RuntimeExceptio 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() |