GNOME.org
 

ooo-build r11435 - in trunk: . patches/src680 scratch/sc-vba/testvba/TestDocuments scratch/sc-vba/testvba/TestDocuments/logs/unix

Author: pflin
Date: Tue Jan 29 06:47:43 2008
New Revision: 11435
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11435&view=rev

Log:
	*  patches/src680/cws-npower10.diff: fixed for the conversion
		between bytearray and string. 
		fixed for format function
	*  scratch/sc-vba/testvba/TestDocuments/format.xls
	*  scratch/sc-vba/testvba/TestDocuments/logs/unix/format.log



Added:
   trunk/scratch/sc-vba/testvba/TestDocuments/format.xls   (contents, props changed)
   trunk/scratch/sc-vba/testvba/TestDocuments/logs/unix/format.log
Modified:
   trunk/ChangeLog
   trunk/patches/src680/cws-npower10.diff

Modified: trunk/patches/src680/cws-npower10.diff
==============================================================================
--- trunk/patches/src680/cws-npower10.diff	(original)
+++ trunk/patches/src680/cws-npower10.diff	Tue Jan 29 06:47:43 2008
@@ -334,10 +334,10 @@
 ===================================================================
 RCS file: /cvs/script/basic/source/runtime/methods.cxx,v
 retrieving revision 1.77
-retrieving revision 1.77.34.5
-diff -u -p -b -w -B -r1.77 -r1.77.34.5
+retrieving revision 1.77.34.6
+diff -u -p -b -w -B -r1.77 -r1.77.34.6
 --- basic/source/runtime/methods.cxx	20 Sep 2007 15:55:04 -0000	1.77
-+++ basic/source/runtime/methods.cxx	7 Jan 2008 06:54:10 -0000	1.77.34.5
++++ basic/source/runtime/methods.cxx	29 Jan 2008 03:21:14 -0000	1.77.34.6
 @@ -1352,6 +1352,87 @@ RTLFUNC(Oct)
  	}
  }
@@ -539,7 +539,7 @@
 +	SvNumberFormatter* pFormatter;
 +	com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > 
 +		xFactory = comphelper::getProcessServiceFactory();
-+	pFormatter = new SvNumberFormatter( xFactory, LANGUAGE_ENGLISH_US );
++	pFormatter = new SvNumberFormatter( xFactory, LANGUAGE_ENGLISH );
 +
 +	sal_uInt32 nIndex;
 +	xub_StrLen nCheckPos = 0;
@@ -563,7 +563,7 @@
 +            else
 +            {
 +                rFmt.AssignAscii( pInfo->mpOOoFormat );
-+                pFormatter->PutandConvertEntry( rFmt, nCheckPos, nType, nIndex, LANGUAGE_ENGLISH_US, eLangType );
++                pFormatter->PutandConvertEntry( rFmt, nCheckPos, nType, nIndex, LANGUAGE_ENGLISH, eLangType );
 +            }
 +	        pFormatter->GetOutputString( nNumber, nIndex, aRetStr, &pCol );
 +        }
@@ -624,14 +624,14 @@
 +        }
 +        else
 +        {
-+            pFormatter->PutandConvertEntry( rFmt, nCheckPos, nType, nIndex, LANGUAGE_ENGLISH_US, eLangType );
++            pFormatter->PutandConvertEntry( rFmt, nCheckPos, nType, nIndex, LANGUAGE_ENGLISH, eLangType );
 +	        pFormatter->GetOutputString( nNumber, nIndex, aRetStr, &pCol );
 +        }
 +    }
 +    else
 +    {
 +        // text format
-+        pFormatter->PutandConvertEntry( rFmt, nCheckPos, nType, nIndex, LANGUAGE_ENGLISH_US, eLangType );
++        pFormatter->PutandConvertEntry( rFmt, nCheckPos, nType, nIndex, LANGUAGE_ENGLISH, eLangType );
 +	    pFormatter->GetOutputString( rStr, nIndex, aRetStr, &pCol );
 +    }
 +
@@ -1223,10 +1223,10 @@
 ===================================================================
 RCS file: /cvs/script/basic/source/sbx/sbxstr.cxx,v
 retrieving revision 1.7
-retrieving revision 1.7.20.1
-diff -u -p -b -w -B -r1.7 -r1.7.20.1
+retrieving revision 1.7.20.2
+diff -u -p -b -w -B -r1.7 -r1.7.20.2
 --- basic/source/sbx/sbxstr.cxx	13 Nov 2007 15:24:10 -0000	1.7
