Tag: cws_src680_dba23e User: oj Date: 2007-08-08 08:40:16+0000 Modified: dba/connectivity/source/drivers/hsqldb/makefile.mk dba/connectivity/source/drivers/hsqldb/HDriver.cxx
Log: #i80338# make use of SYSTEM_HSQLDB define File Changes: Directory: /dba/connectivity/source/drivers/hsqldb/ =================================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/makefile.mk?r1=1.11&r2=1.11.50.1 Delta lines: +6 -3 ------------------- --- makefile.mk 2007-03-09 08:58:53+0000 1.11 +++ makefile.mk 2007-08-08 08:40:13+0000 1.11.50.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.11 $ +# $Revision: 1.11.50.1 $ # -# last change: $Author: obo $ $Date: 2007/03/09 08:58:53 $ +# last change: $Author: oj $ $Date: 2007/08/08 08:40:13 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -50,6 +50,9 @@ @echo "Not building jurt because Java is disabled" .ENDIF +.IF "$(SYSTEM_HSQLDB)" == "YES" +CDEFS+=-DSYSTEM_HSQLDB -DHSQLDB_JAR=\""file://$(HSQLDB_JAR)"\" +.ENDIF # --- Resources --------------------------------- SRS1NAME=$(TARGET) File [changed]: HDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/HDriver.cxx?r1=1.23&r2=1.23.50.1 Delta lines: +7 -3 ------------------- --- HDriver.cxx 2007-03-12 10:40:59+0000 1.23 +++ HDriver.cxx 2007-08-08 08:40:14+0000 1.23.50.1 @@ -4,9 +4,9 @@ * * $RCSfile: HDriver.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.23.50.1 $ * - * last change: $Author: obo $ $Date: 2007/03/12 10:40:59 $ + * last change: $Author: oj $ $Date: 2007/08/08 08:40:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -241,7 +241,11 @@ 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")); +#ifdef SYSTEM_HSQLDB + aConvertedProperties[nPos++].Value <<= (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(HSQLDB_JAR)) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" vnd.sun.star.expand:$ORIGIN/classes/sdbc_hsqldb.jar"))); +#else 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")); +#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]
