diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-01-07 08:45:53 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-01-07 08:45:53 +0000 |
| commit | 9bd9ecbd30b5f3c8f6eb29fa028e2831194cd362 (patch) | |
| tree | e2b0875ab0c7f8bb903e3c5be2fe63e3c0a7309c /connectivity/com | |
| parent | d1a05645ed39a73814d0d0dcf34e09df4d3911e7 (diff) | |
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).
Diffstat (limited to 'connectivity/com')
| -rw-r--r-- | connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java index cbb5d83a3a1e..b802a3d946fa 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java @@ -4,9 +4,9 @@ * * $RCSfile: StorageFileAccess.java,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2007-03-12 10:40:07 $ + * last change: $Author: obo $ $Date: 2008-01-07 09:45:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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 @@ import org.hsqldb.lib.FileSystemRuntimeException; * @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 */ |