-+++ basic/source/sbx/sbxstr.cxx	7 Jan 2008 06:45:49 -0000	1.7.20.1
++++ basic/source/sbx/sbxstr.cxx	28 Jan 2008 09:42:55 -0000	1.7.20.2
 @@ -43,6 +43,9 @@
  #include "sbxconv.hxx"
  #include "sbxres.hxx"
@@ -1237,11 +1237,12 @@
  // AB 29.10.99 Unicode
  #ifndef _USE_NO_NAMESPACE
  using namespace rtl;
-@@ -102,6 +105,13 @@ XubString ImpGetString( const SbxValues*
+@@ -102,6 +105,14 @@ XubString ImpGetString( const SbxValues*
  			SbxValue* pVal = PTR_CAST(SbxValue,p->pObj);
  			if( pVal )
  				aRes = pVal->GetString();
-+			else if( p->pObj && (p->pObj->GetType() & (SbxARRAY | SbxBYTE )) )
++			else if( p->pObj && p->pObj->IsFixed()
++					&& (p->pObj->GetType() & (SbxARRAY | SbxBYTE )) )
 +			{
 +				// convert byte array to string
 +				SbxArray* pArr = PTR_CAST(SbxArray, p->pObj);
@@ -1251,7 +1252,7 @@
  			else
  				SbxBase::SetError( SbxERR_NO_OBJECT );
  			break;
-@@ -257,3 +267,59 @@ void ImpPutString( SbxValues* p, const X
+@@ -257,3 +268,59 @@ void ImpPutString( SbxValues* p, const X
  	delete pTmp;
  }
  
@@ -1315,16 +1316,16 @@
 ===================================================================
 RCS file: /cvs/script/basic/source/sbx/sbxvalue.cxx,v
 retrieving revision 1.10
-retrieving revision 1.10.40.1
-diff -u -p -b -w -B -r1.10 -r1.10.40.1
+retrieving revision 1.10.40.2
+diff -u -p -b -w -B -r1.10 -r1.10.40.2
 --- basic/source/sbx/sbxvalue.cxx	30 Aug 2007 10:02:21 -0000	1.10
-+++ basic/source/sbx/sbxvalue.cxx	7 Jan 2008 06:45:49 -0000	1.10.40.1
++++ basic/source/sbx/sbxvalue.cxx	28 Jan 2008 09:42:55 -0000	1.10.40.2
 @@ -333,6 +333,30 @@ SbxValue& SbxValue::operator=( const Sbx
  			SetError( SbxERR_PROP_READONLY );
  		else
  		{
 +			// string -> byte array
-+			if( (aData.eType == SbxOBJECT)
++			if( IsFixed() && (aData.eType == SbxOBJECT)
 +				&& aData.pObj && ( aData.pObj->GetType() & (SbxARRAY | SbxBYTE) )		   	
 +				&& (r.aData.eType == SbxSTRING) )
 +			{
@@ -1334,7 +1335,7 @@
 +				return *this;
 +			}
 +			// byte array -> string
-+			if( (r.aData.eType == SbxOBJECT)
++			if( r.IsFixed() && (r.aData.eType == SbxOBJECT)
 +				&& r.aData.pObj && ( r.aData.pObj->GetType() & (SbxARRAY | SbxBYTE) )
 +				&& (aData.eType == SbxSTRING) )
 +			{

Added: trunk/scratch/sc-vba/testvba/TestDocuments/format.xls
==============================================================================
Binary file. No diff available.

Added: trunk/scratch/sc-vba/testvba/TestDocuments/logs/unix/format.log
==============================================================================
--- (empty file)
+++ trunk/scratch/sc-vba/testvba/TestDocuments/logs/unix/format.log	Tue Jan 29 06:47:43 2008
@@ -0,0 +1,82 @@
+Test run started : 01/29/2008 02:38:27 PM
+BEGIN Format
+ TEST START : Test Predefined_Datetime_Format_Sample function
+  ITEM Assertion OK : General Date: 1/6/98
+  ITEM Assertion OK : Long Date: Tuesday, January 06, 1998
+  ITEM Assertion FAIL : Medium Date: 06-Jan-1998
+  ITEM Assertion OK : Short Date: 1/6/98
+  ITEM Assertion FAIL : Long Time: 05:08:06 PM
+  ITEM Assertion OK : Medium Time: 05:08 PM
+  ITEM Assertion OK : Short Time: 17:08
+ TEST OK : Test Predefined_Datetime_Format_Sample function
+ TEST START : Test Predefined_Number_Format_Sample function
+  ITEM Assertion OK : General Number: 562486.2356
+  ITEM Assertion OK : General Number: -3456.789
+  ITEM Assertion OK : General Number: 213.21
+  ITEM Assertion OK : Currency: $562,486.24
+  ITEM Assertion OK : Fixed: 0.20
+  ITEM Assertion OK : Standard: 562,486.24
+  ITEM Assertion OK : Percent: 75.21%
+  ITEM Assertion OK : Scientific: 5.62E+05
+  ITEM Assertion OK : Scientific: -3.46E+03
+  ITEM Assertion OK : Yes/No: No
+  ITEM Assertion OK : Yes/No: Yes
+  ITEM Assertion OK : True/False: False
+  ITEM Assertion OK : True/False: True
+  ITEM Assertion OK : On/Off: Off
+  ITEM Assertion OK : On/Off: On
+ TEST OK : Test Predefined_Number_Format_Sample function
+ TEST START : Test Custom_Datetime_Format_Sample function
+  ITEM Assertion FAIL : c: 1/6/98 05:08:06 PM
+  ITEM Assertion OK : dddddd: Tuesday, January 06, 1998
+  ITEM Assertion OK : mm-dd-yyyy: 01-06-1998
+  ITEM Assertion OK : d: 6
+  ITEM Assertion OK : dd: 06
+  ITEM Assertion OK : ddd: Tue
+  ITEM Assertion OK : dddd: Tuesday
+  ITEM Assertion OK : ddddd: 1/6/98
+  ITEM Assertion OK : h: 5
+  ITEM Assertion OK : hh: 05
+  ITEM Assertion OK : n: 8
+  ITEM Assertion OK : nn: 08
+  ITEM Assertion OK : m: 1
+  ITEM Assertion OK : mm: 01
+  ITEM Assertion OK : mmm: Jan
+  ITEM Assertion OK : mmmm: January
+  ITEM Assertion FAIL : q: Q1
+  ITEM Assertion OK : s: 6
+  ITEM Assertion OK : ss: 06
+  ITEM Assertion FAIL : ttttt: 05:08:06 AM
+  ITEM Assertion OK : hh:mm:ss AM/PM: 05:08:06 PM
+  ITEM Assertion FAIL : hh:mm:ss am/pm: 05:08:06 PM
+  ITEM Assertion FAIL : hh:mm:ss A/P: 05:08:06 p
+  ITEM Assertion OK : hh:mm:ss a/p: 05:08:06 p
+  ITEM Assertion OK : hh:mm:ss: 17:08:06
+  ITEM Assertion OK : ww: 2
+  ITEM Assertion OK : w: 3
+  ITEM Assertion OK : y: 6
+  ITEM Assertion OK : yy: 98
+  ITEM Assertion OK : yyyy: 1998
+ TEST OK : Test Custom_Datetime_Format_Sample function
+ TEST START : Test Custom_Number_Format_Sample function
+  ITEM Assertion OK : 00.0000: 23.6750
+  ITEM Assertion OK : 00.00: 23.68
+  ITEM Assertion OK : 00000: 02658
+  ITEM Assertion OK : 00.00: 2658.00
+  ITEM Assertion OK : ##.####: 23.675
+  ITEM Assertion OK : ##.##: 23.68
+  ITEM Assertion OK : #,###.##: 12,345.25
+  ITEM Assertion OK : ##.00%: 25.00%
+  ITEM Assertion OK : #,###: 1,000,000
+  ITEM Assertion OK : ######E-###: 109838E-5
+  ITEM Assertion OK : $#,###.##: $2,345.25
+  ITEM Assertion OK : ##.###\%: .25%
+ TEST OK : Test Custom_Number_Format_Sample function
+ TEST START : Test Custom_Text_Format_Sample function
+  ITEM Assertion FAIL : \* \*@@@@@: *VBA*VBAVBAVBAVBAVBA
+  ITEM Assertion FAIL : \*&&\*&&&&: VBA
+  ITEM Assertion OK : <: vba
+  ITEM Assertion OK : >: VBA
+ TEST OK : Test Custom_Text_Format_Sample function
+END  Format
+Test run finished : 01/29/2008 02:38:27 PM
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]