User: vg Date: 2007-08-27 16:04:57+0000 Modified: dba/connectivity/source/drivers/hsqldb/HDriver.cxx
Log: INTEGRATION: CWS dba23e (1.23.50); FILE MERGED 2007/08/16 05:34:29 oj 1.23.50.3: #i80338# windows compiler patch 2007/08/08 09:16:44 oj 1.23.50.2: #i80338# make use of SYSTEM_HSQLDB define 2007/08/08 08:40:14 oj 1.23.50.1: #i80338# make use of SYSTEM_HSQLDB define 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.23&r2=1.24 Delta lines: +9 -1 ------------------- --- HDriver.cxx 2007-03-12 10:40:59+0000 1.23 +++ HDriver.cxx 2007-08-27 16:04:54+0000 1.24 @@ -241,7 +241,15 @@ 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++].Value <<= ::rtl::OUString( +#ifdef SYSTEM_HSQLDB + RTL_CONSTASCII_USTRINGPARAM(HSQLDB_JAR + " vnd.sun.star.expand:$ORIGIN/classes/sdbc_hsqldb.jar") +#else + RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.expand:$ORIGIN/classes/hsqldb.jar" + " vnd.sun.star.expand:$ORIGIN/classes/sdbc_hsqldb.jar") +#endif + ); 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]
