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



Author: pflin
Date: Fri Sep  5 07:13:24 2008
New Revision: 13803
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13803&view=rev

Log:
2008-09-05  Fong Lin  <pflin novell com>
	* patches/vba/vba-datevalue-function-fix.diff:
	* patches/vba/vba-window-api-fix.diff:
	* patches/dev300/apply: Fixed some regression test issue.
	* scratch/sc-vba/testvba/TestDocuments/format.xls:
	* scratch/sc-vba/testvba/TestDocuments/window2.xls:
	* scratch/sc-vba/testvba/TestDocuments/logs/unix/replace.log:
	* scratch/sc-vba/testvba/TestDocuments/logs/unix/format.log:
	* scratch/sc-vba/testvba/TestDocuments/logs/unix/window2.log.



Added:
   trunk/patches/vba/vba-datevalue-function-fix.diff
   trunk/patches/vba/vba-window-api-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/scratch/sc-vba/testvba/TestDocuments/format.xls
   trunk/scratch/sc-vba/testvba/TestDocuments/logs/unix/format.log
   trunk/scratch/sc-vba/testvba/TestDocuments/logs/unix/replace.log
   trunk/scratch/sc-vba/testvba/TestDocuments/logs/unix/window2.log
   trunk/scratch/sc-vba/testvba/TestDocuments/window2.xls

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Sep  5 07:13:24 2008
@@ -1620,6 +1620,10 @@
 vba-rowheight-fix.diff, n#422688
 # fix crash when hiding userform controls
 vba-fix-userform-hidecontrolcrash.diff
+# fix datevalue function in non-en_US locale
+vba-datevalue-function-fix.diff, Fong
+# fix window.SplitRow issue
+vba-window-api-fix.diff, Fong
 [ VBAUntested ]
 SectionOwner => noelpwer
 vba-basic-null.diff i#85349, jjiao

Added: trunk/patches/vba/vba-datevalue-function-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/vba-datevalue-function-fix.diff	Fri Sep  5 07:13:24 2008
@@ -0,0 +1,22 @@
+--- basic/source/runtime/methods.cxx.orig	2008-09-05 10:23:14.000000000 +0800
++++ basic/source/runtime/methods.cxx	2008-09-05 10:43:33.000000000 +0800
+@@ -1991,15 +1991,14 @@ RTLFUNC(DateValue)
+ 		// It seems that both locale number formatter and English number formatter 
+ 		// are supported in Visual Basic.
+ 		LanguageType eLangType = GetpApp()->GetSettings().GetLanguage();
+-		if( !bSuccess && !(eLangType & LANGUAGE_ENGLISH))
++		if( !bSuccess && ( eLangType != LANGUAGE_ENGLISH_US ) )
+ 		{
+ 			// Create a new SvNumberFormatter by using LANGUAGE_ENGLISH to get the date value;
+ 			com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > 
+ 				xFactory = comphelper::getProcessServiceFactory();
+-			SvNumberFormatter* pFormatterEn = new SvNumberFormatter( xFactory, LANGUAGE_ENGLISH );
+-			bSuccess = pFormatterEn->IsNumberFormat( aStr, nIndex, fResult );
+-			nType = pFormatterEn->GetType( nIndex );
+-			delete pFormatterEn;
++			SvNumberFormatter aFormatter( xFactory, LANGUAGE_ENGLISH_US );
++			bSuccess = aFormatter.IsNumberFormat( aStr, nIndex, fResult );
++			nType = aFormatter.GetType( nIndex );
+ 		}
+ 
+ 		if(bSuccess && (nType==NUMBERFORMAT_DATE || nType==NUMBERFORMAT_DATETIME))

Added: trunk/patches/vba/vba-window-api-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/vba-window-api-fix.diff	Fri Sep  5 07:13:24 2008
@@ -0,0 +1,19 @@
+--- sc/source/ui/vba/vbawindow.cxx.orig	2008-09-05 11:47:14.000000000 +0800
++++ sc/source/ui/vba/vbawindow.cxx	2008-09-05 14:48:40.000000000 +0800
+@@ -664,13 +664,14 @@ void SAL_CALL
+ ScVbaWindow::setSplitHorizontal( double _splithorizontal ) throw (uno::RuntimeException)
+ {
+ 	double fHoriPixels = PointsToPixels( m_xDevice, _splithorizontal, sal_True );
+-   m_xViewSplitable->splitAtPosition( (int) fHoriPixels, 0 );	
++   m_xViewSplitable->splitAtPosition( static_cast<sal_Int32>( fHoriPixels ), 0 );	
+ }
+ 
+ sal_Int32 SAL_CALL 
+ ScVbaWindow::getSplitRow() throw (uno::RuntimeException)
+ {
+-	return m_xViewSplitable->getSplitRow();	
++	sal_Int32 nValue = m_xViewSplitable->getSplitRow();
++	return nValue ? nValue - 1 : nValue;	
+ }
+ 
+ void SAL_CALL 

