ooo-build r11591 - in trunk: . patches/src680

[noelpwer svn gnome org]

Author: noelpwer
Date: Fri Feb 15 11:53:59 2008
New Revision: 11591
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11591&view=rev

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

        * patches/src680/cws-npower11.diff:  tweak Range.Formula to allow it 
        to be set to a numeric value ( which resets the 'real' formula )



Modified:
   trunk/ChangeLog
   trunk/patches/src680/cws-npower11.diff

Modified: trunk/patches/src680/cws-npower11.diff
==============================================================================
--- trunk/patches/src680/cws-npower11.diff	(original)
+++ trunk/patches/src680/cws-npower11.diff	Fri Feb 15 11:53:59 2008
@@ -659,24 +659,44 @@
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/vba/vbarange.cxx,v
 retrieving revision 1.5
-retrieving revision 1.5.34.1
-diff -u -p -u -p -b -w -B -r1.5 -r1.5.34.1
+retrieving revision 1.5.34.2
+diff -u -p -u -p -b -w -B -r1.5 -r1.5.34.2
 --- sc/source/ui/vba/vbarange.cxx	14 Dec 2007 12:41:04 -0000	1.5
-+++ sc/source/ui/vba/vbarange.cxx	23 Jan 2008 14:40:29 -0000	1.5.34.1
-@@ -1154,10 +1154,19 @@ lcl_setupBorders( const uno::Reference< 
++++ sc/source/ui/vba/vbarange.cxx	15 Feb 2008 11:31:40 -0000	1.5.34.2
+@@ -743,6 +743,7 @@ protected:
+ 	bool processValue( const uno::Any& aValue, const uno::Reference< table::XCell >& xCell )
+ 	{
+ 		rtl::OUString sFormula;
++		double aDblValue;
+ 		if ( aValue >>= sFormula )
+ 		{
+ 			// get current convention
+@@ -769,6 +770,11 @@ protected:
+ 			xCell->setFormula( sFormula );
+ 			return true;
+ 		}
++		else if ( aValue >>= aDblValue )
++		{
++			xCell->setValue( aDblValue );
++			return true;
++		}
+ 		return false;
+ 	}
+ 		
+@@ -1154,10 +1160,19 @@ lcl_setupBorders( const uno::Reference< 
  }
  
  ScVbaRange::ScVbaRange( uno::Sequence< uno::Any> const & args,
 -    uno::Reference< uno::XComponentContext> const & xContext )  throw ( lang::IllegalArgumentException ) : ScVbaRange_BASE( getXSomethingFromArgs< vba::XHelperInterface >( args, 0 ), xContext, getXSomethingFromArgs< beans::XPropertySet >( args, 1, false ), getModelFromRange( getXSomethingFromArgs< table::XCellRange >( args, 1 ) ), true ), mbIsRows( sal_False ), mbIsColumns( sal_False )
 +    uno::Reference< uno::XComponentContext> const & xContext )  throw ( lang::IllegalArgumentException ) : ScVbaRange_BASE( getXSomethingFromArgs< vba::XHelperInterface >( args, 0 ), xContext, getXSomethingFromArgs< beans::XPropertySet >( args, 1, false ), getModelFromXIf( getXSomethingFromArgs< uno::XInterface >( args, 1 ) ), true ), mbIsRows( sal_False ), mbIsColumns( sal_False )
- {
--	mxRange.set( mxPropertySet, uno::UNO_QUERY_THROW );
--	uno::Reference< container::XIndexAccess > xIndex( new SingleRangeIndexAccess( mxContext, mxRange ) );
++{
 +	mxRange.set( mxPropertySet, uno::UNO_QUERY );
 +	mxRanges.set( mxPropertySet, uno::UNO_QUERY );
 +	uno::Reference< container::XIndexAccess >  xIndex;
 +	if ( mxRange.is() )
-+	{
+ {
+-	mxRange.set( mxPropertySet, uno::UNO_QUERY_THROW );
+-	uno::Reference< container::XIndexAccess > xIndex( new SingleRangeIndexAccess( mxContext, mxRange ) );
 +		xIndex = new SingleRangeIndexAccess( mxContext, mxRange );
 +	}
 +	else if ( mxRanges.is() )
@@ -1287,47 +1307,47 @@
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
-Binary files /dev/null and /tmp/cvskraWC2 differ
+Binary files /dev/null and /tmp/cvsDpa4M2 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
-Binary files /dev/null and /tmp/cvslraWC2 differ
+Binary files /dev/null and /tmp/cvsEpa4M2 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
-Binary files /dev/null and /tmp/cvsmraWC2 differ
+Binary files /dev/null and /tmp/cvsFpa4M2 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
-Binary files /dev/null and /tmp/cvsnraWC2 differ
+Binary files /dev/null and /tmp/cvsGpa4M2 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
-Binary files /dev/null and /tmp/cvsoraWC2 differ
+Binary files /dev/null and /tmp/cvsHpa4M2 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
-Binary files /dev/null and /tmp/cvspraWC2 differ
+Binary files /dev/null and /tmp/cvsIpa4M2 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
-Binary files /dev/null and /tmp/cvsqraWC2 differ
+Binary files /dev/null and /tmp/cvsJpa4M2 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
-Binary files /dev/null and /tmp/cvsrraWC2 differ
+Binary files /dev/null and /tmp/cvsKpa4M2 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
-Binary files /dev/null and /tmp/cvssraWC2 differ
+Binary files /dev/null and /tmp/cvsLpa4M2 differ
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/excel/AutoFilter.log
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/logs/excel/AutoFilter.log