[ooo-build-commit] Branch 'ooo-build-3-1-1' - patches/dev300

[Kohei Yoshida]

 patches/dev300/calc-selection-fixed-cursor.diff |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 3e8f447e3f83fe61686297e7e7027a475c7d2e3f
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu Sep 17 19:54:04 2009 -0400

    Fixed incorrect focus shift during row/column selection.
    
    * patches/dev300/calc-selection-fixed-cursor.diff: keep the focus
      area where the cell cursor is when a row or column selection is
      expanded or shrinked. (n#539434)

diff --git a/patches/dev300/calc-selection-fixed-cursor.diff b/patches/dev300/calc-selection-fixed-cursor.diff
index 0138fae..b64f34b 100644
--- a/patches/dev300/calc-selection-fixed-cursor.diff
+++ b/patches/dev300/calc-selection-fixed-cursor.diff
@@ -347,7 +347,7 @@ index bd9515c..bd744e4 100644
  void ScTabView::DoneBlockMode( BOOL bContinue )            // Default FALSE
  {
      //	Wenn zwischen Tabellen- und Header SelectionEngine gewechselt wird,
-@@ -414,6 +408,297 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
+@@ -414,6 +408,305 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
          aHdrFunc.SetAnchorFlag( FALSE );
  }
  
@@ -620,7 +620,15 @@ index bd9515c..bd744e4 100644
 +    
 +        pDoc->SkipOverlapped(nBlockEndX, nBlockEndY, nTab);
 +        MarkCursor(nBlockEndX, nBlockEndY, nTab, false, false, true);
-+        AlignToCursor(nBlockEndX, nBlockEndY, eMode);
++
++        // Check if the entire row(s) or column(s) are selected.
++        ScSplitPos eActive = aViewData.GetActivePart();
++        bool bRowSelected = (nBlockStartX == 0 && nBlockEndX == MAXCOL);
++        bool bColSelected = (nBlockStartY == 0 && nBlockEndY == MAXROW);
++        SCsCOL nAlignX = bRowSelected ? aViewData.GetPosX(WhichH(eActive)) : nBlockEndX;
++        SCsROW nAlignY = bColSelected ? aViewData.GetPosY(WhichV(eActive)) : nBlockEndY;
++        AlignToCursor(nAlignX, nAlignY, eMode);
++
 +        UpdateAutoFillMark();
 +    }
 +}