Tag: cws_src680_hsqlcsv User: fs Date: 2008-01-17 02:02:14+0000 Modified: dba/dbaccess/source/core/dataaccess/connection.cxx
Log: RESYNC: (1.51-1.53); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: connection.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/connection.cxx?r1=1.48.18.5&r2=1.48.18.6 Delta lines: +24 -24 --------------------- --- connection.cxx 2006-10-11 08:29:21+0000 1.48.18.5 +++ connection.cxx 2008-01-17 02:02:12+0000 1.48.18.6 @@ -179,7 +179,7 @@ sal_Bool OConnection::isClosed(void) throw( SQLException, RuntimeException ) { MutexGuard aGuard(m_aMutex); - return !m_xConnection.is(); + return !m_xMasterConnection.is(); } // XConnection @@ -190,7 +190,7 @@ checkDisposed(); Reference< XStatement > xStatement; - Reference< XStatement > xMasterStatement = m_xConnection->createStatement(); + Reference< XStatement > xMasterStatement = m_xMasterConnection->createStatement(); if ( xMasterStatement.is() ) { xStatement = new OStatement(this, xMasterStatement); @@ -206,7 +206,7 @@ // TODO convert the SQL to SQL the driver understands Reference< XPreparedStatement > xStatement; - Reference< XPreparedStatement > xMasterStatement = m_xConnection->prepareStatement(sql); + Reference< XPreparedStatement > xMasterStatement = m_xMasterConnection->prepareStatement(sql); if ( xMasterStatement.is() ) { xStatement = new OPreparedStatement(this, xMasterStatement); @@ -222,7 +222,7 @@ checkDisposed(); Reference< XPreparedStatement > xStatement; - Reference< XPreparedStatement > xMasterStatement = m_xConnection->prepareCall(sql); + Reference< XPreparedStatement > xMasterStatement = m_xMasterConnection->prepareCall(sql); if ( xMasterStatement.is() ) { xStatement = new OCallableStatement(this, xMasterStatement); @@ -236,7 +236,7 @@ { MutexGuard aGuard(m_aMutex); checkDisposed(); - return m_xConnection->nativeSQL(sql); + return m_xMasterConnection->nativeSQL(sql); } //------------------------------------------------------------------------------ @@ -244,7 +244,7 @@ { MutexGuard aGuard(m_aMutex); checkDisposed(); - m_xConnection->setAutoCommit(autoCommit); + m_xMasterConnection->setAutoCommit(autoCommit); } //------------------------------------------------------------------------------ @@ -252,7 +252,7 @@ { MutexGuard aGuard(m_aMutex); checkDisposed(); - return m_xConnection->getAutoCommit(); + return m_xMasterConnection->getAutoCommit(); } //------------------------------------------------------------------------------ @@ -260,7 +260,7 @@ { MutexGuard aGuard(m_aMutex); checkDisposed(); - m_xConnection->commit(); + m_xMasterConnection->commit(); } //------------------------------------------------------------------------------ @@ -268,7 +268,7 @@ { MutexGuard aGuard(m_aMutex); checkDisposed(); - m_xConnection->rollback(); + m_xMasterConnection->rollback(); } //------------------------------------------------------------------------------ @@ -276,7 +276,7 @@ { MutexGuard aGuard(m_aMutex); checkDisposed(); - return m_xConnection->getMetaData(); + return m_xMasterConnection->getMetaData(); } //------------------------------------------------------------------------------ @@ -284,7 +284,7 @@ { MutexGuard aGuard(m_aMutex); checkDisposed(); - m_xConnection->setReadOnly(readOnly); + m_xMasterConnection->setReadOnly(readOnly); } //------------------------------------------------------------------------------ @@ -292,7 +292,7 @@ { MutexGuard aGuard(m_aMutex); checkDisposed(); - return m_xConnection->isReadOnly(); + return m_xMasterConnection->isReadOnly(); } //------------------------------------------------------------------------------ @@ -300,7 +300,7 @@ { MutexGuard aGuard(m_aMutex); checkDisposed(); - m_xConnection->setCatalog(catalog); + m_xMasterConnection->setCatalog(catalog); } //------------------------------------------------------------------------------ @@ -308,7 +308,7 @@ { MutexGuard aGuard(m_aMutex); checkDisposed(); - return m_xConnection->getCatalog(); + return m_xMasterConnection->getCatalog(); } //------------------------------------------------------------------------------ @@ -316,7 +316,7 @@ { MutexGuard aGuard(m_aMutex); checkDisposed(); - m_xConnection->setTransactionIsolation(level); + m_xMasterConnection->setTransactionIsolation(level); } //------------------------------------------------------------------------------ @@ -324,7 +324,7 @@ { MutexGuard aGuard(m_aMutex); checkDisposed(); - return m_xConnection->getTransactionIsolation(); + return m_xMasterConnection->getTransactionIsolation(); } //------------------------------------------------------------------------------ @@ -332,7 +332,7 @@ { MutexGuard aGuard(m_aMutex); checkDisposed(); - return m_xConnection->getTypeMap(); + return m_xMasterConnection->getTypeMap(); } //------------------------------------------------------------------------------ @@ -340,7 +340,7 @@ { MutexGuard aGuard(m_aMutex); checkDisposed(); - m_xConnection->setTypeMap(typeMap); + m_xMasterConnection->setTypeMap(typeMap); } //========================================================================== //= OConnection @@ -641,7 +641,7 @@ { if (!m_pViews->isInitialized()) { - // check if out "master connection" can supply tables + // check if our "master connection" can supply tables Reference< XViewsSupplier > xMaster(getMasterTables(),UNO_QUERY); if (xMaster.is() && xMaster->getViews().is()) @@ -724,7 +724,7 @@ || ( _sServiceSpecifier.equalsAscii( "com.sun.star.sdb.SingleSelectQueryAnalyzer" ) ) ) { - xRet = new OSingleSelectQueryComposer( getTables(),this, m_aContext.getLegacyServiceFactory() ); + xRet = new OSingleSelectQueryComposer( getTables(),this, m_aContext ); m_aComposers.push_back(WeakReferenceHelper(xRet)); } return Reference< XInterface >(xRet,UNO_QUERY); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
