User: rt Date: 2008-01-30 08:02:49+0000 Modified: dba/connectivity/source/inc/java/sql/Connection.hxx
Log: INTEGRATION: CWS dba24d (1.15.54); FILE MERGED 2007/12/01 20:57:35 fs 1.15.54.5: #i10000# 2007/12/01 13:36:54 fs 1.15.54.4: RESYNC: (1.15-1.17); FILE MERGED 2007/11/21 13:58:38 oj 1.15.54.3: #i68854# some clean ups 2007/11/21 12:39:25 oj 1.15.54.2: #i68854# impl TypeSettingInfo for Oracle and some clean up 2007/11/06 09:06:16 oj 1.15.54.1: #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.17&r2=1.18 Delta lines: +9 -14 -------------------- --- Connection.hxx 2007-11-27 12:25:01+0000 1.17 +++ Connection.hxx 2008-01-30 08:02:46+0000 1.18 @@ -53,11 +53,12 @@ #ifndef _CONNECTIVITY_AUTOKEYRETRIEVINGBASE_HXX_ #include "AutoRetrievingBase.hxx" #endif - #include "java/sql/ConnectionLog.hxx" #include "java/LocalRef.hxx" #include "java/GlobalRef.hxx" +#include <com/sun/star/beans/NamedValue.hpp> + namespace connectivity { class java_sql_Driver; @@ -70,19 +71,12 @@ public OAutoRetrievingBase { friend class OSubComponent<java_sql_Connection, java_sql_Connection_BASE>; - - ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - OWeakRefArray m_aStatements; // vector containing a list - // of all the Statement objects - // for this Connection const java_sql_Driver* m_pDriver; jobject m_pDriverobject; jdbc::GlobalRef< jobject > m_pDriverClassLoader; jclass m_Driver_theClass; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > - m_aConnectionInfo; java::sql::ConnectionLog m_aLogger; sal_Bool m_bParameterSubstitution; @@ -96,9 +90,10 @@ 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 + const ::rtl::OUString& _sDriverClass, + const ::rtl::OUString& _sDriverClassPath, + const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& _rSystemProperties ); protected: --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
