ooo-build r12269 - in branches/ooo-build-2-4: . patches/src680

[ccheney svn gnome org]

Author: ccheney
Date: Tue Apr 22 08:09:25 2008
New Revision: 12269
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12269&view=rev

Log:
2008-04-22  Chris Cheney  <ccheney ubuntu com>

        * patches/src680/apply,
          patches/src680/ubuntu-openoffice-java-common.diff: Add message to
          install openoffice.org-java-common package when attempting to use
          feature needing java.



Added:
   branches/ooo-build-2-4/patches/src680/ubuntu-openoffice-java-common.diff
Modified:
   branches/ooo-build-2-4/ChangeLog
   branches/ooo-build-2-4/patches/src680/apply

Modified: branches/ooo-build-2-4/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4/patches/src680/apply	(original)
+++ branches/ooo-build-2-4/patches/src680/apply	Tue Apr 22 08:09:25 2008
@@ -1783,6 +1783,7 @@
 #gccXXXXX.solenv.javaregistration.diff
 ubuntu-mstopdf.diff, ccheney
 ooo85931.inconsistent.getentrypos.diff, ccheney
+ubuntu-openoffice-java-common.diff, ccheney
 
 [ FedoraFixes ]
 ooo64508.vcl.honourfontconfighinting.diff

Added: branches/ooo-build-2-4/patches/src680/ubuntu-openoffice-java-common.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4/patches/src680/ubuntu-openoffice-java-common.diff	Tue Apr 22 08:09:25 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