cui/source/customize/SvxMenuConfigPage.cxx | 2 +- cui/source/customize/SvxToolbarConfigPage.cxx | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-)
New commits: commit 36aa242429ca992b20574f4974d471d544247362 Author: Caolán McNamara <[email protected]> AuthorDate: Wed May 4 11:52:58 2022 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Wed May 4 21:06:22 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/+/133822 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx index db0d95904a77..5793825b5d76 100644 --- a/cui/source/customize/SvxMenuConfigPage.cxx +++ b/cui/source/customize/SvxMenuConfigPage.cxx @@ -135,7 +135,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 bcf7da3c8c72..bc8346922790 100644 --- a/cui/source/customize/SvxToolbarConfigPage.cxx +++ b/cui/source/customize/SvxToolbarConfigPage.cxx @@ -243,10 +243,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 = weld::fromId<SvxConfigEntry*>(m_xTopLevelListBox->get_id(i));
