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 | fe482e5c51b07c1b485e0d4d994c8f4870bf9707 (patch) | |
tree | 2d29889d5424113f332a99dd6e9617b978864a37 /javaunohelper | |
parent | 67dd2b8d68e5f7c4748f6498d4701c109bea5202 (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')
-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 bd6b6292f..163abdcd2 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); |