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

[pflin svn gnome org]

Author: pflin
Date: Wed Sep 17 07:49:15 2008
New Revision: 13906
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13906&view=rev

Log:
2008-09-17  Fong Lin  <pflin novell com>
	* patches/dev300/apply: 
	* patches/vba/vba-variant-fix.diff: fix the issue of variant + string



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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Sep 17 07:49:15 2008
@@ -1623,6 +1623,8 @@
 vba-allow-forms-resetvalue-binding.diff
 # n#426415
 fix-vba-NOT-trigger-update.diff
+# variant + string
+vba-variant-fix.diff, Fong
 [ VBAUntested ]
 SectionOwner => noelpwer
 vba-basic-null.diff i#85349, jjiao

Added: trunk/patches/vba/vba-variant-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/vba-variant-fix.diff	Wed Sep 17 07:49:15 2008
@@ -0,0 +1,13 @@
+--- basic/source/sbx/sbxvalue.cxx.orig	2008-09-17 14:56:02.000000000 +0800
++++ basic/source/sbx/sbxvalue.cxx	2008-09-17 15:11:36.000000000 +0800
+@@ -1147,8 +1147,8 @@ BOOL SbxValue::Compute( SbxOperator eOp,
+ 	{
+ 		SbxValues aL, aR;
+ 		bool bDecimal = false;
+-		if( bVBAInterop && ( ( eThisType == SbxSTRING && eOpType != SbxSTRING ) || 
+-			 ( eThisType != SbxSTRING && eOpType == SbxSTRING ) ) &&
++		if( bVBAInterop && ( ( eThisType == SbxSTRING && eOpType != SbxSTRING && eOpType != SbxEMPTY ) || 
++			 ( eThisType != SbxSTRING && eThisType != SbxEMPTY && eOpType == SbxSTRING ) ) &&
+ 			 ( eOp == SbxMUL || eOp == SbxDIV || eOp == SbxPLUS || eOp == SbxMINUS ) )
+ 		{
+ 			goto Lbl_OpIsDouble;