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

[jonp svn gnome org]

Author: jonp
Date: Mon Mar 10 18:43:05 2008
New Revision: 11860
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11860&view=rev

Log:
	* patches/src680/sc-move-from-origin.diff: Don't use the origin coordinates
	  if we keep the selection; this allows ENTER to behave properly within a
	  selected region of the spreadsheet.  n#364351


Modified:
   trunk/ChangeLog
   trunk/patches/src680/sc-move-from-origin.diff

Modified: trunk/patches/src680/sc-move-from-origin.diff
==============================================================================
--- trunk/patches/src680/sc-move-from-origin.diff	(original)
+++ trunk/patches/src680/sc-move-from-origin.diff	Mon Mar 10 18:43:05 2008
@@ -10,7 +10,7 @@
 -		nCurY = (nMovY != 0) ? nOldY+nMovY : (SCsROW) aViewData.GetOldCurY();
 +		SCsCOL nOldCurX = (SCsCOL) aViewData.GetOldCurX();
 +		SCsROW nOldCurY = (SCsROW) aViewData.GetOldCurY();
-+		if (!bShift && aViewData.GetMarkData().IsMarked())
++		if (!bKeepSel && !bShift && aViewData.GetMarkData().IsMarked())
 +		{
 +			nOldCurX = nOldX = nBlockStartXOrig;
 +			nOldCurY = nOldY = nBlockStartYOrig;