sc/source/ui/navipi/content.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5719e40defd0d7fd6681287ce6cd91efceba47da
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu May 14 10:07:04 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu May 14 12:31:24 2020 +0200
Resolves: tdf#133028 crash in calc navigator tooltips
Change-Id: Ibd10e31453d062fcf1c5a202e18bfc2aa889fc98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94187
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index b3f3a8110946..8b25b86de75f 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -620,11 +620,11 @@ IMPL_LINK(ScContentTree, QueryTooltipHdl, const
weld::TreeIter&, rEntry, OUStrin
aHelpText = OUString::number(m_xTreeView->iter_n_children(rEntry)) +
" " + m_xTreeView->get_text(rEntry);
}
- else if (m_xTreeView->iter_compare(*xParent,
*m_aRootNodes[ScContentId::NOTE]) == 0)
+ else if (m_aRootNodes[ScContentId::NOTE] &&
m_xTreeView->iter_compare(*xParent, *m_aRootNodes[ScContentId::NOTE]) == 0)
{
aHelpText = m_xTreeView->get_text(rEntry); // notes as help text
}
- else if (m_xTreeView->iter_compare(*xParent,
*m_aRootNodes[ScContentId::AREALINK]) == 0)
+ else if (m_aRootNodes[ScContentId::AREALINK] &&
m_xTreeView->iter_compare(*xParent, *m_aRootNodes[ScContentId::AREALINK]) == 0)
{
auto nIndex = GetChildIndex(&rEntry);
if (nIndex != SC_CONTENT_NOCHILD)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
