User: obo     
Date: 2008-01-07 09:46:53+0000
Modified:
   dba/connectivity/source/drivers/hsqldb/HDriver.cxx

Log:
 INTEGRATION: CWS sb80 (1.24.28); FILE MERGED
 2007/12/13 14:33:56 sb 1.24.28.2: RESYNC: (1.24-1.25); FILE MERGED
 2007/11/14 13:19:58 sb 1.24.28.1: #i82422# Use (macro) paths to jar files that 
work in both plain OOo and OOo-wo-URE.

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.25&r2=1.26
Delta lines:  +3 -3
-------------------
--- HDriver.cxx 2007-11-21 15:01:23+0000        1.25
+++ HDriver.cxx 2008-01-07 09:46:50+0000        1.26
@@ -284,10 +284,10 @@
                                    ::rtl::OUString(
 #ifdef SYSTEM_HSQLDB
                                        RTL_CONSTASCII_USTRINGPARAM(HSQLDB_JAR
-                                       " 
vnd.sun.star.expand:$ORIGIN/classes/sdbc_hsqldb.jar" )
+                                       " 
vnd.sun.star.expand:$OOO_BASE_DIR/program/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" )
+                                       
RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/hsqldb.jar"
+                                       " 
vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/sdbc_hsqldb.jar" )
 #endif
                         ) );
 




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to