User: hr Date: 2007-11-02 11:28:19+0000 Modified: dba/dbaccess/source/core/dataaccess/connection.cxx
Log: INTEGRATION: CWS dba231a_SRC680 (1.51.144); FILE MERGED 2007/10/18 19:23:57 fs 1.51.144.1: workaround for #i81297# 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.51&r2=1.52 Delta lines: +22 -22 --------------------- --- connection.cxx 2006-10-05 12:58:37+0000 1.51 +++ connection.cxx 2007-11-02 11:28:17+0000 1.52 @@ -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 --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