Modified: trunk/scratch/sc-vba/testvba/TestDocuments/format.xls
==============================================================================
Binary files trunk/scratch/sc-vba/testvba/TestDocuments/format.xls	(original) and trunk/scratch/sc-vba/testvba/TestDocuments/format.xls	Fri Sep  5 07:13:24 2008 differ

Modified: trunk/scratch/sc-vba/testvba/TestDocuments/logs/unix/format.log
==============================================================================
--- trunk/scratch/sc-vba/testvba/TestDocuments/logs/unix/format.log	(original)
+++ trunk/scratch/sc-vba/testvba/TestDocuments/logs/unix/format.log	Fri Sep  5 07:13:24 2008
@@ -1,19 +1,16 @@
-Test run started : 01/29/2008 02:38:27 PM
+Test run started : 09/05/2008 10:20:24 AM
 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
+  ITEM Assertion OK : General Date: 1/6/98 (Test only applies to en_US locale)
+  ITEM Assertion OK : Long Date: Tuesday, January 06, 1998 (Test only applies to en_US locale)
+  ITEM Assertion OK : Medium Date: 06-Jan-98 (Test only applies to en_US locale)
+  ITEM Assertion OK : Short Date: 1/6/98 (Test only applies to en_US locale)
+  ITEM Assertion OK : Long Time: 5:08:06 PM (Test only applies to en_US locale)
+  ITEM Assertion OK : Medium Time: 05:08 PM (Test only applies to en_US locale)
+  ITEM Assertion OK : Short Time: 17:08 (Test only applies to en_US locale)
  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%
@@ -27,36 +24,30 @@
   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
+  ITEM Assertion OK : c: 1/6/98 5:08:06 PM (Test only applies to en_US locale)
+  ITEM Assertion OK : dddddd: Tuesday, January 06, 1998 (Test only applies to en_US locale)
+  ITEM Assertion OK : mm-dd-yyyy: 01-06-1998 (Test only applies to en_US locale)
+  ITEM Assertion OK : d: 6 (Test only applies to en_US locale)
+  ITEM Assertion OK : dd: 06 (Test only applies to en_US locale)
+  ITEM Assertion OK : ddd: Tue (Test only applies to en_US locale)
+  ITEM Assertion OK : dddd: Tuesday (Test only applies to en_US locale)
+  ITEM Assertion OK : h: 5 (Test only applies to en_US locale)
+  ITEM Assertion OK : hh: 05 (Test only applies to en_US locale)
+  ITEM Assertion OK : n: 8 (Test only applies to en_US locale)
+  ITEM Assertion OK : nn: 08 (Test only applies to en_US locale)
+  ITEM Assertion OK : m: 1 (Test only applies to en_US locale)
+  ITEM Assertion OK : mm: 01 (Test only applies to en_US locale)
+  ITEM Assertion OK : mmm: Jan (Test only applies to en_US locale)
+  ITEM Assertion OK : mmmm: January (Test only applies to en_US locale)
+  ITEM Assertion OK : s: 6 (Test only applies to en_US locale)
+  ITEM Assertion OK : ss: 06 (Test only applies to en_US locale)
+  ITEM Assertion OK : hh:mm:ss AM/PM: 05:08:06 PM (Test only applies to en_US locale)
+  ITEM Assertion OK : hh:mm:ss: 17:08:06 (Test only applies to en_US locale)
+  ITEM Assertion OK : ww: 2 (Test only applies to en_US locale)
+  ITEM Assertion OK : w: 3 (Test only applies to en_US locale)
+  ITEM Assertion OK : y: 6 (Test only applies to en_US locale)
+  ITEM Assertion OK : yy: 98 (Test only applies to en_US locale)
+  ITEM Assertion OK : yyyy: 1998 (Test only applies to en_US locale)
  TEST OK : Test Custom_Datetime_Format_Sample function
  TEST START : Test Custom_Number_Format_Sample function
   ITEM Assertion OK : 00.0000: 23.6750
