Tag: cws_src680_dba24d User: oj Date: 2007-11-06 09:06:19+0000 Modified: dba/connectivity/source/inc/java/sql/Connection.hxx dba/connectivity/source/inc/java/sql/ResultSet.hxx dba/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
Log: #i11746# new property to turn of currency from meta data File Changes: Directory: /dba/connectivity/source/inc/java/sql/ ================================================= File [changed]: Connection.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/java/sql/Connection.hxx?r1=1.15&r2=1.15.54.1 Delta lines: +6 -4 ------------------- --- Connection.hxx 2007-06-27 14:38:25+0000 1.15 +++ Connection.hxx 2007-11-06 09:06:16+0000 1.15.54.1 @@ -4,9 +4,9 @@ * * $RCSfile: Connection.hxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.15.54.1 $ * - * last change: $Author: hr $ $Date: 2007/06/27 14:38:25 $ + * last change: $Author: oj $ $Date: 2007/11/06 09:06:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -83,6 +83,7 @@ m_aLogger; sal_Bool m_bParameterSubstitution; sal_Bool m_bIgnoreDriverPrivileges; + sal_Bool m_bIgnoreCurrency; /** transform named parameter into unnamed one. @param _sSQL @@ -91,7 +92,7 @@ The new statement witgh unnamed parameters. */ ::rtl::OUString transFormPreparedStatement(const ::rtl::OUString& _sSQL); - void loadDriverFromProperties( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info,::rtl::OUString& _rsGeneratedValueStatement,sal_Bool& _rbAutoRetrievingEnabled,sal_Bool& _bParameterSubstitution,sal_Bool& _bIgnore); + void loadDriverFromProperties(const ::rtl::OUString& _sDriverClass,const ::rtl::OUString& _sDriverClassPath); protected: // statische Daten fuer die Klasse static jclass theClass; @@ -112,6 +113,7 @@ getConnectionInfo() const { return m_aConnectionInfo; } inline sal_Bool isIgnoreDriverPrivilegesEnabled() const { return m_bIgnoreDriverPrivileges;} + inline sal_Bool isIgnoreCurrencyEnabled() const { return m_bIgnoreCurrency; } const java::sql::ConnectionLog& getLogger() const { return m_aLogger; } File [changed]: ResultSet.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/java/sql/ResultSet.hxx?r1=1.11&r2=1.11.54.1 Delta lines: +16 -14 --------------------- --- ResultSet.hxx 2007-06-27 14:39:55+0000 1.11 +++ ResultSet.hxx 2007-11-06 09:06:16+0000 1.11.54.1 @@ -4,9 +4,9 @@ * * $RCSfile: ResultSet.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.11.54.1 $ * - * last change: $Author: hr $ $Date: 2007/06/27 14:39:55 $ + * last change: $Author: oj $ $Date: 2007/11/06 09:06:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -99,6 +99,7 @@ ::com::sun::star::sdbc::XColumnLocate, ::com::sun::star::lang::XServiceInfo> java_sql_ResultSet_BASE; + class java_sql_Connection; class java_sql_ResultSet : public comphelper::OBaseMutex, public java_sql_ResultSet_BASE, public java_lang_Object, @@ -108,6 +109,7 @@ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; java::sql::ConnectionLog m_aLogger; + java_sql_Connection* m_pConnection; sal_Int32 getResultSetConcurrency() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -148,7 +150,7 @@ DECLARE_SERVICE_INFO(); static jclass getMyClass(); // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: - java_sql_ResultSet( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rParentLogger, + java_sql_ResultSet( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rParentLogger,java_sql_Connection& _rConnection, java_sql_Statement_Base* pStmt = NULL ); // ::cppu::OComponentHelper File [changed]: ResultSetMetaData.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/java/sql/ResultSetMetaData.hxx?r1=1.4&r2=1.4.54.1 Delta lines: +7 -6 ------------------- --- ResultSetMetaData.hxx 2007-06-27 14:40:13+0000 1.4 +++ ResultSetMetaData.hxx 2007-11-06 09:06:16+0000 1.4.54.1 @@ -4,9 +4,9 @@ * * $RCSfile: ResultSetMetaData.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.54.1 $ * - * last change: $Author: hr $ $Date: 2007/06/27 14:40:13 $ + * last change: $Author: oj $ $Date: 2007/11/06 09:06:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -51,12 +51,13 @@ //************************************************************** //************ Class: java.sql.ResultSetMetaData //************************************************************** - + class java_sql_Connection; class java_sql_ResultSetMetaData : public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData>, public java_lang_Object { protected: java::sql::ConnectionLog m_aLogger; + java_sql_Connection* m_pConnection; // statische Daten fuer die Klasse static jclass theClass; @@ -67,7 +68,7 @@ static jclass getMyClass(); // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: - java_sql_ResultSetMetaData( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rResultSetLogger ); + java_sql_ResultSetMetaData( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rResultSetLogger, java_sql_Connection& _rCon ); virtual sal_Int32 SAL_CALL getColumnCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
