|
 |
fa2cd3 |
From 1dbfd248524789efa4a84dc94d56a229c19bc0b9 Mon Sep 17 00:00:00 2001
|
|
|
fa2cd3 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
fa2cd3 |
Date: Wed, 4 May 2022 11:52:58 +0100
|
|
|
fa2cd3 |
Subject: [PATCH] Resolves: rhbz#2081661 gtk-critical
|
|
|
fa2cd3 |
gtk_tree_view_scroll_to_cell assertion
|
|
|
fa2cd3 |
|
|
|
fa2cd3 |
Change-Id: I4c7c4caed907072ef3a73ccfafabe882d618fa0e
|
|
|
fa2cd3 |
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133730
|
|
|
fa2cd3 |
Tested-by: Jenkins
|
|
|
fa2cd3 |
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
|
|
|
fa2cd3 |
(cherry picked from commit 816435e4c2d52615462670464c48689bebdf1e55)
|
|
|
fa2cd3 |
---
|
|
|
fa2cd3 |
cui/source/customize/SvxMenuConfigPage.cxx | 2 +-
|
|
|
fa2cd3 |
cui/source/customize/SvxToolbarConfigPage.cxx | 6 ++++--
|
|
|
fa2cd3 |
2 files changed, 5 insertions(+), 3 deletions(-)
|
|
|
fa2cd3 |
|
|
|
fa2cd3 |
diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx
|
|
|
fa2cd3 |
index 34cee1368d7a..bf7457193f5c 100644
|
|
|
fa2cd3 |
--- a/cui/source/customize/SvxMenuConfigPage.cxx
|
|
|
fa2cd3 |
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
|
|
|
fa2cd3 |
@@ -136,7 +136,7 @@ void SvxMenuConfigPage::Init()
|
|
|
fa2cd3 |
|
|
|
fa2cd3 |
ReloadTopLevelListBox();
|
|
|
fa2cd3 |
|
|
|
fa2cd3 |
- m_xTopLevelListBox->set_active(0);
|
|
|
fa2cd3 |
+ m_xTopLevelListBox->set_active(m_xTopLevelListBox->get_count() ? 0 : -1);
|
|
|
fa2cd3 |
SelectElement();
|
|
|
fa2cd3 |
|
|
|
fa2cd3 |
m_xCommandCategoryListBox->Init(comphelper::getProcessComponentContext(), m_xFrame,
|
|
|
fa2cd3 |
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx
|
|
|
fa2cd3 |
index 99a85d82f96e..d2284428d8f1 100644
|
|
|
fa2cd3 |
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
|
|
|
fa2cd3 |
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
|
|
|
fa2cd3 |
@@ -246,10 +246,12 @@ void SvxToolbarConfigPage::Init()
|
|
|
fa2cd3 |
|
|
|
fa2cd3 |
ReloadTopLevelListBox();
|
|
|
fa2cd3 |
|
|
|
fa2cd3 |
- sal_Int32 nPos = 0;
|
|
|
fa2cd3 |
+ sal_Int32 nCount = m_xTopLevelListBox->get_count();
|
|
|
fa2cd3 |
+ sal_Int32 nPos = nCount > 0 ? 0 : -1;
|
|
|
fa2cd3 |
+
|
|
|
fa2cd3 |
if (!m_aURLToSelect.isEmpty())
|
|
|
fa2cd3 |
{
|
|
|
fa2cd3 |
- for (sal_Int32 i = 0, nCount = m_xTopLevelListBox->get_count(); i < nCount; ++i)
|
|
|
fa2cd3 |
+ for (sal_Int32 i = 0; i < nCount; ++i)
|
|
|
fa2cd3 |
{
|
|
|
fa2cd3 |
SvxConfigEntry* pData
|
|
|
fa2cd3 |
= reinterpret_cast<SvxConfigEntry*>(m_xTopLevelListBox->get_id(i).toInt64());
|
|
|
fa2cd3 |
--
|
|
|
fa2cd3 |
2.35.1
|
|
|
fa2cd3 |
|