diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-01-07 08:45:41 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-01-07 08:45:41 +0000 |
| commit | d1a05645ed39a73814d0d0dcf34e09df4d3911e7 (patch) | |
| tree | 14109233d2585eda7320d3fe750c70dde1ebc08a /connectivity/com | |
| parent | d099d6217ae5f8ddee2589dfbdb013ca68d2247c (diff) | |
INTEGRATION: CWS sb80 (1.6.88); FILE MERGED
2007/11/20 08:34:57 sb 1.6.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.6.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/NativeStorageAccess.java | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java index a4271d08fae2..15b1dbff1250 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java @@ -4,9 +4,9 @@ * * $RCSfile: NativeStorageAccess.java,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2007-03-12 10:39:42 $ + * last change: $Author: obo $ $Date: 2008-01-07 09:45:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -45,20 +45,10 @@ package com.sun.star.sdbcx.comp.hsqldb; * @author oj93728 */ import com.sun.star.embed.ElementModes; -import com.sun.star.lib.util.NativeLibraryLoader; public class NativeStorageAccess { - static - { - if ( System.getProperty( "os.name" ).startsWith( "Windows" ) ) - { - NativeLibraryLoader.loadLibrary(NativeStorageAccess.class.getClassLoader(), "msvcr71"); - NativeLibraryLoader.loadLibrary(NativeStorageAccess.class.getClassLoader(), "uwinapi"); - NativeLibraryLoader.loadLibrary(NativeStorageAccess.class.getClassLoader(), "sal3"); - } - // load shared library for JNI code - NativeLibraryLoader.loadLibrary(NativeStorageAccess.class.getClassLoader(), "hsqldb2"); - } + static { NativeLibraries.load(); } + /** Creates a new instance of StorageAccess */ public NativeStorageAccess(String name,String _mode,Object key) throws java.io.IOException{ try { |