diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-07-07 09:59:29 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-07-07 09:59:29 +0000 |
| commit | fd2cac17fc0e1c4c8d0a6db571b0f50ca0dc88f1 (patch) | |
| tree | 7061d2edfbf346676b0d57dbb59bc5ef338abdbc /stoc/source/javaloader | |
| parent | 9221962ac4697a4dc2f3a5e98186a3684f2f801e (diff) | |
INTEGRATION: CWS sb33 (1.22.4); FILE MERGED
2005/06/29 13:56:53 sb 1.22.4.1: #i51091# Changed occurences of jobject in the jvmaccess API to void* to avoid different mangled C++ names for different JDKs.
Diffstat (limited to 'stoc/source/javaloader')
| -rw-r--r-- | stoc/source/javaloader/javaloader.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx index b74fc1a03459..7ad3b35a57dc 100644 --- a/stoc/source/javaloader/javaloader.cxx +++ b/stoc/source/javaloader/javaloader.cxx @@ -2,9 +2,9 @@ * * $RCSfile: javaloader.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: obo $ $Date: 2005-06-17 10:06:46 $ + * last change: $Author: obo $ $Date: 2005-07-07 10:59:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -269,7 +269,8 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL css::uno::Reference<XInterface>()); jclass jcJavaLoader = static_cast< jclass >( pJNIEnv->CallObjectMethodA( - xVirtualMachine->getClassLoader(), jmLoadClass, &arg)); + static_cast< jobject >(xVirtualMachine->getClassLoader()), + jmLoadClass, &arg)); if(pJNIEnv->ExceptionOccurred()) throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( "javaloader error - could not find class com/sun/star/comp/loader/JavaLoader")), |