apply build repository patch mention-java-common-package.diff

information from the apply file:
patchname: mention-java-common-package.diff
issues:
author: ccheney
section: DebianBaseOnly
comment:
read variables from /etc/libreoffice/sofficerc, since /usr/lib/libreoffice/sofficerc
just refers to it
sectioncomment:

git log from build repository:
commit 43612a09de99a32abf67881c57c73c5509c18037
Author: Rene Engelhard <rene@debian.org>
Date:   Tue May 24 18:17:00 2011 +0000

make some Debian(Base)Only patches apply again

commit ade47e691533fed678cbd6206272105fe31d592f
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Feb 19 19:40:21 2011 +0100

fix javaldx' -java-common message

merge ubuntu-javaldx.diff into mention-java-common-package.diff
and s/openoffice.org/libreoffice/
diff --git a/patches/dev300/mention-java-common-package.diff b/patches/dev300/mention-java-common-package.diff
index 597d6eb..766d0a0 100644
--- a/patches/dev300/mention-java-common-package.diff
+++ b/patches/dev300/mention-java-common-package.diff

commit 46631dbc8014483416d74741cb38b6506a71489d
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Jan 11 20:23:06 2011 +0100

(DebianBaseOnly) openoffice.org-java-common -> libreoffice-java-common

2 files changed, 8 insertions, 1 deletions

diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 8567d79f9b0e..db6251432ff9 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -170,6 +170,9 @@ static bool findAndSelect(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/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx
index e4bf442ed42d..3d48f6ca495b 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.cxx
@@ -52,9 +52,10 @@
 #include <svtools/javainteractionhandler.hxx>
 #include <svtools/javacontext.hxx>
 
+#define DEFINE_CONST_UNICODE(CONSTASCII) UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))
+
 using namespace com::sun::star::uno;
 using namespace com::sun::star::task;
-
 namespace svt
 {
 
@@ -138,6 +139,7 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
             m_bJavaNotFound_Handled = true;
             WarningBox aWarningBox( NULL, SvtResId( WARNINGBOX_JAVANOTFOUND ) );
             String aTitle( SvtResId( STR_WARNING_JAVANOTFOUND ) );
+            aTitle.Append(DEFINE_CONST_UNICODE("\nPlease install the libreoffice-java-common package for this functionality and/or check your Java settings."));
             aWarningBox.SetText( aTitle );
             nResult = aWarningBox.Execute();
         }
@@ -155,6 +157,7 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
             m_bInvalidSettings_Handled = true;
             WarningBox aWarningBox( NULL, SvtResId( WARNINGBOX_INVALIDJAVASETTINGS ) );
             String aTitle( SvtResId(STR_WARNING_INVALIDJAVASETTINGS));
+            aTitle.Append(DEFINE_CONST_UNICODE("\nPlease install the libreoffice-java-common package for this functionality and/or check your Java settings."));
             aWarningBox.SetText( aTitle );
             nResult = aWarningBox.Execute();
         }
@@ -196,6 +199,7 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
             m_bVMCreationFailure_Handled = true;
             ErrorBox aErrorBox( NULL, SvtResId( ERRORBOX_JVMCREATIONFAILED ) );
             String aTitle( SvtResId( STR_ERROR_JVMCREATIONFAILED ) );
+            aTitle.Append(DEFINE_CONST_UNICODE("\nPlease install the libreoffice-java-common package for this functionality and/or check your Java settings."));
             aErrorBox.SetText( aTitle );
             nResult = aErrorBox.Execute();
         }