commit 60b9663864cd8350840196c24388c467fb170260
author Caolán McNamara <caolanm@redhat.com> Wed Jun 10 15:53:56 2020 +0100
committer Caolán McNamara <caolanm@redhat.com> Fri Jun 12 21:32:04 2020 +0200
tree 79e795d371d0af7efabc4bacbb1696580b5a039f
parent 95c99ae24e8772de09a24925b8fd28da89f40693

Resolves: tdf#133862 crash in customize toolbar in embedded math

Change-Id: I2fc7f3620145e48516c3ca73c0a5d08dce11d78a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96035
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
(cherry picked from commit 88eb53673b711696fac8d2494a9cde46d29bc458)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96100
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

cui/source/customize/SvxNotebookbarConfigPage.cxx

diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx b/cui/source/customize/SvxNotebookbarConfigPage.cxx
index c8270b9..198a19f 100644
--- a/cui/source/customize/SvxNotebookbarConfigPage.cxx
+++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx
@@ -433,6 +433,8 @@ void SvxNotebookbarConfigPage::SelectElement()
    OString sUIFileUIPath = CustomNotebookbarGenerator::getSystemPath(
        CustomNotebookbarGenerator::getCustomizedUIPath());
    xmlDocPtr pDoc = xmlParseFile(sUIFileUIPath.getStr());
    if (!pDoc)
        return;
    xmlNodePtr pNodePtr = xmlDocGetRootElement(pDoc);

    std::vector<NotebookbarEntries> aEntries;
@@ -494,10 +496,7 @@ void SvxNotebookbarConfigPage::SelectElement()

    aEntries.clear();

    if (pDoc != nullptr)
    {
        xmlFreeDoc(pDoc);
    }
    xmlFreeDoc(pDoc);
}

SvxNotebookbarEntriesListBox::SvxNotebookbarEntriesListBox(std::unique_ptr<weld::TreeView> xParent,