User: obo Date: 2008-01-07 09:45:55+0000 Modified: dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
Log: INTEGRATION: CWS sb80 (1.9.88); FILE MERGED 2007/11/20 08:34:57 sb 1.9.88.2: #i82422# At least on Mac OS X Tiger, System.loadLibrary(hsqldb2) does not find the hsqldb2 library on directory above sdbc_hsqldb.jar, even though .. is on the jar's Class-Path; added NativeLibraries.load to work around that. 2007/11/19 10:17:00 sb 1.9.88.1: #i82422# Removed dependency on NativeLibraryLoader (as finding jurt.jar is not trivial in OOo-wo-URE installations). File Changes: Directory: /dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/ ============================================================ File [changed]: StorageFileAccess.java Url: http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java?r1=1.9&r2=1.10 Delta lines: +2 -12 -------------------- --- StorageFileAccess.java 2007-03-12 10:40:07+0000 1.9 +++ StorageFileAccess.java 2008-01-07 09:45:53+0000 1.10 @@ -40,7 +40,6 @@ package com.sun.star.sdbcx.comp.hsqldb; import org.hsqldb.lib.FileAccess; -import com.sun.star.lib.util.NativeLibraryLoader; import org.hsqldb.lib.FileSystemRuntimeException; /** @@ -48,17 +47,8 @@ * @author oj93728 */ public class StorageFileAccess implements org.hsqldb.lib.FileAccess{ - static { - if ( System.getProperty( "os.name" ).startsWith( "Windows" ) ) - { - NativeLibraryLoader.loadLibrary(StorageFileAccess.class.getClassLoader(), "msvcr71"); - NativeLibraryLoader.loadLibrary(StorageFileAccess.class.getClassLoader(), "uwinapi"); - NativeLibraryLoader.loadLibrary(StorageFileAccess.class.getClassLoader(), "sal3"); - // NativeLibraryLoader.loadLibrary(StorageFileAccess.class.getClassLoader(), "dbtools680mi"); - } - // load shared library for JNI code - NativeLibraryLoader.loadLibrary(StorageFileAccess.class.getClassLoader(), "hsqldb2"); - } + static { NativeLibraries.load(); } + String ds_name; String key; /** Creates a new instance of StorageFileAccess */ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
