[ooo-build-commit] patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                                |    3 +
 patches/dev300/calc-selection-fixed-cursor-dnd.diff |   34 ++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

New commits:
commit afb1fb9a571131f8a0bedce26d4fd2f634021293
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Jun 2 13:32:01 2009 -0400

    Set cursor at top-left corner of selection when drag-n-dropped.
    
    The old behavior is to always set the cursor at the bottom-right when you
    drag-n-drop range selection.  The new behavior is to set it at the top-left
    corner or the original cursor location in case the cursor was not at the
    top-left corner prior to drag-n-drop. (n#508872)
    
    * patches/dev300/apply:
    * patches/dev300/calc-selection-fixed-cursor-dnd.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ba05727..160df62 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1991,7 +1991,8 @@ calc-dp-custom-names-ods-sc.diff,     n#479062, i#22029, kohei
 calc-dp-custom-names-ods-xmloff.diff, n#479062, i#22029, kohei
 
 # when making selection, don't move the cursor position.
-calc-selection-fixed-cursor.diff, n#502717, kohei
+calc-selection-fixed-cursor.diff,     n#502717, kohei
+calc-selection-fixed-cursor-dnd.diff, n#508872, kohei
 
 [ OOXML ]
 oox-import-zoom-setting-with-tab-color.diff, n#494603, janneke
diff --git a/patches/dev300/calc-selection-fixed-cursor-dnd.diff b/patches/dev300/calc-selection-fixed-cursor-dnd.diff
new file mode 100644
index 0000000..53563f9
--- /dev/null
+++ b/patches/dev300/calc-selection-fixed-cursor-dnd.diff
@@ -0,0 +1,34 @@
+diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
+index 07aebda..491fdc9 100644
+--- sc/source/ui/view/gridwin.cxx
++++ sc/source/ui/view/gridwin.cxx
+@@ -3960,7 +3960,10 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
+                 if ( bDone )
+                 {
+                     pView->MarkRange( aDest, FALSE, FALSE );
+-                    pView->SetCursor( aDest.aEnd.Col(), aDest.aEnd.Row() );
++
++                    SCCOL nDCol = pViewData->GetCurX() - aSource.aStart.Col();
++                    SCROW nDRow = pViewData->GetCurY() - aSource.aStart.Row();
++                    pView->SetCursor( aDest.aStart.Col() + nDCol, aDest.aStart.Row() + nDRow );
+                 }
+ 
+                 pDocSh->GetUndoManager()->LeaveListAction();
+@@ -4068,7 +4071,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
+                     pView->EnterMatrix( aFormula );
+ 
+                     pView->MarkRange( aDest, FALSE, FALSE );
+-                    pView->SetCursor( aDest.aEnd.Col(), aDest.aEnd.Row() );
++                    pView->SetCursor( aDest.aStart.Col(), aDest.aStart.Row() );
+                 }
+ 
+                 pDocSh->GetUndoManager()->LeaveListAction();
+@@ -4102,7 +4105,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
+                 if ( bDone )
+                 {
+                     pView->MarkRange( aDest, FALSE, FALSE );
+-                    pView->SetCursor( aDest.aEnd.Col(), aDest.aEnd.Row() );
++                    pView->SetCursor( aDest.aStart.Col(), aDest.aStart.Row() );
+                 }
+             }
+