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

[pflin svn gnome org]

Author: pflin
Date: Tue Jan  6 08:25:31 2009
New Revision: 15002
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15002&view=rev

Log:
2009-01-06  Fong Lin  <pflin novell com>
	* patches/vba/i97038-dateserial-fix.diff: Fixed for i#97038.
	* patches/dev300/apply: apply the patch.



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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jan  6 08:25:31 2009
@@ -1873,6 +1873,8 @@
 
 vba-servicemacros-rework.diff
 
+i97038-dateserial-fix.diff, Fong
+
 [ VBAObjects ]
 # vba for word support
 #vba-word-support.diff, Fong

Added: trunk/patches/vba/i97038-dateserial-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/i97038-dateserial-fix.diff	Tue Jan  6 08:25:31 2009
@@ -0,0 +1,16 @@
+diff --git basic/source/runtime/methods.cxx basic/source/runtime/methods.cxx
+index e1803b6..8a9d408 100644
+--- basic/source/runtime/methods.cxx
++++ basic/source/runtime/methods.cxx
+@@ -1811,9 +1811,9 @@ INT16 implGetDateYear( double aDate )
+ 
+ BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet )
+ {
+-	if ( nYear < 30 )
++	if ( nYear < 30 && SbiRuntime::isVBAEnabled() )
+ 		nYear += 2000;
+-	if ( nYear < 100 )
++	else if ( nYear < 100 )
+ 		nYear += 1900;
+ 	Date aCurDate( nDay, nMonth, nYear );
+ 	if ((nYear < 100 || nYear > 9999) )