mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS sb36 (1.4.60); FILE MERGED

Browse Source 
2005/09/21 07:01:41 sb 1.4.60.2: RESYNC: (1.4-1.5); FILE MERGED
2005/07/14 12:33:00 sb 1.4.60.1: #i51803# Cleaned up dependencies.
This commit is contained in:
Oliver Bolte
2007-03-12 09:39:42 +00:00
parent 95a61dd832
commit 58fd94e45e
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
View File

@@ -4,9 +4,9 @@
*
* $RCSfile: NativeStorageAccess.java,v $
*
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* last change: $Author: rt $ $Date: 2005-09-08 04:55:13 $
* last change: $Author: obo $ $Date: 2007-03-12 10:39:42 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -44,16 +44,7 @@ package com.sun.star.sdbcx.comp.hsqldb;
*
* @author oj93728
*/
import com.sun.star.document.XDocumentSubStorageSupplier;
import com.sun.star.embed.ElementModes;
import com.sun.star.embed.XStorage;
import com.sun.star.io.XStream;
import com.sun.star.io.XInputStream;
import com.sun.star.io.XOutputStream;
import com.sun.star.io.XSeekable;
import com.sun.star.lang.XComponent;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.beans.NamedValue;
import com.sun.star.lib.util.NativeLibraryLoader;
public class NativeStorageAccess {
@@ -61,12 +52,12 @@ public class NativeStorageAccess {
{
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(NativeStorageAccess.class.getClassLoader(), "msvcr71");
NativeLibraryLoader.loadLibrary(NativeStorageAccess.class.getClassLoader(), "uwinapi");
NativeLibraryLoader.loadLibrary(NativeStorageAccess.class.getClassLoader(), "sal3");
}
// load shared library for JNI code
NativeLibraryLoader.loadLibrary(StorageNativeOutputStream.class.getClassLoader(), "hsqldb2");
NativeLibraryLoader.loadLibrary(NativeStorageAccess.class.getClassLoader(), "hsqldb2");
}
/** Creates a new instance of StorageAccess */
public NativeStorageAccess(String name,String _mode,Object key) throws java.io.IOException{