diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-01-30 06:56:56 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-01-30 06:56:56 +0000 |
| commit | 4da3fa34e89633c34135453e8639eb5fe4de9db5 (patch) | |
| tree | 99939408e1f3d912bfca2d2ce0bc0136396cf186 | |
| parent | 28e25997dad63ce0806e7a63e5343199b08f5077 (diff) | |
INTEGRATION: CWS dba24d (1.26.78); FILE MERGED
2007/11/21 12:42:26 oj 1.26.78.1: #i68854# impl TypeSettingInfo for Oracle and some clean up
| -rw-r--r-- | connectivity/source/drivers/mozab/MConnection.cxx | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx index 30dafd6c81..44b8818c34 100644 --- a/connectivity/source/drivers/mozab/MConnection.cxx +++ b/connectivity/source/drivers/mozab/MConnection.cxx @@ -4,9 +4,9 @@ * * $RCSfile: MConnection.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: vg $ $Date: 2007-03-26 13:59:24 $ + * last change: $Author: rt $ $Date: 2008-01-30 07:56:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -145,7 +145,6 @@ const sal_Char* getSchemeURI( MozillaScheme _eScheme ) OConnection::OConnection(MozabDriver* _pDriver) :OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this) - ,m_xMetaData(NULL) ,m_pDriver(_pDriver) ,m_pImplData( new ConnectionImplData ) ,m_aColumnAlias( _pDriver->getMSFactory() ) @@ -552,23 +551,13 @@ void OConnection::disposing() m_pImplData->pResourceBundle.reset(); - 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(); - - m_xMetaData = ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData>(); - + OConnection_BASE::disposing(); if ( m_aNameMapper ) { MQuery::FreeNameMapper( m_aNameMapper ); m_aNameMapper = NULL; } dispose_ChildImpl(); - OConnection_BASE::disposing(); } // ----------------------------------------------------------------------------- |