From 5e65215b1d8703f4c7b4a2a3c816795231c8bf7d Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 15 May 2020 10:52:48 +0100 Subject: tdf#133036 notebookbar customize uses a special combobox id MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit in all other cases the m_xSaveInListBox id contains a SaveInData pointer but not the notebookbar case for some reason, we're already checking for this special id in one case, extend to check in the other too Change-Id: I460afa165ee2f6baa6deb1a15b0257df274a4c94 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94269 Tested-by: Jenkins Reviewed-by: Xisco Faulí --- cui/source/customize/cfg.cxx | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'cui') diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 7b5e51b9d521..f317811968f9 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1303,17 +1303,21 @@ bool SvxConfigPage::FillItemSet( SfxItemSet* ) for (int i = 0, nCount = m_xSaveInListBox->get_count(); i < nCount; ++i) { - SaveInData* pData = - reinterpret_cast(m_xSaveInListBox->get_id(i).toInt64()); - if(m_xSaveInListBox->get_id(i) != notebookbarTabScope) + OUString sId = m_xSaveInListBox->get_id(i); + if (sId != notebookbarTabScope) + { + SaveInData* pData = reinterpret_cast(sId.toInt64()); result = pData->Apply(); + } } return result; } IMPL_LINK_NOARG(SvxConfigPage, SelectSaveInLocation, weld::ComboBox&, void) { - pCurrentSaveInData = reinterpret_cast(m_xSaveInListBox->get_active_id().toInt64()); + OUString sId = m_xSaveInListBox->get_active_id(); + if (sId != notebookbarTabScope) + pCurrentSaveInData = reinterpret_cast(sId.toInt64()); Init(); } -- cgit