[ooo-build-commit] patches/dev300

[Kohei Yoshida]

 patches/dev300/calc-autoinput-case-insensitive-matching.diff |   20 ++++++-----
 1 file changed, 12 insertions(+), 8 deletions(-)

New commits:
commit aceddd596598d2810bc5bf7a19f0150e81f0aa7c
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Oct 20 11:38:19 2009 -0400

    Modified Calc's autoinput behavior to allow case matching of partial text.
    
    * patches/dev300/calc-autoinput-case-insensitive-matching.diff: when a part
      of a matching text is entered, we should match its casing, whereas when
      the entire text is entered, we don't match cases.

diff --git a/patches/dev300/calc-autoinput-case-insensitive-matching.diff b/patches/dev300/calc-autoinput-case-insensitive-matching.diff
index c18a6db..0616b04 100644
--- a/patches/dev300/calc-autoinput-case-insensitive-matching.diff
+++ b/patches/dev300/calc-autoinput-case-insensitive-matching.diff
@@ -1,12 +1,11 @@
 diff --git sc/source/ui/app/inputhdl.cxx sc/source/ui/app/inputhdl.cxx
-index e439eb8..10e4417 100644
+index 039f6cd..6146861 100644
 --- sc/source/ui/app/inputhdl.cxx
 +++ sc/source/ui/app/inputhdl.cxx
-@@ -2577,18 +2577,6 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
- 				pEngine->SetControlWord( (nCtrl & ~EE_CNTRL_ALLOWBIGOBJS) | nWantBig );
- 			pObject = pEngine->CreateTextObject();
- 		}
--		else if (bAutoComplete)			// Gross-/Kleinschreibung anpassen
+@@ -2579,17 +2579,11 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
+             pObject = pEngine->CreateTextObject();
+         }
+ 		else if (bAutoComplete)			// Gross-/Kleinschreibung anpassen
 -		{
 -			if (pColumnData)
 -				pColumnData->GetExactMatch( aString );
@@ -18,6 +17,11 @@ index e439eb8..10e4417 100644
 -			if ( pData && pData->GetSubIndex( aString, nIndex ) )
 -				aString = pData->GetSubStr( nIndex );
 -		}
- 	}
++        {
++            // Perform case-matching only when the typed text is partial.
++            if (pColumnData && aAutoSearch.Len() < aString.Len())
++                pColumnData->GetExactMatch(aString);
++        }
+     }
  
- 	//	don't rely on ShowRefFrame switching the active view synchronously
+     //	don't rely on ShowRefFrame switching the active view synchronously