From fe37678da93610495c50d1629757f37cdf63d135 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Mon, 7 Jan 2008 08:46:04 +0000 Subject: INTEGRATION: CWS sb80 (1.4.88); FILE MERGED 2007/11/20 08:34:57 sb 1.4.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.4.88.1: #i82422# Removed dependency on NativeLibraryLoader (as finding jurt.jar is not trivial in OOo-wo-URE installations). --- .../star/sdbcx/comp/hsqldb/StorageNativeInputStream.java | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'connectivity/com/sun/star/sdbcx/comp/hsqldb') diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java index 774ad2d5b3d5..c1a62d242a15 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java @@ -5,26 +5,14 @@ */ package com.sun.star.sdbcx.comp.hsqldb; -import com.sun.star.lib.util.NativeLibraryLoader; import com.sun.star.embed.ElementModes; /** * * @author Ocke */ public class StorageNativeInputStream { - static { - // preload shared libraries whichs import lips are linked to hsqldb - if ( System.getProperty( "os.name" ).startsWith( "Windows" ) ) - { - NativeLibraryLoader.loadLibrary(StorageNativeInputStream.class.getClassLoader(), "msvcr71"); - NativeLibraryLoader.loadLibrary(StorageNativeInputStream.class.getClassLoader(), "uwinapi"); - NativeLibraryLoader.loadLibrary(StorageNativeInputStream.class.getClassLoader(), "sal3"); - NativeLibraryLoader.loadLibrary(StorageNativeInputStream.class.getClassLoader(), "dbtools680mi"); - } + static { NativeLibraries.load(); } - // load shared library for JNI code - NativeLibraryLoader.loadLibrary(StorageNativeInputStream.class.getClassLoader(), "hsqldb2"); - } /** Creates a new instance of StorageNativeInputStream */ public StorageNativeInputStream(String key,String _file) { openStream(key,_file, ElementModes.READ); -- cgit