diff options
author | Jan Holesovsky <kendy@suse.cz> | 2010-11-01 13:54:58 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2010-11-01 13:54:58 +0100 |
commit | 752d233ca1dbf78d1d3a333defb4295f700c7ff9 (patch) | |
tree | 015fec17f8e4a02164abc501ee0da985f940ba97 /jvmfwk/inc | |
parent | 22c1a4834e8210e0bdb4fbfdf78b0b66014aab28 (diff) | |
parent | 087651450c6aa121ea0f1830e7d8224c79588e41 (diff) |
Merge commit 'ooo/OOO330_m13'
Diffstat (limited to 'jvmfwk/inc')
-rw-r--r-- | jvmfwk/inc/jvmfwk/framework.h | 1 | ||||
-rw-r--r-- | jvmfwk/inc/jvmfwk/vendorplugin.h | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/jvmfwk/inc/jvmfwk/framework.h b/jvmfwk/inc/jvmfwk/framework.h index f4b59986b5bf..11cca539cb05 100644 --- a/jvmfwk/inc/jvmfwk/framework.h +++ b/jvmfwk/inc/jvmfwk/framework.h @@ -831,6 +831,7 @@ javaFrameworkError SAL_CALL jfw_getJRELocations( JFW_E_NONE the function ran successfully.</br> JFW_E_ERROR an error occurred during execution.</br> JFW_E_INVALID_ARG pInfo contains invalid data</br> + JFW_E_NO_PLUGIN a plug-in library could not be found.<br/> */ javaFrameworkError SAL_CALL jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist); diff --git a/jvmfwk/inc/jvmfwk/vendorplugin.h b/jvmfwk/inc/jvmfwk/vendorplugin.h index 5b2b4f7ab84e..3ccbb0e487f4 100644 --- a/jvmfwk/inc/jvmfwk/vendorplugin.h +++ b/jvmfwk/inc/jvmfwk/vendorplugin.h @@ -239,6 +239,25 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( +/** checks if the installation of the jre still exists. + + This function checks if the JRE described by pInfo still + exists. The check must be very quick because it is called by javaldx + (Linux, Solaris) at start up. + + @param pInfo + [in] the JavaInfo object with information about the JRE. + @param pp_exist + [out] the parameter is set to either sal_True or sal_False. The value is + only valid if the function returns JFW_E_NONE. + + @return + JFW_PLUGIN_E_NONE the function ran successfully.</br> + JFW_PLUGIN_E_ERROR an error occurred during execution.</br> + JFW_PLUGIN_E_INVALID_ARG pInfo contains invalid data</br> + */ +javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist); + #ifdef __cplusplus } #endif |