User: ihi Date: 2007-11-27 12:03:07+0000 Modified: dba/connectivity/source/drivers/jdbc/ResultSet.cxx
Log: INTEGRATION: CWS dba24lms (1.31.66); FILE MERGED 2007/11/14 12:52:15 oj 1.31.66.1: #i11746# insert Ignore Currency File Changes: Directory: /dba/connectivity/source/drivers/jdbc/ ================================================= File [changed]: ResultSet.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/ResultSet.cxx?r1=1.31&r2=1.32 Delta lines: +3 -2 ------------------- --- ResultSet.cxx 2007-06-27 14:37:11+0000 1.31 +++ ResultSet.cxx 2007-11-27 12:03:05+0000 1.32 @@ -112,11 +112,12 @@ //************************************************************** jclass java_sql_ResultSet::theClass = 0; -java_sql_ResultSet::java_sql_ResultSet( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rParentLogger, java_sql_Statement_Base* pStmt) +java_sql_ResultSet::java_sql_ResultSet( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rParentLogger,java_sql_Connection& _rConnection, java_sql_Statement_Base* pStmt) :java_sql_ResultSet_BASE(m_aMutex) ,java_lang_Object( pEnv, myObj ) ,OPropertySetHelper(java_sql_ResultSet_BASE::rBHelper) ,m_aLogger( _rParentLogger, java::sql::ConnectionLog::RESULTSET ) + ,m_pConnection(&_rConnection) { SDBThreadAttach::addRef(); osl_incrementInterlockedCount(&m_refCount); @@ -510,7 +511,7 @@ } } - return out==0 ? 0 : new java_sql_ResultSetMetaData( t.pEnv, out, m_aLogger ); + return out==0 ? 0 : new java_sql_ResultSetMetaData( t.pEnv, out, m_aLogger,*m_pConnection ); } // ------------------------------------------------------------------------- Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
