User: rt Date: 2008-01-30 07:51:11+0000 Modified: dba/connectivity/source/drivers/evoab2/NConnection.cxx
Log: INTEGRATION: CWS dba24d (1.8.118); FILE MERGED 2007/11/21 12:43:22 oj 1.8.118.1: #i68854# impl TypeSettingInfo for Oracle and some clean up File Changes: Directory: /dba/connectivity/source/drivers/evoab2/ =================================================== File [changed]: NConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/evoab2/NConnection.cxx?r1=1.8&r2=1.9 Delta lines: +2 -19 -------------------- --- NConnection.cxx 2006-12-13 16:16:50+0000 1.8 +++ NConnection.cxx 2008-01-30 07:51:09+0000 1.9 @@ -122,7 +122,6 @@ :OSubComponent<OEvoabConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this) ,m_pDriver(_pDriver) ,m_xCatalog(NULL) - ,m_xMetaData(NULL) ,m_aPassword() { } @@ -277,24 +276,8 @@ { // we noticed that we should be destroyed in near future so we have to dispose our statements ::osl::MutexGuard aGuard(m_aMutex); - for (OWeakRefArray::iterator i = m_aStatements.begin(); m_aStatements.end() != i; ++i) - { - Reference< XComponent > xComp(i->get(), UNO_QUERY); - if (xComp.is()) { - try { - xComp->dispose(); - } - catch (com::sun::star::lang::DisposedException e) { - xComp=NULL; - } - } - } - m_aStatements.clear(); - - m_xMetaData = ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData>(); - - dispose_ChildImpl(); OConnection_BASE::disposing(); + dispose_ChildImpl(); } // -------------------------------- stubbed methods ------------------------------------------------ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
