core.git: sw/source

[Mike Kaganski (via logerrit)]

 sw/source/core/fields/expfld.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 746b21760b911860c7ac497f10ab07d60111e867
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Apr 4 15:11:24 2024 +0500
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Apr 4 15:12:14 2024 +0200

    tdf#81012: avoid content frames in footnotes / endnotes
    
    This makes the behavior of the endnotes in the end of sections consistent
    with the behavior of dedicated endnote pages, where heading fields ignore
    headings in endnote content.
    
    Change-Id: Iad0218b75a678808b1266024fe4c81f040a631c4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165789
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index c764f898d93f..adf6097582b8 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -233,7 +233,7 @@ const SwTextNode* GetBodyTextNode( const SwDoc& rDoc, 
SwPosition& rPos,
             else
                 pContentFrame = pPgFrame->FindLastBodyContent();
 
-            if( pContentFrame )
+            if( pContentFrame && !pContentFrame->IsInFootnote() )
             {
                 assert(pContentFrame->IsTextFrame());
                 SwTextFrame const*const pFrame(static_cast<SwTextFrame 
const*>(pContentFrame));