[Libreoffice-commits] core.git: svx/source

[Caolán McNamara (via logerrit)]

 svx/source/form/navigatortree.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 1f66b4247334d253c7237ed5447e5f72716c4897
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jul 9 09:57:21 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jul 9 13:00:24 2020 +0200

    cid#1465234 Unchecked return value
    
    Change-Id: I56d59de5c65144283595b044142ff3f8988a02a1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98409
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 77300a01b662..70d1e713ac40 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1895,8 +1895,10 @@ namespace svxform
         if ((m_arrCurrentSelection.size() == 1) && (m_nFormsSelected == 1))
         {
             std::unique_ptr<weld::TreeIter> xSelected(m_xTreeView->make_iterator());
-            m_xTreeView->get_selected(xSelected.get());
-            FmFormData* pSingleSelectionData = dynamic_cast<FmFormData*>(reinterpret_cast<FmEntryData*>(m_xTreeView->get_id(*xSelected).toInt64()));
+            if (!m_xTreeView->get_selected(xSelected.get()))
+                xSelected.reset();
+            FmFormData* pSingleSelectionData = xSelected ? dynamic_cast<FmFormData*>(reinterpret_cast<FmEntryData*>(m_xTreeView->get_id(*xSelected).toInt64()))
+                                                         : nullptr;
             DBG_ASSERT( pSingleSelectionData, "NavigatorTree::SynchronizeMarkList: invalid selected form!" );
             if ( pSingleSelectionData )
             {