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 /include/drawinglayer/primitive2d/structuretagprimitive2d.hxx | |
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 'include/drawinglayer/primitive2d/structuretagprimitive2d.hxx')
-rw-r--r-- | include/drawinglayer/primitive2d/structuretagprimitive2d.hxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx b/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx index 40ad422c2b9a..8ee2b267b57f 100644 --- a/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx @@ -51,6 +51,8 @@ namespace drawinglayer::primitive2d bool mbIsImage; /// anchor structure element (Writer) sal_Int32 m_nAnchorStructureElementId; + /// for Annot structure element, the ids of the annotations + ::std::vector<sal_Int32> m_AnnotIds; public: /// constructor @@ -59,7 +61,8 @@ namespace drawinglayer::primitive2d bool bBackground, bool bIsImage, Primitive2DContainer&& aChildren, - sal_Int32 nAnchorStructureElementId = -1); + sal_Int32 nAnchorStructureElementId = -1, + ::std::vector<sal_Int32> const* pAnnotIds = nullptr); /// data read access const vcl::PDFWriter::StructElement& getStructureElement() const { return maStructureElement; } @@ -67,6 +70,7 @@ namespace drawinglayer::primitive2d bool isImage() const { return mbIsImage; } bool isTaggedSdrObject() const; sal_Int32 GetAnchorStructureElementId() const { return m_nAnchorStructureElementId; } + ::std::vector<sal_Int32> GetAnnotIds() const { return m_AnnotIds; } /// compare operator virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; |