[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - cui/source

[Caolán McNamara (via logerrit)]

 cui/source/customize/SvxMenuConfigPage.cxx    |    2 +-
 cui/source/customize/SvxToolbarConfigPage.cxx |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 816435e4c2d52615462670464c48689bebdf1e55
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed May 4 11:52:58 2022 +0100
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Fri May 6 12:56:13 2022 +0200

    Resolves: rhbz#2081661 gtk-critical gtk_tree_view_scroll_to_cell assertion
    
    Change-Id: I4c7c4caed907072ef3a73ccfafabe882d618fa0e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133730
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/cui/source/customize/SvxMenuConfigPage.cxx 
b/cui/source/customize/SvxMenuConfigPage.cxx
index 34cee1368d7a..bf7457193f5c 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -136,7 +136,7 @@ void SvxMenuConfigPage::Init()
 
     ReloadTopLevelListBox();
 
-    m_xTopLevelListBox->set_active(0);
+    m_xTopLevelListBox->set_active(m_xTopLevelListBox->get_count() ? 0 : -1);
     SelectElement();
 
     m_xCommandCategoryListBox->Init(comphelper::getProcessComponentContext(), 
m_xFrame,
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx 
b/cui/source/customize/SvxToolbarConfigPage.cxx
index 99a85d82f96e..d2284428d8f1 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -246,10 +246,12 @@ void SvxToolbarConfigPage::Init()
 
     ReloadTopLevelListBox();
 
-    sal_Int32 nPos = 0;
+    sal_Int32 nCount = m_xTopLevelListBox->get_count();
+    sal_Int32 nPos = nCount > 0 ? 0 : -1;
+
     if (!m_aURLToSelect.isEmpty())
     {
-        for (sal_Int32 i = 0, nCount = m_xTopLevelListBox->get_count(); i < 
nCount; ++i)
+        for (sal_Int32 i = 0; i < nCount; ++i)
         {
             SvxConfigEntry* pData
                 = 
reinterpret_cast<SvxConfigEntry*>(m_xTopLevelListBox->get_id(i).toInt64());