core.git: Branch 'libreoffice-24-8-4' - sw/source

[Caolán McNamara (via logerrit)]

 sw/source/core/fields/ddetbl.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 4788e8dafad50748425527bcf90a8c3778266410
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sun Dec 1 19:17:49 2024 +0000
Commit:     Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Wed Dec 11 12:09:05 2024 +0100

    crashtesting: crash on load of forum-en-40508.odt + F9 to update fields
    
    seems to already exist in oldest version I have
    
    Change-Id: I3f3652952476678c121cbe3f800b7adf7f7aa1a8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177628
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    (cherry picked from commit b9c91699697e405b591aef1addd7a4b8da5a2a04)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177662
    Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
    Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>

diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx
index 7a93abe3108e..79b9c5b037fc 100644
--- a/sw/source/core/fields/ddetbl.cxx
+++ b/sw/source/core/fields/ddetbl.cxx
@@ -151,7 +151,11 @@ void SwDDETable::ChangeContent()
             OSL_ENSURE( pBox->GetSttIdx(), "no content box" );
             SwNodeIndex aNdIdx( *pBox->GetSttNd(), 1 );
             SwTextNode* pTextNode = aNdIdx.GetNode().GetTextNode();
-            OSL_ENSURE( pTextNode, "No Node" );
+            if (!pTextNode)
+            {
+                SAL_WARN("sw.core", "No TextNode in 
SwDDETable::ChangeContent");
+                continue;
+            }
             SwContentIndex aCntIdx( pTextNode, 0 );
             pTextNode->EraseText( aCntIdx );
             pTextNode->InsertText( aLine.getToken( 0, '        ', 
nLineTokenPos ), aCntIdx );