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

[Michael Stahl (via logerrit)]

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

New commits:
commit 1815e2efc6a780a18be721eb9680b014b58357b3
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Wed Aug 2 15:01:20 2023 +0200
Commit:     Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Tue Aug 8 18:12:23 2023 +0200

    tdf#156306 sw: PDF export: duplicate structure element from ...
    
    ... lazy open LIBody - with mpFrameInfo, not mpNumInfo - causes this
    assert and later an infinite loop as the SE is its own parent:
    
    sw/source/core/text/EnhancedPDFExportHelper.cxx:468: void 
SwTaggedPDFHelper::BeginTag(vcl::PDFWriter::StructElement, const 
rtl::OUString&): Assertion `rFrameTagSet.find(pKey) == rFrameTagSet.end()' 
failed.
    
    (regression from commit d467f1aa3d028f399826c97e2eecedcd79efcf65)
    
    Change-Id: I90f057c45a22e5ef44ae5ae9d1cb1d6b8870379f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155253
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit 16aa870598d00eb3e6ac15435fef080d3b87cbc1)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155237
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    (cherry picked from commit 74eafad84463d097adc8fe680f57b2c9039e0a56)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155292
    Reviewed-by: Patrick Luby <plub...@neooffice.org>
    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/sw/source/core/text/EnhancedPDFExportHelper.cxx 
b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 483597ca52b5..22efb8a9fcd6 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -449,7 +449,7 @@ void SwTaggedPDFHelper::BeginTag( 
vcl::PDFWriter::StructElement eType, const OUS
 {
     void const* pKey(nullptr);
 
-    if ( mpFrameInfo )
+    if (mpFrameInfo && eType != vcl::PDFWriter::LIBody)
     {
         const SwFrame& rFrame = mpFrameInfo->mrFrame;