diff options
| author | Noel Grandin <noel@peralex.com> | 2013-01-16 15:16:05 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-02-11 08:02:10 +0200 |
| commit | 9a36294079a13d713490ed754be441d9dbc214ce (patch) | |
| tree | 6bd7c23e2cdfba1d03dedf689646e67bae0cca54 /udkapi | |
| parent | 7841fd1536e018defaf9cbeb283cb82b687f95e1 (diff) | |
fdo#46808, Adapt java::JavaVirtualMachine UNO service to new style
Change-Id: Ib0329b9cdc4290ce98c4182e8466c1b44b408341
Diffstat (limited to 'udkapi')
| -rw-r--r-- | udkapi/UnoApi_udkapi.mk | 6 | ||||
| -rw-r--r-- | udkapi/com/sun/star/java/JavaVirtualMachine.idl | 17 |
2 files changed, 6 insertions, 17 deletions
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk index e043fc951ddc..2d8abc63a9db 100644 --- a/udkapi/UnoApi_udkapi.mk +++ b/udkapi/UnoApi_udkapi.mk @@ -68,9 +68,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/io,\ TextInputStream \ TextOutputStream \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/java,\ - JavaVirtualMachine \ -)) $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/lang,\ MultiServiceFactory \ RegistryServiceManager \ @@ -122,6 +119,9 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/io,\ SequenceOutputStream \ TempFile \ )) +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/java,\ + JavaVirtualMachine \ +)) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/reflection,\ theCoreReflection \ ProxyFactory \ diff --git a/udkapi/com/sun/star/java/JavaVirtualMachine.idl b/udkapi/com/sun/star/java/JavaVirtualMachine.idl index 92e4375a526a..e5d049d21662 100644 --- a/udkapi/com/sun/star/java/JavaVirtualMachine.idl +++ b/udkapi/com/sun/star/java/JavaVirtualMachine.idl @@ -19,30 +19,19 @@ #ifndef __com_sun_star_java_JavaVirtualMachine_idl__ #define __com_sun_star_java_JavaVirtualMachine_idl__ +#include <com/sun/star/java/XJavaVM.idl> module com { module sun { module star { module java { - published interface XJavaVM; - published interface XJavaThreadRegister_11; - -// DocMerge from xml: service com::sun::star::java::JavaVirtualMachine -/** exports interfaces to handle a JavaVM and Java threads. +/** Exports interfaces to handle a Java VM. @deprecated A UNO service seems to be at the wrong abstraction level for this functionality. This should probably be replaced by an appropriate C/C++ API. */ -published service JavaVirtualMachine -{ - // DocMerge: empty anyway - interface XJavaVM; - - // DocMerge: empty anyway - interface XJavaThreadRegister_11; - -}; +published service JavaVirtualMachine : XJavaVM; }; }; }; }; |