summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorMichael Stahl <michael.stahl@allotropia.de>2023-05-26 16:20:47 +0200
committerMichael Stahl <michael.stahl@allotropia.de>2023-05-26 19:19:20 +0200
commit370533da3f07169791c0a17013ca55c57df2f3c9 (patch)
treee61a654563517962ab16f2cc4d836857067d861d /sw/source
parentef2d064c403738660e9ba6bee6de736d0575dade (diff)
tdf#155190 svx,sw: PDF export: don't tag SwNoTextFrame as Artifact
The problem is that inside of the Figure tag, in SwNoTextFrame::ImplPaintPictureGraphic(), ViewContactOfSwNoTextFrame and ViewObjectContactOfSwNoTextFrame are used to create and process another primitive sequence. ViewObjectContactOfSwNoTextFrame does not have access to a SdrObject, because that was already processed by the outer layer of code that called the SwFlyFrame painting code. Avoid running the code that assumes anything without an SdrObject is an artifact by disabling PDF tags altogether in ViewObjectContactOfSwNoTextFrame. (regression from commit 81ef84648515965bf67afaced946227d0f63a71e) Change-Id: I9fabe7f7e5296f8d850448ac44865f87cd164591 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152335 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/doc/notxtfrm.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index eb0b4d96102a..ccf60904585d 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -993,6 +993,9 @@ protected:
const sdr::contact::DisplayInfo& rDisplayInfo,
drawinglayer::primitive2d::Primitive2DDecompositionVisitor& rVisitor) const override;
+ // tdf#155190 disable this so superclass doesn't wrongly produce NonStruct
+ virtual bool isExportPDFTags() const override { return false; }
+
public:
ViewObjectContactOfSwNoTextFrame(
sdr::contact::ObjectContact& rObjectContact,