User: obo Date: 2007/03/12 03:40:09 Modified: dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
Log: INTEGRATION: CWS sb36 (1.6.42); FILE MERGED 2007/01/12 14:19:56 sb 1.6.42.3: RESYNC: (1.7-1.8); FILE MERGED 2005/09/21 07:02:18 sb 1.6.42.2: RESYNC: (1.6-1.7); FILE MERGED 2005/07/14 12:33:02 sb 1.6.42.1: #i51803# Cleaned up dependencies. 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.8&r2=1.9 Delta lines: +5 -6 ------------------- --- StorageFileAccess.java 12 Dec 2006 15:50:19 -0000 1.8 +++ StorageFileAccess.java 12 Mar 2007 10:40:07 -0000 1.9 @@ -40,7 +40,6 @@ package com.sun.star.sdbcx.comp.hsqldb; import org.hsqldb.lib.FileAccess; -import com.sun.star.embed.XStorage; import com.sun.star.lib.util.NativeLibraryLoader; import org.hsqldb.lib.FileSystemRuntimeException; @@ -52,13 +51,13 @@ static { 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"); + 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(StorageNativeOutputStream.class.getClassLoader(), "hsqldb2"); + NativeLibraryLoader.loadLibrary(StorageFileAccess.class.getClassLoader(), "hsqldb2"); } String ds_name; String key; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
