ooo-build r11581 - in trunk: . patches/src680 patches/vba

[noelpwer svn gnome org]

Author: noelpwer
Date: Thu Feb 14 17:19:17 2008
New Revision: 11581
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11581&view=rev

Log:
2008-02-14  Noel Power  <noel power novell com>

        * patches/vba/vba-stringtodouble.diff: tentative fix for n#359943
        (not applied currently)
        * patches/vba/n353254-dateserial.diff: change behavior at runtime
        via vba mode



Added:
   trunk/patches/vba/vba-stringtodouble.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Thu Feb 14 17:19:17 2008
@@ -1468,6 +1468,7 @@
 
 [ VBAUntested ]
 SectionOwner => noelpwer
+vba-stringtodouble.diff, n#359943, noelpwer
 basic-source-classes-eventatt-cxx.diff, #no-upstream
 #ditto
 vba-support-stoc-typeprovider-xexactname.diff, #no-upstream

Added: trunk/patches/vba/vba-stringtodouble.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/vba-stringtodouble.diff	Thu Feb 14 17:19:17 2008
@@ -0,0 +1,46 @@
+diff -rup /data4/scratch/ooh680-m3/basic/source/sbx/sbxdbl.cxx basic/source/sbx/sbxdbl.cxx
+--- /data4/scratch/ooh680-m3/basic/source/sbx/sbxdbl.cxx	2007-11-13 15:22:39.000000000 +0000
++++ basic/source/sbx/sbxdbl.cxx	2008-02-04 11:50:31.000000000 +0000
+@@ -41,6 +41,7 @@
+ #endif
+ #include <basic/sbx.hxx>
+ #include "sbxconv.hxx"
++#include "runtime.hxx"
+ 
+ double ImpGetDouble( const SbxValues* p )
+ {
+@@ -93,7 +93,11 @@ double ImpGetDouble( const SbxValues* p 
+ 				double d;
+ 				SbxDataType t;
+ 				if( ImpScan( *p->pString, d, t, NULL ) != SbxERR_OK )
++				{
+ 					nRes = 0;
++					if ( SbiRuntime::isVBAEnabled() )// VBA only behaviour
++						SbxBase::SetError( SbxERR_CONVERSION );
++				}
+ 				else
+ 					nRes = d;
+ 			}
+diff -rup /data4/scratch/ooh680-m3/basic/source/sbx/sbxscan.cxx basic/source/sbx/sbxscan.cxx
+--- /data4/scratch/ooh680-m3/basic/source/sbx/sbxscan.cxx	2007-11-13 15:23:45.000000000 +0000
++++ basic/source/sbx/sbxscan.cxx	2008-02-04 11:46:28.000000000 +0000
+@@ -61,6 +61,7 @@
+ #include <svtools/svtools.hrc>
+ 
+ #include "basrid.hxx"
++#include "runtime.hxx"
+ 
+ void ImpGetIntntlSep( sal_Unicode& rcDecimalSep, sal_Unicode& rcThousandSep )
+ {
+@@ -235,6 +235,11 @@ SbxError ImpScan( const XubString& rWSrc
+ 		if( l >= SbxMININT && l <= SbxMAXINT )
+ 			eScanType = SbxINTEGER;
+ 	}
++	else if ( SbiRuntime::isVBAEnabled() )
++	{
++		OSL_TRACE("Reporting error converting");
++		return SbxERR_CONVERSION;
++	}
+ 	if( pLen )
+ 		*pLen = (USHORT) ( p - pStart );
+ 	if( !bRes )