@@ -73,10 +64,8 @@
   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
+Test run finished : 09/05/2008 10:20:25 AM

Modified: trunk/scratch/sc-vba/testvba/TestDocuments/logs/unix/replace.log
==============================================================================
--- trunk/scratch/sc-vba/testvba/TestDocuments/logs/unix/replace.log	(original)
+++ trunk/scratch/sc-vba/testvba/TestDocuments/logs/unix/replace.log	Fri Sep  5 07:13:24 2008
@@ -1,4 +1,4 @@
-Test run started : 11/20/2007 05:15:30 PM
+Test run started : 09/05/2008 10:21:46 AM
 BEGIN Replace
  TEST START : Test Replace function
   ITEM Assertion OK : common string:aefefdBc
@@ -8,7 +8,7 @@
   ITEM Assertion OK : text compare:aefefdef
   ITEM Assertion OK : start = 3:cefdBc
   ITEM Assertion OK : count = 2: aefefdBc
-  ITEM Assertion FAIL : start = 1, count = 0, not support in Unix: aefefdBc
+  ITEM Assertion OK : start = 1, count = 0, not support in Unix: abcbcdBc
  TEST OK : Test Replace function
 END  Replace
-Test run finished : 11/20/2007 05:15:30 PM
+Test run finished : 09/05/2008 10:21:47 AM

Modified: trunk/scratch/sc-vba/testvba/TestDocuments/logs/unix/window2.log
==============================================================================
--- trunk/scratch/sc-vba/testvba/TestDocuments/logs/unix/window2.log	(original)
+++ trunk/scratch/sc-vba/testvba/TestDocuments/logs/unix/window2.log	Fri Sep  5 07:13:24 2008
@@ -1,20 +1,15 @@
-Test run started : 05/29/2008 02:55:48 PM
+Test run started : 2008ï09ï05 14:50:04
 BEGIN Window2
  TEST START : Test Window.SplitRow
   ITEM Assertion OK : Test SplitColumn: 2
-  ITEM Assertion FAIL : Test SplitRow: 5
-  ITEM Assertion FAIL : Test SplitVertical: 64.5090003183026
-  ITEM Assertion OK : Test SplitHorizontal: 502.570118758869
-  ITEM Assertion OK : Test SplitVertical: 242.283803521067
-  ITEM Assertion OK : Test SplitRow: 19
-  ITEM Assertion OK : Test SplitHorizontal: 242.283803521067
-  ITEM Assertion OK : Test SplitColumn: 1
-  ITEM Assertion FAIL : Test SplitRow: 8
-  ITEM Assertion OK : Test SplitColumn: 10
+  ITEM Assertion OK : Test SplitRow: 4
+  ITEM Assertion OK : Test SplitVertical: 242.536512575914
+  ITEM Assertion OK : Test SplitHorizontal: 242.536512575914
+  ITEM Assertion OK : Test SplitRow: 7
+  ITEM Assertion OK : Test SplitColumn: 6
   ITEM Assertion OK : Test SplitColumn: 0
   ITEM Assertion OK : Test SplitRow: 0
  TEST OK : Test Window.SplitRow
-TEST ERROR - no test begun: Test Window.SplitRow
  TEST START : Test Window.DisplayGridlines
   ITEM Assertion OK : Test gridlines are on
   ITEM Assertion OK : Test gridlines are off
@@ -25,7 +20,8 @@
  TEST OK : Test Window.DisplayHeadings
  TEST START : Test Window.Visibility
   ITEM Assertion OK : Window is visible
- TEST FAIL : Test Window.Visibility (hit error handler).
+  ITEM Assertion OK : Window is not visible
+ TEST OK : Test Window.Visibility
  TEST START : Test Window.FreezePanes
   ITEM Assertion OK : Test no panes frozen
   ITEM Assertion OK : Test panes frozen at center
@@ -42,4 +38,4 @@
   ITEM Assertion OK : Application.Windows Count: 1
  TEST OK : Test Windows.Count
 END  Window2
-Test run finished : 05/29/2008 02:55:48 PM
+Test run finished : 2008ï09ï05 14:50:05

Modified: trunk/scratch/sc-vba/testvba/TestDocuments/window2.xls
==============================================================================
Binary files. No diff available.



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]