From 7ca450cbe524807d51893382fcaa0d1a47c939c6 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Thu, 8 Oct 2015 22:36:00 +0200 Subject: Related tdf#94557: Combo box entries are case-sensitive (sometimes) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Revert partly http://cgit.freedesktop.org/libreoffice/core/commit/?id=76f33f10309b0ee384a75a7a854858b068d60495 author Julien Nabet 2015-03-16 21:31:23 (GMT) committer Caolán McNamara 2015-03-26 14:14:44 (GMT) commit 76f33f10309b0ee384a75a7a854858b068d60495 (patch) tree e12e3b6f2ca46cb9998b93b5c1bb3406408ad3cb parent 6c4100cf81e1678ff386549c0cdaa2f73a154ddc (diff) tdf#67990: Management of case in combobox See comments of tdf#94557 for more information Change-Id: I0432db0c3f76c20e55d8fecb69734952dc0cf53b Reviewed-on: https://gerrit.libreoffice.org/19260 Tested-by: Jenkins Reviewed-by: Julien Nabet --- toolkit/source/awt/vclxwindows.cxx | 4 ++-- vcl/source/control/ilstbox.cxx | 2 +- wizards/com/sun/star/wizards/web/FTPDialog.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 2e64ff14a28d..e733efae2485 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -4340,12 +4340,12 @@ void VCLXComboBox::setProperty( const OUString& PropertyName, const ::com::sun:: { sal_Int16 n = sal_Int16(); if ( Value >>= n ) - pComboBox->EnableAutocomplete( n != 0, true ); + pComboBox->EnableAutocomplete( n != 0 ); else { bool b = bool(); if ( Value >>= b ) - pComboBox->EnableAutocomplete( b, true ); + pComboBox->EnableAutocomplete( b ); } } break; diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 56d64cb1e3e9..5d06f468fa7f 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -266,7 +266,7 @@ sal_Int32 ImplEntryList::FindMatchingEntry( const OUString& rStr, sal_Int32 nSta } else { - bMatch = rStr.isEmpty() || (pImplEntry->maStr.startsWith(rStr)); + bMatch = pImplEntry->maStr.startsWith(rStr); } if ( bMatch ) { diff --git a/wizards/com/sun/star/wizards/web/FTPDialog.py b/wizards/com/sun/star/wizards/web/FTPDialog.py index cb4e2c25ea8a..673102a298db 100644 --- a/wizards/com/sun/star/wizards/web/FTPDialog.py +++ b/wizards/com/sun/star/wizards/web/FTPDialog.py @@ -310,7 +310,7 @@ class FTPDialog(WizardDialog): self.setEnabled(self.btnTestConnection, True) - # To try the conenction I do some actions that + # To try the connection I do some actions that # seem logical to me:
# I get a ucb content. # I list the files in this content. -- cgit v1.2.3