cui/source/customize/SvxNotebookbarConfigPage.cxx | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 8ee43bb5a75b3ae4488d3373511eaf001674fc71
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Jun 10 15:53:56 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Jun 11 10:02:18 2020 +0200
Resolves: tdf#133862 crash in customize toolbar in embedded math
Change-Id: I2fc7f3620145e48516c3ca73c0a5d08dce11d78a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96054
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx
b/cui/source/customize/SvxNotebookbarConfigPage.cxx
index 7354f1c821ba..aa4101ed1657 100644
--- a/cui/source/customize/SvxNotebookbarConfigPage.cxx
+++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx
@@ -398,6 +398,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;
@@ -459,10 +461,7 @@ void SvxNotebookbarConfigPage::SelectElement()
aEntries.clear();
- if (pDoc != nullptr)
- {
- xmlFreeDoc(pDoc);
- }
+ xmlFreeDoc(pDoc);
}
SvxNotebookbarEntriesListBox::SvxNotebookbarEntriesListBox(std::unique_ptr<weld::TreeView>
xParent,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
