diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2023-03-16 19:48:31 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2023-03-22 11:53:38 +0000 |
| commit | e84b310b59825fd572d79def98c3d21566aac603 (patch) | |
| tree | 615a52cbf4ad57a5099bbcbfcf825a71edd6c287 /drawinglayer/source/primitive2d | |
| parent | 7f4b53b1c7c192ecfef35913133239b670070062 (diff) | |
vcl,drawinglayer,svx,sw,sd: PDF/UA export: Annot StructElem for SdrMediaObj
veraPDF complains:
Specification: ISO 14289-1:2014, Clause: 7.18.1, Test number: 1
An annotation, excluding annotations of subtype Widget, Popup or
Link, shall be nested within an Annot tag
This is very similar to Link annotations, that is to say, extremely
complicated to get it thought the convoluted PDF export code, with
additional complication that the StructElem is produced by drawinglayer
and the page annotation by sw.
Put another map into PDFExtOutDevData where sw code puts stuff for the
SdrObject that drawinglayer can find.
The test had the problem that PDFObjectParser::parse() could not handle:
<</Nums[
0 [ 6 0 R ]
1 6 0 R
]>>
Fix dropping the "1".
Change-Id: If5bf7c552e26ebb7e631030b8aaecd4281e77acc
(cherry picked from commit c78e90bd28cc4d6d3bde473535107784b12d9c0d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149008
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'drawinglayer/source/primitive2d')
| -rw-r--r-- | drawinglayer/source/primitive2d/structuretagprimitive2d.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx index 7e4de87ed64a..62da91ecc00f 100644 --- a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx @@ -31,13 +31,18 @@ namespace drawinglayer::primitive2d bool bBackground, bool bIsImage, Primitive2DContainer&& aChildren, - sal_Int32 const nAnchorStructureElementId) + sal_Int32 const nAnchorStructureElementId, + ::std::vector<sal_Int32> const*const pAnnotIds) : GroupPrimitive2D(std::move(aChildren)), maStructureElement(rStructureElement), mbBackground(bBackground), mbIsImage(bIsImage) , m_nAnchorStructureElementId(nAnchorStructureElementId) { + if (pAnnotIds) + { + m_AnnotIds = *pAnnotIds; + } } bool StructureTagPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const |