commit 595fcef52915f0ac54ea704b0f9dee85b43efa56
author Caolán McNamara <caolanm@redhat.com> Fri May 15 10:52:48 2020 +0100
committer Xisco Faulí <xiscofauli@libreoffice.org> Tue May 19 20:28:52 2020 +0200
tree e3cbf230571cc2d50b67acd7f8891abfebfac122
parent 17f335f27d170b29a8241d9033b63bbd6df8e97a

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/+/94269
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>

cui/source/customize/cfg.cxx

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 7b5e51b..f317811 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<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();
}