User: ihi Date: 2007-11-27 12:03:24+0000 Modified: dba/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
Log: INTEGRATION: CWS dba24lms (1.11.66); FILE MERGED 2007/11/14 12:52:15 oj 1.11.66.1: #i11746# insert Ignore Currency File Changes: Directory: /dba/connectivity/source/drivers/jdbc/ ================================================= File [changed]: ResultSetMetaData.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx?r1=1.11&r2=1.12 Delta lines: +5 -1 ------------------- --- ResultSetMetaData.cxx 2007-06-27 14:37:27+0000 1.11 +++ ResultSetMetaData.cxx 2007-11-27 12:03:22+0000 1.12 @@ -39,6 +39,7 @@ #ifndef _CONNECTIVITY_JAVA_SQL_RESULTSETMETADATA_HXX_ #include "java/sql/ResultSetMetaData.hxx" #endif +#include "java/sql/Connection.hxx" #ifndef _CONNECTIVITY_JAVA_TOOLS_HXX_ #include "java/tools.hxx" #endif @@ -54,9 +55,10 @@ //************************************************************** jclass java_sql_ResultSetMetaData::theClass = 0; -java_sql_ResultSetMetaData::java_sql_ResultSetMetaData( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rResultSetLogger ) +java_sql_ResultSetMetaData::java_sql_ResultSetMetaData( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rResultSetLogger, java_sql_Connection& _rCon ) :java_lang_Object( pEnv, myObj ) ,m_aLogger( _rResultSetLogger ) + ,m_pConnection( &_rCon ) { SDBThreadAttach::addRef(); } @@ -347,6 +349,8 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException) { + if ( m_pConnection->isIgnoreCurrencyEnabled() ) + return sal_False; jboolean out(sal_False); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); if( t.pEnv ){ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
