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

[pmladek svn gnome org]

Author: pmladek
Date: Thu May 22 18:43:51 2008
New Revision: 12636
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12636&view=rev

Log:
2008-05-22  Petr Mladek  <pmladek suse cz>

	* patches/src680/jvmfwk-detect-removed-java-2.diff:
	* patches/src680/apply: allow to overwrite broken java configuration;
	  it is related to jvmfwk-detect-removed-java.diff that added new types
	  of errors (i#83140, n#393719)



Added:
   branches/ooo-build-2-4/patches/src680/jvmfwk-detect-removed-java-2.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	Thu May 22 18:43:51 2008
@@ -441,6 +441,9 @@
 
 # try autodetection if it is allowed and the current java has been removed
 jvmfwk-detect-removed-java.diff, i#83140, n#336242, pmladek
+# allow to overwrite broken java configuration; it is related
+# to jvmfwk-detect-removed-java.diff that added new types of errors
+jvmfwk-detect-removed-java-2.diff, i#83140, n#393719, pmladek
 
 # allow dmake create_patch produce diffable patches
 solenv-dmake-create_patch.diff, i#68917, fridrich

Added: branches/ooo-build-2-4/patches/src680/jvmfwk-detect-removed-java-2.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4/patches/src680/jvmfwk-detect-removed-java-2.diff	Thu May 22 18:43:51 2008
@@ -0,0 +1,24 @@
+--- jvmfwk/source/framework.cxx.old	2008-05-21 21:46:16.000000000 +0200
++++ jvmfwk/source/framework.cxx	2008-05-22 20:02:15.000000000 +0200
+@@ -885,7 +885,8 @@ javaFrameworkError SAL_CALL jfw_setSelec
+ 		//check if pInfo is the selected JRE
+ 		JavaInfo *currentInfo = NULL;
+ 		errcode = jfw_getSelectedJRE( & currentInfo);
+-		if (errcode != JFW_E_NONE && errcode != JFW_E_INVALID_SETTINGS)
++		if (errcode != JFW_E_NONE && errcode != JFW_E_INVALID_SETTINGS &&
++		    errcode != JFW_E_TRY_AUTOSELECT && errcode != JFW_E_CONFIGURATION )
+ 			return errcode;
+ 	    
+ 		if (jfw_areEqualJavaInfo(currentInfo, pInfo) == sal_False)
+--- svx/source/dialog/optjava.cxx.old	2007-06-27 19:28:51.000000000 +0200
++++ svx/source/dialog/optjava.cxx	2008-05-22 19:58:25.000000000 +0200
+@@ -750,7 +750,8 @@ BOOL SvxJavaOptionsPage::FillItemSet( Sf
+ 
+ 			JavaInfo* pSelectedJava = NULL;
+ 			eErr = jfw_getSelectedJRE( &pSelectedJava );
+-			if ( JFW_E_NONE == eErr || JFW_E_INVALID_SETTINGS == eErr )
++			if ( JFW_E_NONE == eErr || JFW_E_INVALID_SETTINGS == eErr ||
++			     JFW_E_TRY_AUTOSELECT == eErr || JFW_E_CONFIGURATION == eErr )
+ 			{
+ 				if (pSelectedJava == NULL || !jfw_areEqualJavaInfo( pInfo, pSelectedJava ) )
+ 				{