ooo-build r12523 - in trunk: . patches/dev300
- From: jonp svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r12523 - in trunk: . patches/dev300
- Date: Mon, 12 May 2008 23:21:15 +0100 (BST)
Author: jonp
Date: Mon May 12 22:21:14 2008
New Revision: 12523
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12523&view=rev
Log:
* patches/dev300/sc-move-from-origin.diff: Cutting a single cell and moving
the cursor should move relative to the selected cell, not relative
whatever the previous nBlockStartXOrig contents are. Fixes n#388770.
Modified:
trunk/ChangeLog
trunk/patches/dev300/sc-move-from-origin.diff
Modified: trunk/patches/dev300/sc-move-from-origin.diff
==============================================================================
--- trunk/patches/dev300/sc-move-from-origin.diff (original)
+++ trunk/patches/dev300/sc-move-from-origin.diff Mon May 12 22:21:14 2008
@@ -1,6 +1,11 @@
---- ../ooo-build/build/ooh680-m3.bk/sc/source/ui/view/tabview3.cxx 2008-01-22 03:34:30.000000000 -0500
-+++ sc/source/ui/view/tabview3.cxx 2008-03-03 23:13:43.000000000 -0500
-@@ -1049,10 +1049,20 @@
+Index: sc/source/ui/view/tabview3.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/view/tabview3.cxx,v
+retrieving revision 1.67
+diff -u -p -r1.67 tabview3.cxx
+--- sc/source/ui/view/tabview3.cxx 18 Apr 2008 11:48:39 -0000 1.67
++++ sc/source/ui/view/tabview3.cxx 12 May 2008 20:34:37 -0000
+@@ -1033,9 +1053,20 @@ void ScTabView::MoveCursorRel( SCsCOL nM
}
else
{
@@ -10,7 +15,8 @@
- nCurY = (nMovY != 0) ? nOldY+nMovY : (SCsROW) aViewData.GetOldCurY();
+ SCsCOL nOldCurX = (SCsCOL) aViewData.GetOldCurX();
+ SCsROW nOldCurY = (SCsROW) aViewData.GetOldCurY();
-+ if (!bKeepSel && !bShift && aViewData.GetMarkData().IsMarked())
++ if (!bKeepSel && !bShift && bIsBlockMode == 1 /* SC_BLOCKMODE_OWN */ &&
++ aViewData.GetMarkData().IsMarked())
+ {
+ nOldCurX = nOldX = nBlockStartXOrig;
+ nOldCurY = nOldY = nBlockStartYOrig;
@@ -24,4 +30,4 @@
+ nCurY = (nMovY != 0) ? nOldY+nMovY : nOldCurY;
}
- BOOL bSkipCell = FALSE;
+ BOOL bHidden;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]