ooo-build r13435 - in branches/ooo-build-2-4-1: . patches/vba

[noelpwer svn gnome org]

Author: noelpwer
Date: Wed Jul 30 11:47:58 2008
New Revision: 13435
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13435&view=rev

Log:
2008-07-30  Noel Power <noel power novell com>

        * patches/vba/bug-411556-sort.diff: fix for n#411556 fix bad
        * test for illegal key param



Added:
   branches/ooo-build-2-4-1/patches/vba/bug-411556-sort.diff
Modified:
   branches/ooo-build-2-4-1/ChangeLog

Added: branches/ooo-build-2-4-1/patches/vba/bug-411556-sort.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4-1/patches/vba/bug-411556-sort.diff	Wed Jul 30 11:47:58 2008
@@ -0,0 +1,16 @@
+--- sc/source/ui/vba/vbarange.cxx	2008-07-29 23:21:38.000000000 +0100
++++ sc/source/ui/vba/vbarange.cxx	2008-07-30 11:54:23.000000000 +0100
+@@ -2995,10 +2995,10 @@ void updateTableSortField( const uno::Re
+ 
+ 		// make sure that upper left poing of key range is within the
+ 		// parent range
+-		if (  colRowKeyAddress.StartColumn >= parentRangeAddress.StartColumn &&
+-			colRowKeyAddress.StartColumn <= parentRangeAddress.EndColumn  &&
++		if (  ( !bIsSortColumn && colRowKeyAddress.StartColumn >= parentRangeAddress.StartColumn &&
++			colRowKeyAddress.StartColumn <= parentRangeAddress.EndColumn ) || ( bIsSortColumn && 
+ 			colRowKeyAddress.StartRow >= parentRangeAddress.StartRow &&
+-			colRowKeyAddress.StartRow <= parentRangeAddress.EndRow  )
++			colRowKeyAddress.StartRow <= parentRangeAddress.EndRow  ) )
+ 		{
+ 			//determine col/row index
+ 			if ( bIsSortColumn )