[Libreoffice-commits] core.git: 2 commits - fpicker/uiconfig framework/source

[Caolán McNamara (via logerrit)]

 fpicker/uiconfig/ui/remotefilesdialog.ui                   |    2 ++
 framework/source/accelerators/acceleratorconfiguration.cxx |   11 +++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 3b3154f6c2517155b1253ce9ff773c470bb31093
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Oct 19 09:00:07 2021 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Oct 19 11:40:19 2021 +0200

    tdf#145216 remote open/save dialog: icon view shows nothing
    
    since...
    
    commit b004a1bd7bf3885613d52aba70dea79766eae639
    Date:   Sat Nov 23 19:14:45 2019 +0000
    
        Resolves: tdf#128940 use a normal MenuButton
    
    Change-Id: I7ba6424a2a4892e2d6bc5552105a3b1e37d21a41
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123798
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/fpicker/uiconfig/ui/remotefilesdialog.ui 
b/fpicker/uiconfig/ui/remotefilesdialog.ui
index be7e83f43e03..0a87b3d403de 100644
--- a/fpicker/uiconfig/ui/remotefilesdialog.ui
+++ b/fpicker/uiconfig/ui/remotefilesdialog.ui
@@ -451,6 +451,8 @@
                             <property name="hexpand">True</property>
                             <property name="vexpand">True</property>
                             <property name="model">liststore2</property>
+                            <property name="pixbuf_column">0</property>
+                            <property name="text_column">1</property>
                           </object>
                         </child>
                       </object>
commit 414016a0d390701d6e3e0b81febaf06a1b724bca
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Oct 19 08:51:10 2021 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Oct 19 11:40:04 2021 +0200

    can reduce scope a little
    
    Change-Id: I19f5422ad7c72b5fcd11b507e7a2e22e34dde4c0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123797
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx 
b/framework/source/accelerators/acceleratorconfiguration.cxx
index 2f1d6000fd28..54b4f5a8f827 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -1012,13 +1012,13 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( 
bool bPreferred, const css:
 
             const sal_Int32 nToken = 4;
             bool bValid = true;
-            sal_Int32 k=0;
-            for (OUString sToken; k<nToken; ++k)
+            sal_Int32 k;
+            for (k = 0; k < nToken; ++k)
             {
                 if (nIndex < 0)
                     break;
 
-                sToken = sKey.getToken(0, '_', nIndex);
+                OUString sToken = sKey.getToken(0, '_', nIndex);
                 if (sToken.isEmpty())
                 {
                     bValid = false;
@@ -1224,13 +1224,12 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( 
const OUString& sPrimarySe
     aKeyEvent.KeyCode = 
KeyMapping::get().mapIdentifierToCode("KEY_"+sKeyIdentifier);
 
     const int nToken = 4;
-    sal_Int32 i = 0;
-    for (OUString sToken; i<nToken; ++i)
+    for (sal_Int32 i = 0; i < nToken; ++i)
     {
         if ( nIndex < 0 )
             break;
 
-        sToken = sKey.getToken(0, '_', nIndex);
+        OUString sToken = sKey.getToken(0, '_', nIndex);
         if ( sToken == "SHIFT" )
             aKeyEvent.Modifiers |= css::awt::KeyModifier::SHIFT;
         else if ( sToken == "MOD1" )