[Libreoffice-commits] core.git: 2 commits - sw/uiconfig vcl/source

[Caolán McNamara (via logerrit)]

 sw/uiconfig/swriter/ui/insertcaption.ui |    2 +-
 vcl/source/uitest/logger.cxx            |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 260086dffc5adddb3c6e60d423acd2aaeeb036eb
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Aug 23 19:35:40 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Aug 23 23:48:28 2019 +0200

    Resolves: tdf#126693 cannot put focus into combobox entry
    
    Change-Id: I52a316e5c88a41c66ef08be1bae8fcdd10d2ab8e
    Reviewed-on: https://gerrit.libreoffice.org/78030
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/uiconfig/swriter/ui/insertcaption.ui b/sw/uiconfig/swriter/ui/insertcaption.ui
index 3a858b3e0bec..dab2087f14ca 100644
--- a/sw/uiconfig/swriter/ui/insertcaption.ui
+++ b/sw/uiconfig/swriter/ui/insertcaption.ui
@@ -294,7 +294,7 @@
                             <property name="has_entry">True</property>
                             <child internal-child="entry">
                               <object class="GtkEntry" id="comboboxtext-entry">
-                                <property name="can_focus">False</property>
+                                <property name="can_focus">True</property>
                                 <property name="activates_default">True</property>
                               </object>
                             </child>
commit dbd7189f970e52f664b4bb3f96b397c1035b9ec8
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Aug 23 21:20:43 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Aug 23 23:48:15 2019 +0200

    cid#1452394 silence Using invalid iterator
    
    Change-Id: Ia4851946f8c05d36f194468b931c2fcb13fb4684
    Reviewed-on: https://gerrit.libreoffice.org/78046
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/uitest/logger.cxx b/vcl/source/uitest/logger.cxx
index ccbf44fda51c..861cc4f4fb8e 100644
--- a/vcl/source/uitest/logger.cxx
+++ b/vcl/source/uitest/logger.cxx
@@ -337,6 +337,8 @@ OUString GetValueInMapWithIndex(const std::map<OUString, OUString>& rParameters,
     for (; itr != rParameters.end() && j < index; ++itr, ++j)
         ;
 
+    assert(itr != rParameters.end());
+
     return itr->second;
 }
 
@@ -349,6 +351,8 @@ OUString GetKeyInMapWithIndex(const std::map<OUString, OUString>& rParameters, s
     for (; itr != rParameters.end() && j < index; ++itr, ++j)
         ;
 
+    assert(itr != rParameters.end());
+
     return itr->first;
 }
 }