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

[pflin svn gnome org]

Author: pflin
Date: Tue Jul 22 07:37:47 2008
New Revision: 13338
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13338&view=rev

Log:
2008-07-22  Fong Lin  <pflin novell com>
	* patches/vba/bytearray-string-fix.diff:Fixed for i#91911
	* patches/dev300/apply: apply the new patch.



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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jul 22 07:37:47 2008
@@ -1703,6 +1703,7 @@
 vba-worksheet-fix-n403974.diff, n#403974, Fong
 # Fixed for n#407805
 basic-not-is-nothing.diff, n#407805, Fong
+bytearray-string-fix.diff, i#91911, Fong
 
 [ VBAUntested ]
 SectionOwner => noelpwer

Added: trunk/patches/vba/bytearray-string-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/bytearray-string-fix.diff	Tue Jul 22 07:37:47 2008
@@ -0,0 +1,31 @@
+--- basic/source/sbx/sbxstr.cxx.orig	2008-07-22 13:53:07.000000000 +0800
++++ basic/source/sbx/sbxstr.cxx	2008-07-22 14:25:53.000000000 +0800
+@@ -98,7 +98,7 @@ XubString ImpGetString( const SbxValues*
+ 			if( pVal )
+ 				aRes = pVal->GetString();
+ 			else if( p->pObj && p->pObj->IsFixed()
+-					&& (p->pObj->GetType() & (SbxARRAY | SbxBYTE )) )
++					&& (p->pObj->GetType() == (SbxARRAY | SbxBYTE )) )
+ 			{
+ 				// convert byte array to string
+ 				SbxArray* pArr = PTR_CAST(SbxArray, p->pObj);
+--- basic/source/sbx/sbxvalue.cxx.orig	2008-07-22 13:54:30.000000000 +0800
++++ basic/source/sbx/sbxvalue.cxx	2008-07-22 14:25:47.000000000 +0800
+@@ -309,7 +309,7 @@ SbxValue& SbxValue::operator=( const Sbx
+ 		{
+ 			// string -> byte array
+ 			if( IsFixed() && (aData.eType == SbxOBJECT)
+-				&& aData.pObj && ( aData.pObj->GetType() & (SbxARRAY | SbxBYTE) )		   	
++				&& aData.pObj && ( aData.pObj->GetType() == (SbxARRAY | SbxBYTE) )		   	
+ 				&& (r.aData.eType == SbxSTRING) )
+ 			{
+ 				String aStr = r.GetString();
+@@ -319,7 +319,7 @@ SbxValue& SbxValue::operator=( const Sbx
+ 			}
+ 			// byte array -> string
+ 			if( r.IsFixed() && (r.aData.eType == SbxOBJECT)
+-				&& r.aData.pObj && ( r.aData.pObj->GetType() & (SbxARRAY | SbxBYTE) )
++				&& r.aData.pObj && ( r.aData.pObj->GetType() == (SbxARRAY | SbxBYTE) )
+ 				&& (aData.eType == SbxSTRING) )
+ 			{
+ 				SbxBase* pObj = r.GetObject();