INTEGRATION: CWS sb80 (1.5.88); FILE MERGED

2007/11/20 08:34:57 sb 1.5.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.5.88.1: #i82422# Removed dependency on NativeLibraryLoader (as finding jurt.jar is not trivial in OOo-wo-URE installations).

1 files changed, 2 insertions, 13 deletions

diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java
index 1aecfa0a3fc6..3ea7fe34c11a 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java
@@ -5,28 +5,17 @@
  */
 
 package com.sun.star.sdbcx.comp.hsqldb;
-import com.sun.star.lib.util.NativeLibraryLoader;
 import com.sun.star.embed.ElementModes;
 /**
  *
  * @author  oj93728
  */
 public class StorageNativeOutputStream {
+    static { NativeLibraries.load(); }
+
     String name;
     Object key;
-    static {
-    // preload shared libraries whichs import lips are linked to jpipe
-    if ( System.getProperty( "os.name" ).startsWith( "Windows" ) )
-    {
-            NativeLibraryLoader.loadLibrary(StorageNativeOutputStream.class.getClassLoader(), "msvcr71");
-            NativeLibraryLoader.loadLibrary(StorageNativeOutputStream.class.getClassLoader(), "uwinapi");
-            NativeLibraryLoader.loadLibrary(StorageNativeOutputStream.class.getClassLoader(), "sal3");
-            NativeLibraryLoader.loadLibrary(StorageNativeOutputStream.class.getClassLoader(), "dbtools680mi");
-    }
 
-    // load shared library for JNI code
-        NativeLibraryLoader.loadLibrary(StorageNativeOutputStream.class.getClassLoader(), "hsqldb2");
-    }
     /** Creates a new instance of StorageNativeOutputStream */
     public StorageNativeOutputStream(String _name,Object _key) {
         name = _name;