[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/dev300

[Kohei Yoshida]

 patches/dev300/calc-auto-tab-complete.diff |   58 ++++++++++++++++++++++++++---
 1 file changed, 53 insertions(+), 5 deletions(-)

New commits:
commit 15a3db8b59b6c8ad4c256b2592cf0d2cda2ead77
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Mar 5 22:24:50 2010 -0500

    TAB to select auto completion and move, Ctrl-TAB to cycle through candidates.
    
    * patches/dev300/calc-auto-tab-complete.diff: during auto completion,
      hitting TAB will select current completion candidate and move to
      right.  Hitting Ctrl-TAB (and Ctrl-Shift-TAB) to cycle through
      the completion candidates. (n#584953, i#18748)

diff --git a/patches/dev300/calc-auto-tab-complete.diff b/patches/dev300/calc-auto-tab-complete.diff
index efb05a2..8804336 100644
--- a/patches/dev300/calc-auto-tab-complete.diff
+++ b/patches/dev300/calc-auto-tab-complete.diff
@@ -1,14 +1,62 @@
 diff --git sc/source/ui/app/inputhdl.cxx sc/source/ui/app/inputhdl.cxx
-index 37f485e..0b43cc3 100644
+index 37f485e..a4f12b2 100644
 --- sc/source/ui/app/inputhdl.cxx
 +++ sc/source/ui/app/inputhdl.cxx
-@@ -2973,8 +2973,7 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE
+@@ -2972,10 +2972,19 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE
+     USHORT nCode  = aCode.GetCode();
      sal_Unicode nChar = rKEvt.GetCharCode();
  
-     //	Alt-Return is accepted, everything else with ALT, or CTRL-TAB are not:
+-    //	Alt-Return is accepted, everything else with ALT, or CTRL-TAB are not:
 -    if (( bAlt && !bControl && nCode != KEY_RETURN ) ||
 -            ( bControl && aCode.GetCode() == KEY_TAB ))
-+    if ((bAlt && !bControl && nCode != KEY_RETURN) || (aCode.GetCode() == KEY_TAB))
-         return FALSE;
+-        return FALSE;
++    if (bAlt && !bControl && nCode != KEY_RETURN)
++        // Alt-Return and Alt-Ctrl-* are accepted. Everything else with ALT are not.
++        return false;
++
++    if (!bControl && nCode == KEY_TAB)
++    {
++        // Normal TAB moves the cursor right.
++        EnterHandler();
++
++        if (pActiveViewSh)
++            pActiveViewSh->FindNextUnprot( bShift );
++        return true;
++    }
  
      BOOL bInputLine = ( eMode==SC_INPUT_TOP );
+ 
+@@ -3014,30 +3023,22 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE
+             }
+             break;
+         case KEY_TAB:
+-            if (!bControl && !bAlt)
++            if (bControl && !bAlt)
+             {
+                 if ( pFormulaData && nTipVisible && nAutoPos != SCPOS_INVALID )
+                 {
+                     //	blaettern
+ 
+                     NextFormulaEntry( bShift );
++                    bUsed = true;
+                 }
+                 else if ( pColumnData && bUseTab && nAutoPos != SCPOS_INVALID )
+                 {
+                     //	in den Eintraegen der AutoEingabe blaettern
+ 
+                     NextAutoEntry( bShift );
++                    bUsed = true;
+                 }
+-                else
+-                {
+-                    EnterHandler();
+-
+-                    //	TabKeyInput gibt auf manchen Rechnern unter W95 Stackueberlaeufe,
+-                    //	darum direkter Aufruf:
+-                    if (pActiveViewSh)
+-                        pActiveViewSh->FindNextUnprot( bShift );
+-                }
+-                bUsed = TRUE;
+             }
+             break;
+         case KEY_ESCAPE: