summaryrefslogtreecommitdiff
path: root/javaunohelper
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-01-03 11:42:29 +0000
committerKurt Zenker <kz@openoffice.org>2006-01-03 11:42:29 +0000
commit1122c8757bcad5d93dd2ffdc2492d3e6ef8f5fd4 (patch)
tree6003d73d67ab87fbe66a654c10d059141cacf851 /javaunohelper
parent2fc3c8a8e6b8dabb0cdefc6355013585d8fb85b6 (diff)
INTEGRATION: CWS sb44 (1.9.14); FILE MERGED
2005/12/12 16:00:05 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/javaunohelper.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx
index b94d5645bcb2..0a2e584f91dc 100644
--- a/javaunohelper/source/javaunohelper.cxx
+++ b/javaunohelper/source/javaunohelper.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: javaunohelper.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: rt $ $Date: 2005-09-07 18:42:30 $
+ * last change: $Author: kz $ $Date: 2006-01-03 12:42:29 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -283,8 +283,7 @@ Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactor
::rtl::Reference< ::jvmaccess::UnoVirtualMachine > vm_access(
::javaunohelper::create_vm_access( pJEnv, loader ) );
// wrap vm singleton entry
- xContext = ::javaunohelper::install_vm_singleton(
- xContext, vm_access->getVirtualMachine() );
+ xContext = ::javaunohelper::install_vm_singleton( xContext, vm_access );
rMSFac.set( xContext->getServiceManager(), UNO_QUERY_THROW );
// get uno envs