#i20052#

2 files changed, 14 insertions, 6 deletions

diff --git a/jvmfwk/inc/jvmfwk/framework.h b/jvmfwk/inc/jvmfwk/framework.h
index bd20b541aa61..73db8cdbfbf6 100644
--- a/jvmfwk/inc/jvmfwk/framework.h
+++ b/jvmfwk/inc/jvmfwk/framework.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: framework.h,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: jl $ $Date: 2004-05-04 08:43:41 $
+ *  last change: $Author: jl $ $Date: 2004-05-07 14:49:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -105,7 +105,8 @@ typedef enum
     JFW_E_NO_PLUGIN,
     JFW_E_NOT_RECOGNIZED,
     JFW_E_FAILED_VERSION,
-    JFW_E_NO_JAVA_FOUND
+    JFW_E_NO_JAVA_FOUND,
+    JFW_E_VM_CREATION_FAILED
 } javaFrameworkError;
 
 /** an instance of this struct represents an installation of a Java
@@ -413,6 +414,11 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
     JFW_E_NEED_RESTART in the current process a different JRE has been selected
     which needs a prepared environment, which has to be done before the office
     process. Therefore the new JRE may not be used until the office was restarted.<br/>
+    JFW_E_NEED_RESTART is also returned when Java was disabled at the beginning and
+    then the user enabled it. If then the selected  JRE has the requirement
+    JFW_REQUIRE_NEEDRESTART then this error is returned. </br>
+    JFW_E_VM_CREATION_FAILED the creation of the JVM failed. The creation is performed
+    by a plug-in library and not by this API.
  */
 javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions,
                                  sal_Int32 nSize, JavaVM **ppVM,
diff --git a/jvmfwk/inc/jvmfwk/vendorplugin.h b/jvmfwk/inc/jvmfwk/vendorplugin.h
index 77c4fc539a5c..2369d49cf209 100644
--- a/jvmfwk/inc/jvmfwk/vendorplugin.h
+++ b/jvmfwk/inc/jvmfwk/vendorplugin.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: vendorplugin.h,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: jl $ $Date: 2004-05-05 14:11:17 $
+ *  last change: $Author: jl $ $Date: 2004-05-07 14:49:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,7 +84,8 @@ typedef enum
     JFW_PLUGIN_E_WRONG_VERSION_FORMAT,
     JFW_PLUGIN_E_FAILED_VERSION,
     JFW_PLUGIN_E_NO_JRE,
-    JFW_PLUGIN_E_WRONG_VENDOR
+    JFW_PLUGIN_E_WRONG_VENDOR,
+    JFW_PLUGIN_E_VM_CREATION_FAILED
 } javaPluginError;
 
 
@@ -135,6 +136,7 @@ javaPluginError getJavaInfoByPath(
     JFW_PLUGIN_E_ERROR,
     JFW_PLUGIN_E_WRONG_VENDOR
     JFW_PLUGIN_E_INVALID_ARG,
+    JFW_PLUGIN_E_VM_CREATION_FAILED
 
  */
 javaPluginError startJavaVirtualMachine(