summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2015-03-16 22:31:23 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-03-26 14:20:50 +0000
commit6e36fc0cb769c2173e07af764ddc52e02cf8c9ba (patch)
tree2c756118e50ec1103a7b3bcb581c91461f399235
parentb71bf55a450172f7ce308e7423a440196906e13a (diff)
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@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 76f33f10309b0ee384a75a7a854858b068d60495) Reviewed-on: https://gerrit.libreoffice.org/15021
-rw-r--r--toolkit/source/awt/vclxwindows.cxx4
-rw-r--r--vcl/source/control/ilstbox.cxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 002ef31763da..e93095a75053 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 62db0c7afd92..9c66383c282e 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 )
{