From 9a36294079a13d713490ed754be441d9dbc214ce Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Wed, 16 Jan 2013 15:16:05 +0200
Subject: fdo#46808, Adapt java::JavaVirtualMachine UNO service to new style

Change-Id: Ib0329b9cdc4290ce98c4182e8466c1b44b408341
---
 vcl/source/window/syschild.cxx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'vcl')

diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index a107fc1ad7bd..9332bf11ac14 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -43,8 +43,7 @@
 
 #include <comphelper/processfactory.hxx>
 #include <jvmaccess/virtualmachine.hxx>
-#include <com/sun/star/java/XJavaVM.hpp>
-#include <com/sun/star/java/XJavaThreadRegister_11.hpp>
+#include <com/sun/star/java/JavaVirtualMachine.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 using namespace ::com::sun::star;
@@ -235,14 +234,14 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle( sal_Bool bUseJava )
 #ifdef SOLAR_JAVA
     else
     {
-        uno::Reference< lang::XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory() );
+        uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() );
 
         if( GetSystemData()->aWindow > 0 )
         {
             try
             {
                     ::rtl::Reference< ::jvmaccess::VirtualMachine > xVM;
-                    uno::Reference< java::XJavaVM >                 xJavaVM( xFactory->createInstance( rtl::OUString("com.sun.star.java.JavaVirtualMachine") ), uno::UNO_QUERY );
+                    uno::Reference< java::XJavaVM >                 xJavaVM = java::JavaVirtualMachine::create(xContext);;
                     uno::Sequence< sal_Int8 >                       aProcessID( 17 );
 
                     rtl_getGlobalProcessId( (sal_uInt8*) aProcessID.getArray() );
-- 
cgit