summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrzej J.R. Hunt <andrzej@ahunt.org>2013-09-16 11:07:36 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-09-23 14:11:40 +0200
commit85d1ee4f1c5a47105fc3a447c7f8a45cbd147ec0 (patch)
tree9e56ff4eac03960f903d23037b5282d206f07f0d
parent2292b3cd8d9a06b2f073b945b228dd7894955b09 (diff)
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 <sbergman@redhat.com>
-rw-r--r--connectivity/source/drivers/hsqldb/HDriver.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index f916658c4a29..f0ca4ef760be 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