[Libreoffice-commits] .: patches/dev300

[Bjoern Michaelsen]

 patches/dev300/apply                            |    1 
 patches/dev300/mention-java-common-package.diff |   56 ------------------------
 2 files changed, 57 deletions(-)

New commits:
commit bd4f6ffc37e76996f97368bc73844ce68e63acbe
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Nov 24 15:51:28 2011 +0100

    remove mention-java-common-package.diff, downstreamed to debian-experimental-3.5

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ce5a4d6..9967d1a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -345,7 +345,6 @@ debian-default-cairo-disable.diff
 # read variables from /etc/libreoffice/sofficerc, since /usr/lib/libreoffice/sofficerc
 # just refers to it
 oosplash-etc-libreoffice-sofficerc.diff
-mention-java-common-package.diff, ccheney
 
 # mention openoffice.org-report-builder instead of getting people
 # to download it from elsewhere
diff --git a/patches/dev300/mention-java-common-package.diff b/patches/dev300/mention-java-common-package.diff
deleted file mode 100644
index 766d0a0..0000000
--- a/patches/dev300/mention-java-common-package.diff
+++ /dev/null
@@ -1,56 +0,0 @@
---- svtools/source/java/javainteractionhandler.cxx~	2008-04-21 21:43:59.249678235 +0200
-+++ svtools/source/java/javainteractionhandler.cxx	2008-04-21 22:12:26.615433459 +0200
-@@ -75,9 +75,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
- {
- 
-@@ -184,6 +185,9 @@
-                 aTitle = String( SvtResId( STR_WARNING_JAVANOTFOUND ));
- 
-             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();
- 
-         }
-@@ -256,6 +260,9 @@
-                 aTitle = String( 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 )
-             {
-@@ -297,6 +304,9 @@
-                 aTitle = String( SvtResId(STR_ERROR_JVMCREATIONFAILED));
- 
-             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
---- jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx.orig	2008-04-11 05:19:31.000000000 -0500
-+++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx	2009-03-05 19:54:38.000000000 -0600
-@@ -111,6 +111,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)