cui/source/customize/cfg.cxx | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 10cdeed12ef834f5df3b6577c1d9efcc811d6938
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri May 15 10:52:48 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri May 15 13:52:54 2020 +0200
tdf#133036 notebookbar customize uses a special combobox id
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/+/94288
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 9ddac7620b8d..67466b3bf6d2 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1304,17 +1304,21 @@ bool SvxConfigPage::FillItemSet( SfxItemSet* )
for (int i = 0, nCount = m_xSaveInListBox->get_count(); i < nCount; ++i)
{
- SaveInData* pData =
-
reinterpret_cast<SaveInData*>(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<SaveInData*>(sId.toInt64());
result = pData->Apply();
+ }
}
return result;
}
IMPL_LINK_NOARG(SvxConfigPage, SelectSaveInLocation, weld::ComboBox&, void)
{
- pCurrentSaveInData =
reinterpret_cast<SaveInData*>(m_xSaveInListBox->get_active_id().toInt64());
+ OUString sId = m_xSaveInListBox->get_active_id();
+ if (sId != notebookbarTabScope)
+ pCurrentSaveInData = reinterpret_cast<SaveInData*>(sId.toInt64());
Init();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
