ooo-build r12855 - in trunk: . patches/dev300 patches/vba

[pflin svn gnome org]

Author: pflin
Date: Wed Jun 11 02:03:23 2008
New Revision: 12855
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12855&view=rev

Log:
	* patches/dev300/apply: fixe for n#397438. 
	* patches/vba/vba-empty-comparison-fix.diff: 


Added:
   trunk/patches/vba/vba-empty-comparison-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jun 11 02:03:23 2008
@@ -1513,6 +1513,8 @@
 # add support for passing a caller to basic when calling a script
 # via the scripting framework - note depends on vbaevents-services-sources.diff
 basic-caller-support-dev300.diff
+# comparison of tow empty type fix in vba mode
+vba-empty-comparison-fix.diff, n#397438, Fong
 [ VBAUntested ]
 SectionOwner => noelpwer
 # total hack at the moment, getting smaller

Added: trunk/patches/vba/vba-empty-comparison-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/vba-empty-comparison-fix.diff	Wed Jun 11 02:03:23 2008
@@ -0,0 +1,11 @@
+--- basic/source/sbx/sbxvalue.cxx.orig	2008-06-10 12:50:41.000000000 +0800
++++ basic/source/sbx/sbxvalue.cxx	2008-06-10 12:55:14.000000000 +0800
+@@ -1470,7 +1470,7 @@ BOOL SbxValue::Compare( SbxOperator eOp,
+ 		bRes = TRUE;
+     }
+ 	else if( GetType() == SbxEMPTY && rOp.GetType() == SbxEMPTY )
+-		bRes = TRUE;
++		bRes = !bVBAInterop ? TRUE : ( eOp == SbxEQ ? TRUE : FALSE );
+ 	// Sonderregel 1: Ist ein Operand Null, ist das Ergebnis FALSE
+ 	else if( GetType() == SbxNULL || rOp.GetType() == SbxNULL )
+ 		bRes = FALSE;