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

[Kohei Yoshida]

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

New commits:
commit dfae7670722533f98455aa7f96d8709f79c72d84
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Sep 23 10:59:10 2009 -0400

    Fixed improper cell selection handling when cell is being edited.
    
    * patches/dev300/calc-selection-fixed-cursor.diff: flush the text
      in the current cell & end the cell input mode, before starting
      the selection. (n#541269)

diff --git a/patches/dev300/calc-selection-fixed-cursor.diff b/patches/dev300/calc-selection-fixed-cursor.diff
index b64f34b..0688c2b 100644
--- a/patches/dev300/calc-selection-fixed-cursor.diff
+++ b/patches/dev300/calc-selection-fixed-cursor.diff
@@ -145,7 +145,7 @@ index 4cb00fb..3f80397 100644
      SCsCOLROW nRTLSign = 1;
      if ( pData->GetDocument()->IsLayoutRTL( pData->GetTabNo() ) )
      {
-@@ -172,38 +218,50 @@ void ScCellShell::GetStateCursor( SfxItemSet& /* rSet */ )
+@@ -172,38 +218,58 @@ void ScCellShell::GetStateCursor( SfxItemSet& /* rSet */ )
  
  void ScCellShell::ExecuteCursorSel( SfxRequest& rReq )
  {
@@ -161,6 +161,13 @@ index 4cb00fb..3f80397 100644
 -    }
 +    sal_uInt16 nSlotId  = rReq.GetSlot();
 +    ScTabViewShell* pViewShell = GetViewData()->GetViewShell();
++    ScInputHandler* pInputHdl = pViewShell->GetInputHandler();
++    pViewShell->HideAllCursors();
++    if (pInputHdl && pInputHdl->IsInputMode())
++    {
++        // the current cell is in edit mode.  Commit the text before moving on.
++        pViewShell->ExecuteInputDirect();
++    }
  
 -    switch ( nSlotId )
 +    switch (nSlotId)
@@ -221,6 +228,7 @@ index 4cb00fb..3f80397 100644
 -    rReq.AppendItem( SfxInt16Item(FN_PARAM_1, nRepeat ) );
 -    rReq.AppendItem( SfxBoolItem(FN_PARAM_2, TRUE) );
 -    ExecuteSlot( rReq, GetInterface() );
++    pViewShell->ShowAllCursors();
  }
  
  void ScCellShell::ExecuteMove( SfxRequest& rReq )