[Libreoffice-commits] core.git: Branch 'libreoffice-7-5-6' - svx/source

[Caolán McNamara (via logerrit)]

 svx/source/form/navigatortree.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a6e5c6ec9631779066756ce22b37227851f41aa1
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Aug 23 16:50:40 2023 +0100
Commit:     Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Wed Aug 30 12:28:21 2023 +0200

    crashreporting: crash seen in FormNavigator
    
    set_text(rVclIter.iter, rText, col);
    ...
    m_xTreeView->set_text(*xEntry, pNameChangedHint->GetNewName());
    ...
    m_pNavModel->Broadcast( aNameChangedHint );
    
    Change-Id: I31275dd37de0146eae2ebb0931a5450e34fd21fb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155991
    Tested-by: Jenkins
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>
    (cherry picked from commit 4f984b803230784c8a87f793f45c4e76e7a5987c)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155996
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
    Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>

diff --git a/svx/source/form/navigatortree.cxx 
b/svx/source/form/navigatortree.cxx
index de7dba8bca95..ac30d749949b 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -579,7 +579,8 @@ namespace svxform
         else if( auto pNameChangedHint = dynamic_cast<const 
FmNavNameChangedHint*>(&rHint) )
         {
             std::unique_ptr<weld::TreeIter> xEntry = 
FindEntry(pNameChangedHint->GetEntryData());
-            m_xTreeView->set_text(*xEntry, pNameChangedHint->GetNewName());
+            if (xEntry)
+                m_xTreeView->set_text(*xEntry, pNameChangedHint->GetNewName());
         }
         else if( dynamic_cast<const FmNavClearedHint*>(&rHint) )
         {