[Libreoffice-commits] .: Branch 'libreoffice-3-3' - patches/dev300

René Engelhard rene at kemper.freedesktop.org
Tue Jan 11 11:26:55 PST 2011


 patches/dev300/apply                              |    2 -
 patches/dev300/mention-java-common-package.diff   |   44 ++++++++++++++++++++++
 patches/dev300/ubuntu-openoffice-java-common.diff |   44 ----------------------
 3 files changed, 45 insertions(+), 45 deletions(-)

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

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

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 70f28fd..c47179f 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -539,7 +539,7 @@ gcj-32bit-runtime-path.diff, i#64888, mklose
 # read variables from /etc/libreoffice/sofficerc, since /usr/lib/libreoffice/sofficerc
 # just refers to it
 oosplash-etc-libreoffice-sofficerc.diff
-ubuntu-openoffice-java-common.diff, ccheney
+mention-java-common-package.diff, ccheney
 ubuntu-javaldx.diff, ccheney
 
 # mention openoffice.org-report-builder instead of getting people
diff --git a/patches/dev300/mention-java-common-package.diff b/patches/dev300/mention-java-common-package.diff
new file mode 100644
index 0000000..597d6eb
--- /dev/null
+++ b/patches/dev300/mention-java-common-package.diff
@@ -0,0 +1,44 @@
+--- 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
diff --git a/patches/dev300/ubuntu-openoffice-java-common.diff b/patches/dev300/ubuntu-openoffice-java-common.diff
deleted file mode 100644
index b8f9465..0000000
--- a/patches/dev300/ubuntu-openoffice-java-common.diff
+++ /dev/null
@@ -1,44 +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 openoffice.org-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 openoffice.org-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 openoffice.org-java-common package for this functionality."));
-+            aErrorBox.SetMessText( aText );
-             nResult = aErrorBox.Execute();
-         }
-         else


More information about the Libreoffice-commits mailing list