[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-102-g0390f41
The following commit has been merged in the debian-experimental-3.5 branch:
commit 0390f41924829a2f9da9f6ac8e02f434ad6189d0
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Nov 24 15:45:52 2011 +0100
migrate mention-java-common-package.diff from libreoffice/build
diff --git a/changelog b/changelog
index b73ef13..6a60665 100644
--- a/changelog
+++ b/changelog
@@ -29,8 +29,9 @@ libreoffice (1:3.5.0~alpha0~git20111121-1) UNRELEASED; urgency=low
* update get-orig-source
* update most outdated README sections
* build needs the ext-sources
+ * migrate mention-java-common-package.diff from libreoffice/build
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 22 Nov 2011 22:06:18 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 24 Nov 2011 15:45:03 +0100
libreoffice (1:3.4.4-2) UNRELEASED; urgency=medium
diff --git a/patches/mention-java-common-package.diff b/patches/mention-java-common-package.diff
new file mode 100644
index 0000000..345227c
--- /dev/null
+++ b/patches/mention-java-common-package.diff
@@ -0,0 +1,60 @@
+Index: logit/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+===================================================================
+--- logit.orig/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx 2011-11-22 20:57:46.000000000 +0000
++++ logit/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx 2011-11-24 14:35:39.204393946 +0000
+@@ -172,6 +172,9 @@
+ 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)
+Index: logit/svtools/source/java/javainteractionhandler.cxx
+===================================================================
+--- logit.orig/svtools/source/java/javainteractionhandler.cxx 2011-11-22 20:57:46.000000000 +0000
++++ logit/svtools/source/java/javainteractionhandler.cxx 2011-11-24 14:42:13.836371593 +0000
+@@ -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
+ {
+
+@@ -156,6 +157,9 @@
+ WarningBox aWarningBox( NULL, SvtResId( WARNINGBOX_INVALIDJAVASETTINGS ) );
+ String aTitle( SvtResId(STR_WARNING_INVALIDJAVASETTINGS));
+ aWarningBox.SetText( aTitle );
++ String aText = String(aWarningBox.GetMessText());
++ aText.Append(DEFINE_CONST_UNICODE("\nPlease install the libreoffice-java-common package for this functionality."));
++ aWarningBox.SetMessText( aText );
+ nResult = aWarningBox.Execute();
+ }
+ else
+@@ -173,6 +177,9 @@
+ QueryBox aQueryBox( NULL, SvtResId( QBX_JAVADISABLED ) );
+ String aTitle( SvtResId( STR_QUESTION_JAVADISABLED ) );
+ aQueryBox.SetText( aTitle );
++ String aText = String(aQueryBox.GetMessText());
++ aText.Append(DEFINE_CONST_UNICODE("\nPlease install the libreoffice-java-common package for this functionality."));
++ aQueryBox.SetMessText( aText );
+ nResult = aQueryBox.Execute();
+ if ( nResult == RET_YES )
+ {
+@@ -215,6 +222,9 @@
+ ErrorBox aErrorBox(NULL, SvtResId( ERRORBOX_RESTARTREQUIRED ) );
+ String aTitle( SvtResId( STR_ERROR_RESTARTREQUIRED ) );
+ aErrorBox.SetText( aTitle );
++ String aText = String(aErrorBox.GetMessText());
++ aText.Append(DEFINE_CONST_UNICODE("\nPlease install the libreoffice-java-common package for this functionality."));
++ aErrorBox.SetMessText( aText );
+ nResult = aErrorBox.Execute();
+ }
+ else
diff --git a/patches/series b/patches/series
index 38ddb42..e374404 100644
--- a/patches/series
+++ b/patches/series
@@ -14,3 +14,4 @@ install-no-dependency-on-build.diff
cleanup-distro-install-file-lists.diff
smoketest-only-en-US.diff
getMIMEDescription-mismatch.diff
+mention-java-common-package.diff
--
LibreOffice packaging repository
Reply to: