ooo-build r12477 - trunk/patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue May  6 14:46:04 2008
New Revision: 12477
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12477&view=rev

Log:
actually add

Added:
   trunk/patches/dev300/ubuntu-openoffice-java-common.diff

Added: trunk/patches/dev300/ubuntu-openoffice-java-common.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/ubuntu-openoffice-java-common.diff	Tue May  6 14:46:04 2008
@@ -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 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