[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - toolkit/source vcl/source

[Julien Nabet]

 toolkit/source/awt/vclxwindows.cxx |    4 ++--
 vcl/source/control/ilstbox.cxx     |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6e36fc0cb769c2173e07af764ddc52e02cf8c9ba
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Mar 16 22:31:23 2015 +0100

    tdf#67990: Management of case in combobox
    
    I noticed these 2 points:
    1) Combobox were used with autocomplete with default (false) value for matchCase
    => so initialize autocomplete with true value for matchCase
    2) FindMatchingEntry uses bLazy as !matchCase
    but when bLazy = false, no autocomplete can work since you must type the whole word
    so just use "entryCombo" startsWith "typed string" instead of "entryCombo" == "typed string"
    
    (thank you Lionel for this tip: http://nabble.documentfoundation.org/Finding-the-right-location-for-tdf-67990-Base-module-td4143324.html)
    
    Change-Id: Ib1063002c3284122fd5279f27c1ccbc177bbac7c
    Reviewed-on: https://gerrit.libreoffice.org/14885
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 76f33f10309b0ee384a75a7a854858b068d60495)
    Reviewed-on: https://gerrit.libreoffice.org/15021

diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 002ef31..e93095a 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -4368,12 +4368,12 @@ void VCLXComboBox::setProperty( const OUString& PropertyName, const ::com::sun::
             {
                 sal_Int16 n = sal_Int16();
                 if ( Value >>= n )
-                     pComboBox->EnableAutocomplete( n != 0 );
+                     pComboBox->EnableAutocomplete( n != 0, true );
                 else
                 {
                     bool b = bool();
                     if ( Value >>= b )
-                        pComboBox->EnableAutocomplete( b );
+                        pComboBox->EnableAutocomplete( b, true );
                 }
             }
             break;
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 62db0c7..9c66383 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -287,7 +287,7 @@ sal_Int32 ImplEntryList::FindMatchingEntry( const OUString& rStr, sal_Int32 nSta
         }
         else
         {
-            bMatch = rStr.isEmpty() || (rStr == pImplEntry->maStr );
+            bMatch = rStr.isEmpty() || (pImplEntry->maStr.startsWith(rStr));
         }
         if ( bMatch )
         {