summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2015-10-08 22:36:00 +0200
committerJulien Nabet <serval2412@yahoo.fr>2015-10-09 06:02:29 +0000
commit7ca450cbe524807d51893382fcaa0d1a47c939c6 (patch)
tree19cdb384d3d21024d24c31fc518799a68acbcf67
parent7fccad27c97d256c0def7b51e9947f13d5c9c977 (diff)
Related tdf#94557: Combo box entries are case-sensitive (sometimes)
Revert partly http://cgit.freedesktop.org/libreoffice/core/commit/?id=76f33f10309b0ee384a75a7a854858b068d60495 author Julien Nabet <serval2412@yahoo.fr> 2015-03-16 21:31:23 (GMT) committer Caolán McNamara <caolanm@redhat.com> 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 <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
-rw-r--r--toolkit/source/awt/vclxwindows.cxx4
-rw-r--r--vcl/source/control/ilstbox.cxx2
-rw-r--r--wizards/com/sun/star/wizards/web/FTPDialog.py2
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: <br/>
# I get a ucb content.
# I list the files in this content.