diff options
| author | Joachim Lingner <jl@openoffice.org> | 2010-10-26 12:28:33 +0200 |
|---|---|---|
| committer | Joachim Lingner <jl@openoffice.org> | 2010-10-26 12:28:33 +0200 |
| commit | f1b79dae76ea0ba3d03854c121cfbd958fe86cee (patch) | |
| tree | 30ee3815a10d5f3e687b8199d8236672781e0ac7 /jvmfwk/inc | |
| parent | 95b9ae9cd7ba53bff25533397878d49adffebee0 (diff) | |
jl162 #i115180# fix problems with latest java 1.6.0_22 on MacOS 10.6
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 53914a3debed..7c3551f70116 100644 --- a/jvmfwk/inc/jvmfwk/framework.h +++ b/jvmfwk/inc/jvmfwk/framework.h @@ -830,6 +830,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 258833490ab7..15707b1bbe88 100644 --- a/jvmfwk/inc/jvmfwk/vendorplugin.h +++ b/jvmfwk/inc/jvmfwk/vendorplugin.h @@ -238,6 +238,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 |