summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--io/source/stm/omark.cxx10
-rw-r--r--javaunohelper/com/sun/star/comp/helper/ComponentContext.java33
-rw-r--r--javaunohelper/prj/d.lst8
-rw-r--r--javaunohelper/source/bootstrap.cxx6
-rw-r--r--javaunohelper/source/makefile.mk95
-rw-r--r--javaunohelper/source/preload.cxx180
-rw-r--r--javaunohelper/util/delzip0
-rw-r--r--javaunohelper/util/makefile.mk11
8 files changed, 274 insertions, 69 deletions
diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx
index 4f3254dd9888..85e112516d6b 100644
--- a/io/source/stm/omark.cxx
+++ b/io/source/stm/omark.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: omark.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: jbu $ $Date: 2002-09-18 10:02:24 $
+ * last change: $Author: hr $ $Date: 2003-03-26 12:21:47 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -760,6 +760,12 @@ void OMarkableInputStream::skipBytes(sal_Int32 nBytesToSkip)
BufferSizeExceededException,
RuntimeException)
{
+ if ( nBytesToSkip < 0 )
+ throw BufferSizeExceededException(
+ ::rtl::OUString::createFromAscii( "precondition not met: XInputStream::skipBytes: non-negative integer required!" ),
+ *this
+ );
+
// this method is blocking
sal_Int32 nRead;
Sequence<sal_Int8> seqDummy( nBytesToSkip );
diff --git a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
index 663dc6caf97d..b1d739ddd172 100644
--- a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
+++ b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
@@ -2,9 +2,9 @@
*
* $RCSfile: ComponentContext.java,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: dbo $ $Date: 2002-01-21 14:48:54 $
+ * last change: $Author: hr $ $Date: 2003-03-26 12:23:46 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,6 +61,7 @@
package com.sun.star.comp.helper;
import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.Any;
import com.sun.star.uno.XComponentContext;
import com.sun.star.lang.XMultiComponentFactory;
@@ -129,14 +130,10 @@ public class ComponentContext implements XComponentContext, XComponent
{
if (o instanceof ComponentContextEntry)
{
- m_xSMgr = (XMultiComponentFactory)UnoRuntime.queryInterface(
- XMultiComponentFactory.class, ((ComponentContextEntry)o).m_value );
- }
- else
- {
- m_xSMgr = (XMultiComponentFactory)UnoRuntime.queryInterface(
- XMultiComponentFactory.class, o );
+ o = ((ComponentContextEntry)o).m_value;
}
+ m_xSMgr = (XMultiComponentFactory)UnoRuntime.queryInterface(
+ XMultiComponentFactory.class, o );
}
if (m_xSMgr != null)
{
@@ -187,8 +184,9 @@ public class ComponentContext implements XComponentContext, XComponent
}
else
{
- XSingleComponentFactory xCompFac = (XSingleComponentFactory)UnoRuntime.queryInterface(
- XSingleComponentFactory.class, entry.m_lateInit );
+ XSingleComponentFactory xCompFac =
+ (XSingleComponentFactory)UnoRuntime.queryInterface(
+ XSingleComponentFactory.class, entry.m_lateInit );
if (xCompFac != null)
{
xInstance = xCompFac.createInstanceWithContext( this );
@@ -246,7 +244,7 @@ public class ComponentContext implements XComponentContext, XComponent
}
else
{
- return null;
+ return Any.VOID;
}
}
//______________________________________________________________________________________________
@@ -280,20 +278,13 @@ public class ComponentContext implements XComponentContext, XComponent
String name = (String)keys.nextElement();
if (! name.equals( SMGR_NAME ))
{
- XComponent xComp;
-
Object o = m_table.get( name );
if (o instanceof ComponentContextEntry)
{
- xComp = (XComponent)UnoRuntime.queryInterface(
- XComponent.class, ((ComponentContextEntry)o).m_value );
- }
- else // direct value in
- {
- xComp = (XComponent)UnoRuntime.queryInterface(
- XComponent.class, o );
+ o = ((ComponentContextEntry)o).m_value;
}
+ XComponent xComp = (XComponent)UnoRuntime.queryInterface( XComponent.class, o );
if (xComp != null)
{
if (name.equals( TDMGR_NAME ))
diff --git a/javaunohelper/prj/d.lst b/javaunohelper/prj/d.lst
index 58f6883686cd..a00ed633a5d6 100644
--- a/javaunohelper/prj/d.lst
+++ b/javaunohelper/prj/d.lst
@@ -1,6 +1,8 @@
..\%__SRC%\class\juh.jar %_DEST%\bin%_EXT%\juh.jar
-..\%__SRC%\bin\juh.dll %_DEST%\bin%_EXT%\juh.dll
-..\%__SRC%\lib\libjuh.so %_DEST%\lib%_EXT%\libjuh.so
-..\%__SRC%\lib\libjuh.dylib %_DEST%\lib%_EXT%\libjuh.dylib
+..\%__SRC%\bin\juh*.dll %_DEST%\bin%_EXT%\juh*.dll
+..\%__SRC%\lib\libjuh*.so %_DEST%\lib%_EXT%\libjuh*.so
+..\%__SRC%\lib\libjuh*.dylib %_DEST%\lib%_EXT%\libjuh*.dylib
+
+..\%__SRC%\bin\juh_src.zip %COMMON_DEST%\bin%_EXT%\juh_src.zip
diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx
index a3d1be4a5758..aff09bd4942c 100644
--- a/javaunohelper/source/bootstrap.cxx
+++ b/javaunohelper/source/bootstrap.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: bootstrap.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: dbo $ $Date: 2002-12-06 16:40:54 $
+ * last change: $Author: hr $ $Date: 2003-03-26 12:23:47 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -128,7 +128,6 @@ Reference< XInterface > SingletonFactory::createInstanceWithContext(
{
sal_Int64 handle = reinterpret_cast< sal_Int64 >( m_vm_access.get() );
Any arg( makeAny( handle ) );
- OSL_ENSURE( 0, "unexpected: getting vm service using explicit parameters!" );
return xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
OUSTR("com.sun.star.java.JavaVirtualMachine"), Sequence< Any >( &arg, 1 ), xContext );
}
@@ -137,7 +136,6 @@ Reference< XInterface > SingletonFactory::createInstanceWithArgumentsAndContext(
Sequence< Any > const & args, Reference< XComponentContext > const & xContext )
throw (Exception)
{
- OSL_ENSURE( 0, "unexpected: getting vm service using explicit parameters!" );
return xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
OUSTR("com.sun.star.java.JavaVirtualMachine"), args, xContext );
}
diff --git a/javaunohelper/source/makefile.mk b/javaunohelper/source/makefile.mk
index 18f7da977233..0260584175c2 100644
--- a/javaunohelper/source/makefile.mk
+++ b/javaunohelper/source/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.10 $
+# $Revision: 1.11 $
#
-# last change: $Author: rt $ $Date: 2002-12-11 16:34:05 $
+# last change: $Author: hr $ $Date: 2003-03-26 12:23:48 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -59,15 +59,14 @@
#
#
#*************************************************************************
-
PRJ=..
-PRJNAME= juhelper
-TARGET= juh
-USE_DEFFILE= TRUE
-NO_BSYMBOLIC= TRUE
+PRJNAME=javaunohelper
+TARGET=juh
+USE_DEFFILE=TRUE
+NO_BSYMBOLIC=TRUE
ENABLE_EXCEPTIONS=TRUE
-BOOTSTRAP_SERVICE=TRUE
+LIBTARGET=NO
# --- Settings -----------------------------------------------------
@@ -77,58 +76,80 @@ BOOTSTRAP_SERVICE=TRUE
# ------------------------------------------------------------------
-UNOUCRDEP= $(SOLARBINDIR)$/udkapi.rdb
-UNOUCRRDB= $(SOLARBINDIR)$/udkapi.rdb
+UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
+UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
-.IF "$(BOOTSTRAP_SERVICE)" == "TRUE"
-UNOUCROUT= $(OUT)$/inc$/comprehensive
-INCPRE+= $(OUT)$/inc$/comprehensive
-CPPUMAKERFLAGS += -C
-.ELSE
-UNOUCROUT= $(OUT)$/inc
-INCPRE+= $(OUT)$/inc
-.ENDIF
+UNOUCROUT=$(OUT)$/inc$/comprehensive
+INCPRE+=$(OUT)$/inc$/comprehensive
+CPPUMAKERFLAGS+=-C
UNOTYPES= \
- com.sun.star.container.XHierarchicalNameAccess \
- com.sun.star.loader.XImplementationLoader \
+ com.sun.star.container.XHierarchicalNameAccess \
+ com.sun.star.loader.XImplementationLoader \
com.sun.star.registry.XRegistryKey \
com.sun.star.registry.XSimpleRegistry \
com.sun.star.beans.XPropertySet \
- com.sun.star.lang.IllegalArgumentException \
+ com.sun.star.lang.IllegalArgumentException \
com.sun.star.lang.XTypeProvider \
com.sun.star.lang.XServiceInfo \
- com.sun.star.lang.XMultiServiceFactory \
+ com.sun.star.lang.XMultiServiceFactory \
com.sun.star.lang.XMultiComponentFactory \
- com.sun.star.lang.XSingleServiceFactory \
- com.sun.star.lang.XSingleComponentFactory \
- com.sun.star.uno.TypeClass \
- com.sun.star.uno.XWeak \
+ com.sun.star.lang.XSingleServiceFactory \
+ com.sun.star.lang.XSingleComponentFactory \
+ com.sun.star.uno.TypeClass \
+ com.sun.star.uno.XWeak \
com.sun.star.uno.XAggregation \
- com.sun.star.uno.XComponentContext \
- com.sun.star.lang.XInitialization \
+ com.sun.star.uno.XComponentContext \
+ com.sun.star.lang.XInitialization \
com.sun.star.lang.XComponent
SLOFILES= \
- $(SLO)$/javaunohelper.obj \
+ $(SLO)$/javaunohelper.obj \
+ $(SLO)$/bootstrap.obj \
+ $(SLO)$/preload.obj
+
+# ------------------------------------------------------------------
+
+LIB1TARGET=$(SLB)$/$(SHL1TARGET).lib
+LIB1OBJFILES=\
+ $(SLO)$/javaunohelper.obj \
$(SLO)$/bootstrap.obj
-SHL1TARGET= $(TARGET)
+SHL1TARGET=juhx
SHL1STDLIBS= \
$(JVMACCESSLIB) \
$(SALHELPERLIB) \
- $(CPPUHELPERLIB) \
+ $(SALLIB) \
$(CPPULIB) \
- $(SALLIB)
+ $(CPPUHELPERLIB)
SHL1DEPN=
-SHL1IMPLIB= i$(TARGET)
-SHL1LIBS= $(SLB)$/$(TARGET).lib
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
+SHL1IMPLIB=i$(SHL1TARGET)
+SHL1LIBS=$(LIB1TARGET)
+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+
+DEF1NAME=$(SHL1TARGET)
+DEF1EXPORTFILE=exports.dxp
+
+# ------------------------------------------------------------------
+
+LIB2TARGET=$(SLB)$/$(SHL2TARGET).lib
+LIB2OBJFILES=\
+ $(SLO)$/preload.obj
+
+SHL2TARGET=juh
+
+SHL2STDLIBS= \
+ $(SALLIB)
+
+SHL2DEPN=
+SHL2IMPLIB=i$(SHL2TARGET)
+SHL2LIBS=$(LIB2TARGET)
+SHL2DEF=$(MISC)$/$(SHL2TARGET).def
-DEF1NAME= $(SHL1TARGET)
-DEF1EXPORTFILE= exports.dxp
+DEF2NAME=$(SHL2TARGET)
+DEF2EXPORTFILE=exports.dxp
# --- Targets ------------------------------------------------------
diff --git a/javaunohelper/source/preload.cxx b/javaunohelper/source/preload.cxx
new file mode 100644
index 000000000000..96d8daa0114b
--- /dev/null
+++ b/javaunohelper/source/preload.cxx
@@ -0,0 +1,180 @@
+/*************************************************************************
+ *
+ * $RCSfile: preload.cxx,v $
+ *
+ * $Revision: 1.2 $
+ *
+ * last change: $Author: hr $ $Date: 2003-03-26 12:23:48 $
+ *
+ * The Contents of this file are made available subject to the terms of
+ * either of the following licenses
+ *
+ * - GNU Lesser General Public License Version 2.1
+ * - Sun Industry Standards Source License Version 1.1
+ *
+ * Sun Microsystems Inc., October, 2000
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2000 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ *
+ * Sun Industry Standards Source License Version 1.1
+ * =================================================
+ * The contents of this file are subject to the Sun Industry Standards
+ * Source License Version 1.1 (the "License"); You may not use this file
+ * except in compliance with the License. You may obtain a copy of the
+ * License at http://www.openoffice.org/license.html.
+ *
+ * Software provided under this License is provided on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ * See the License for the specific provisions governing your rights and
+ * obligations concerning the Software.
+ *
+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ * Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ * All Rights Reserved.
+ *
+ * Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#include "jni.h"
+
+#include "rtl/ustring.hxx"
+#include "osl/module.h"
+
+#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
+
+#if ! defined SAL_DLLPREFIX
+#define SAL_DLLPREFIX ""
+#endif
+
+using ::rtl::OUString;
+
+extern "C"
+{
+typedef jboolean (JNICALL * fptr_writeInfo)(
+ JNIEnv *, jclass, jstring, jobject, jobject );
+typedef jobject (JNICALL * fptr_getFactory)(
+ JNIEnv *, jclass, jstring, jstring, jobject, jobject );
+typedef jobject (JNICALL * fptr_createRegistryServiceFactory)(
+ JNIEnv *, jclass, jstring, jstring, jboolean );
+typedef jobject (JNICALL * fptr_bootstrap)(
+ JNIEnv *_env, jclass, jstring, jobjectArray );
+
+static fptr_writeInfo s_writeInfo;
+static fptr_getFactory s_getFactory;
+static fptr_createRegistryServiceFactory s_createRegistryServiceFactory;
+static fptr_bootstrap s_bootstrap;
+static bool s_inited = false;
+
+//--------------------------------------------------------------------------------------------------
+static bool inited_juhx( JNIEnv * jni_env )
+{
+ if (s_inited)
+ return true;
+ OUString lib_name = OUSTR(SAL_DLLPREFIX "juhx" SAL_DLLEXTENSION);
+ oslModule hModule =
+ osl_loadModule( lib_name.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL );
+ if (0 == hModule)
+ {
+ jclass c = jni_env->FindClass( "java/lang/RuntimeException" );
+ jni_env->ThrowNew(
+ c, "error loading " SAL_DLLPREFIX "juhx" SAL_DLLEXTENSION "!" );
+ return false;
+ }
+ else
+ {
+ OUString symbol =
+ OUSTR("Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo");
+ s_writeInfo = (fptr_writeInfo)osl_getSymbol( hModule, symbol.pData );
+ symbol =
+ OUSTR("Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory");
+ s_getFactory = (fptr_getFactory)osl_getSymbol( hModule, symbol.pData );
+ symbol =
+ OUSTR("Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactory");
+ s_createRegistryServiceFactory =
+ (fptr_createRegistryServiceFactory)osl_getSymbol( hModule, symbol.pData );
+ symbol =
+ OUSTR("Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap");
+ s_bootstrap =
+ (fptr_bootstrap)osl_getSymbol( hModule, symbol.pData );
+
+ if (0 == s_writeInfo ||
+ 0 == s_getFactory ||
+ 0 == s_createRegistryServiceFactory ||
+ 0 == s_bootstrap)
+ {
+ jclass c = jni_env->FindClass( "java/lang/RuntimeException" );
+ jni_env->ThrowNew(
+ c, "error resolving symbols of " SAL_DLLPREFIX "juhx" SAL_DLLEXTENSION "!" );
+ return false;
+ }
+ }
+ s_inited = true;
+ return true;
+}
+
+//==================================================================================================
+JNIEXPORT jboolean JNICALL
+Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
+ JNIEnv * pJEnv, jclass jClass, jstring jLibName, jobject jSMgr, jobject jRegKey )
+{
+ if (inited_juhx( pJEnv ))
+ return (*s_writeInfo)( pJEnv, jClass, jLibName, jSMgr, jRegKey );
+ return JNI_FALSE;
+}
+//==================================================================================================
+JNIEXPORT jobject JNICALL
+Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
+ JNIEnv * pJEnv, jclass jClass, jstring jLibName, jstring jImplName,
+ jobject jSMgr, jobject jRegKey )
+{
+ if (inited_juhx( pJEnv ))
+ return (*s_getFactory)( pJEnv, jClass, jLibName, jImplName, jSMgr, jRegKey );
+ return 0;
+}
+//==================================================================================================
+JNIEXPORT jobject JNICALL
+Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactory(
+ JNIEnv * pJEnv, jclass jClass, jstring jWriteRegFile,
+ jstring jReadRegFile, jboolean jbReadOnly )
+{
+ if (inited_juhx( pJEnv ))
+ {
+ return (*s_createRegistryServiceFactory)(
+ pJEnv, jClass, jWriteRegFile, jReadRegFile, jbReadOnly );
+ }
+ return 0;
+}
+//==================================================================================================
+JNIEXPORT jobject JNICALL
+Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
+ JNIEnv * jni_env, jclass jClass, jstring juno_rc, jobjectArray jpairs )
+{
+ if (inited_juhx( jni_env ))
+ return (*s_bootstrap)( jni_env, jClass, juno_rc, jpairs );
+ return 0;
+}
+}
diff --git a/javaunohelper/util/delzip b/javaunohelper/util/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/javaunohelper/util/delzip
diff --git a/javaunohelper/util/makefile.mk b/javaunohelper/util/makefile.mk
index db5b46f36a32..71dc7bd75779 100644
--- a/javaunohelper/util/makefile.mk
+++ b/javaunohelper/util/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.4 $
+# $Revision: 1.5 $
#
-# last change: $Author: jl $ $Date: 2002-10-25 06:42:43 $
+# last change: $Author: hr $ $Date: 2003-03-26 12:23:52 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -79,6 +79,13 @@ JARCLASSDIRS = \
JARTARGET = $(TARGET).jar
JARCOMPRESS = TRUE
+# Special work necessary for building java reference with javadoc.
+# The source of puplic APIs must be delivered and used later in the
+# odk module.
+ZIP1TARGET=$(TARGET)_src
+ZIP1FLAGS=-u -r
+ZIP1DIR=$(PRJ)
+ZIP1LIST=com -x "*makefile.mk"
# --- Targets ------------------------------------------------------
generated by cgit (git 2.34.1) at 2025-01-25 22:47:02 +0000