connectivity/source/drivers/hsqldb/HDriver.cxx | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 85d1ee4f1c5a47105fc3a447c7f8a45cbd147ec0
Author: Andrzej J.R. Hunt <andr...@ahunt.org>
Date: Mon Sep 16 11:07:36 2013 +0100
Use LO_JAVA_DIR for HSQLDB classpath.
This is needed to allow usage of HSQLDB in a unit test in solver
(in conjunction with the following patch which adds LO_JAVA_DIR
to solver's unorc).
Change-Id: Ia3757b61d4ba0b2353e0d33290938cea40551d3a
Signed-off-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx
b/connectivity/source/drivers/hsqldb/HDriver.cxx
index f916658..f0ca4ef 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -235,11 +235,10 @@ namespace connectivity
OUString(
#ifdef SYSTEM_HSQLDB
HSQLDB_JAR
- " vnd.sun.star.expand:$BRAND_BASE_DIR/"
LIBO_SHARE_JAVA_FOLDER "/sdbc_hsqldb.jar"
#else
- "vnd.sun.star.expand:$BRAND_BASE_DIR/"
LIBO_SHARE_JAVA_FOLDER "/hsqldb.jar"
- " vnd.sun.star.expand:$BRAND_BASE_DIR/"
LIBO_SHARE_JAVA_FOLDER "/sdbc_hsqldb.jar"
+ "vnd.sun.star.expand:$LO_JAVA_DIR/hsqldb.jar"
#endif
+ " vnd.sun.star.expand:$LO_JAVA_DIR/sdbc_hsqldb.jar"
) );
// auto increment handling
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
