[Libreoffice-commits] core.git: toolkit/source vcl/source wizards/com

Julien Nabet serval2412 at yahoo.fr
Thu Oct 8 23:02:51 PDT 2015


 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(-)

New commits:
commit 7ca450cbe524807d51893382fcaa0d1a47c939c6
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Oct 8 22:36:00 2015 +0200

    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 at yahoo.fr>	2015-03-16 21:31:23 (GMT)
    committer	Caolán McNamara <caolanm at 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 at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 2e64ff1..e733efa 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 56d64cb..5d06f46 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 cb4e2c2..673102a 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.


More information about the Libreoffice-commits mailing list