sw/source/uibase/utlui/content.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 8faf62c76ab3a89fb149f9ec127cb352f081fcf9
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Aug 16 09:17:20 2022 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Aug 17 00:36:46 2022 +0200
cid#1500520 Explicit null dereferenced
and
cid#1500605 Explicit null dereferenced
Change-Id: Ic9d36899fb5c39fcd2e85fa8320addb0b05ac7d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138359
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index f05611d2cc59..dfba5294a35e 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3531,7 +3531,7 @@ static void lcl_SelectByContentTypeAndName(SwContentTree*
pThis, weld::TreeView&
std::unique_ptr<weld::TreeIter>
xFirstSelected(rContentTree.make_iterator());
if (!rContentTree.get_selected(xFirstSelected.get()))
xFirstSelected.reset();
- if (rContentTree.count_selected_rows() != 1 ||
+ if (rContentTree.count_selected_rows() != 1 || !xFirstSelected ||
rContentTree.iter_compare(*xIter, *xFirstSelected) != 0)
{
// unselect all entries and make passed entry visible and
selected
@@ -3888,7 +3888,7 @@ void SwContentTree::UpdateTracking()
if (!m_xTreeView->get_selected(xFirstSelected.get()))
xFirstSelected.reset();
// only select if not already selected or tree has
multiple entries selected
- if (m_xTreeView->count_selected_rows() != 1 ||
+ if (m_xTreeView->count_selected_rows() != 1 ||
!xFirstSelected ||
m_xTreeView->iter_compare(rEntry, *xFirstSelected)
!= 0)
{
if (m_nOutlineTracking == 2) // focused outline
tracking
