User: obo Date: 2007/03/12 03:41:01 Modified: dba/connectivity/source/drivers/hsqldb/HDriver.cxx
Log: INTEGRATION: CWS sb36 (1.12.8); FILE MERGED 2007/01/22 08:53:52 sb 1.12.8.5: RESYNC: (1.21-1.22); FILE MERGED 2006/11/08 12:01:47 sb 1.12.8.4: RESYNC: (1.15-1.21); FILE MERGED 2006/03/13 09:55:12 sb 1.12.8.3: RESYNC: (1.14-1.15); FILE MERGED 2005/09/21 10:40:03 sb 1.12.8.2: RESYNC: (1.12-1.14); FILE MERGED 2005/07/14 12:32:08 sb 1.12.8.1: #i51803# Added JavaDriverClassPath. File Changes: Directory: /dba/connectivity/source/drivers/hsqldb/ =================================================== File [changed]: HDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/HDriver.cxx?r1=1.22&r2=1.23 Delta lines: +3 -1 ------------------- --- HDriver.cxx 15 Jan 2007 13:34:10 -0000 1.22 +++ HDriver.cxx 12 Mar 2007 10:40:59 -0000 1.23 @@ -228,7 +228,7 @@ bool bIsNewDatabase = !xStorage->hasElements(); - Sequence< PropertyValue > aConvertedProperties(8); + Sequence< PropertyValue > aConvertedProperties(9); sal_Int32 nPos = 0; aConvertedProperties[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("storage_key")); ::rtl::OUString sConnPartURL = sSystemPath.copy(0,::std::max<sal_Int32>(nIndex,sSystemPath.getLength())); @@ -240,6 +240,8 @@ aConvertedProperties[nPos++].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.comp.hsqldb.StorageFileAccess")); aConvertedProperties[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JavaDriverClass")); aConvertedProperties[nPos++].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.hsqldb.jdbcDriver")); + aConvertedProperties[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JavaDriverClassPath")); + aConvertedProperties[nPos++].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.expand:$ORIGIN/classes/hsqldb.jar vnd.sun.star.expand:$ORIGIN/classes/sdbc_hsqldb.jar")); aConvertedProperties[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsAutoRetrievingEnabled")); aConvertedProperties[nPos++].Value <<= sal_True; aConvertedProperties[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoRetrievingStatement")); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
