mention-java-common-package

Gbp-Pq: Name mention-java-common-package.diff

diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 8649bd121b89e9a8f94a6381e0d5292e62d358ec..c9757d527ed9245e0a2c1bc74431f4ff721de5b0 100644 (file)
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -144,6 +144,9 @@ static bool findAndSelect(std::unique_ptr<JavaInfo> * ppInfo)
     if (errcode == JFW_E_NO_JAVA_FOUND)
     {
         fprintf(stderr,"javaldx: Could not find a Java Runtime Environment!\n");
+        fprintf(stderr,"Please ensure that a JVM and the package libreoffice-java-common\n");
+        fprintf(stderr,"is installed.\n");
+        fprintf(stderr,"If it is already installed then try removing ~/.libreoffice/3/user/config/javasettings_Linux_*.xml\n");
         return false;
     }
     else if (errcode != JFW_E_NONE && errcode != JFW_E_DIRECT_MODE)

diff --git a/svtools/source/java/javaerror.src b/svtools/source/java/javaerror.src
index 60d7c720ebeb0df33cc4692163fd887281e2bf83..588f034f1f7476fa21b77199c30849cd1bbbba31 100644 (file)
--- a/svtools/source/java/javaerror.src
+++ b/svtools/source/java/javaerror.src
@@ -21,7 +21,7 @@
 
 String STR_WARNING_JAVANOTFOUND
 {
-    Text [ en-US ] ="%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE and restart %PRODUCTNAME.";
+    Text [ en-US ] ="%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE (and libreoffice-java-common) and restart %PRODUCTNAME.";
 };
 
 String STR_WARNING_JAVANOTFOUND_MAC
@@ -36,7 +36,7 @@ String STR_WARNING_INVALIDJAVASETTINGS_MAC
 
 String STR_WARNING_INVALIDJAVASETTINGS
 {
-    Text [ en-US ] ="The %PRODUCTNAME configuration has been changed. Under Tools - Options - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME.";
+    Text [ en-US ] ="The %PRODUCTNAME configuration has been changed. Under Tools - Options - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME. Maybe you also need to install libreoffice-java-common";
 };
 
 String STR_ERROR_JVMCREATIONFAILED_MAC
@@ -46,7 +46,7 @@ String STR_ERROR_JVMCREATIONFAILED_MAC
 
 String STR_ERROR_JVMCREATIONFAILED
 {
-    Text[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Advanced.";
+    Text[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Advanced or install libreoffice-java-common if not already installed.";
 };
 
 String STR_WARNING_JAVANOTFOUND_TITLE