diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-01-03 11:42:13 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-01-03 11:42:13 +0000 |
| commit | 2fc3c8a8e6b8dabb0cdefc6355013585d8fb85b6 (patch) | |
| tree | 68faecefa66eb12cf31a407128d5b5f734417bd1 /javaunohelper/source | |
| parent | f4908fd83926863ccf44147dff993f9fab0049db (diff) | |
INTEGRATION: CWS sb44 (1.9.14); FILE MERGED
2005/12/12 16:00:04 sb 1.9.14.1: #i51419# Transport complete jvmaccess::UnoVirtualMachine instance including UNO class loader from juh to javavm service.
Diffstat (limited to 'javaunohelper/source')
| -rw-r--r-- | javaunohelper/source/bootstrap.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx index 2d3a2629f571..955cc922858a 100644 --- a/javaunohelper/source/bootstrap.cxx +++ b/javaunohelper/source/bootstrap.cxx @@ -4,9 +4,9 @@ * * $RCSfile: bootstrap.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: rt $ $Date: 2005-09-07 18:42:16 $ + * last change: $Author: kz $ $Date: 2006-01-03 12:42:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -139,8 +139,7 @@ extern "C" JNIEXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstrap_cpp ::rtl::Reference< ::jvmaccess::UnoVirtualMachine > vm_access( ::javaunohelper::create_vm_access( jni_env, loader ) ); // wrap vm singleton entry - xContext = ::javaunohelper::install_vm_singleton( - xContext, vm_access->getVirtualMachine() ); + xContext = ::javaunohelper::install_vm_singleton( xContext, vm_access ); // get uno envs OUString cpp_env_name = OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME); |