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

[pflin svn gnome org]

Author: pflin
Date: Thu Aug 14 14:32:18 2008
New Revision: 13569
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13569&view=rev

Log:
2008-08-14  Fong Lin  <pflin novell com>
	* patches/vba/vba-range-find-fix.diff,
	  patches/dev300/apply: fixed for n#417312.



Added:
   trunk/patches/vba/vba-range-find-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Aug 14 14:32:18 2008
@@ -1518,6 +1518,8 @@
 vba-empty-comparison-fix.diff, n#397438, Fong
 # Add Worksheet.EnableSelection
 vba-worksheet-enableselection.diff, n#405312, Fong
+vba-range-find-fix.diff, n#417312, Fong
+
 # Fixed for n#407805
 basic-not-is-nothing.diff, n#407805, Fong
 bytearray-string-fix.diff, i#91911, Fong

Added: trunk/patches/vba/vba-range-find-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/vba-range-find-fix.diff	Thu Aug 14 14:32:18 2008
@@ -0,0 +1,12 @@
+--- sc/source/ui/vba/vbarange.cxx.orig	2008-08-14 22:17:57.000000000 +0800
++++ sc/source/ui/vba/vbarange.cxx	2008-08-14 22:18:09.000000000 +0800
+@@ -2920,7 +2920,8 @@ ScVbaRange::Find( const uno::Any& What, 
+ 		ScGlobal::SetSearchItem( newOptions );	
+ 
+ 		uno::Reference< util::XSearchDescriptor > xSearchDescriptor( xDescriptor, uno::UNO_QUERY );
+-		uno::Reference< table::XCellRange > xCellRange( xSearch->findNext( xStartCell, xSearchDescriptor ), uno::UNO_QUERY );
++		uno::Reference< uno::XInterface > xInterface = xStartCell.is() ? xSearch->findNext( xStartCell, xSearchDescriptor) : xSearch->findFirst( xSearchDescriptor );
++		uno::Reference< table::XCellRange > xCellRange( xInterface, uno::UNO_QUERY );
+         if ( xCellRange.is() )
+         {
+             uno::Reference< excel::XRange > xResultRange = new ScVbaRange( this, mxContext, xCellRange );