include/svx/sdr/contact/viewobjectcontact.hxx | 2
svx/qa/unit/svdraw.cxx | 5
svx/source/sdr/contact/viewobjectcontact.cxx | 108 +++++-----
svx/source/sdr/contact/viewobjectcontactofgroup.cxx | 13 +
vcl/qa/cppunit/pdfexport/data/grouped-shape.fodt | 213 ++++++++++++++++++++
vcl/qa/cppunit/pdfexport/pdfexport.cxx | 132 ++++++++++++
6 files changed, 421 insertions(+), 52 deletions(-)
New commits:
commit b55c602e8d7b3eca95a6b7cb32be4ee1937d7cfb
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Thu Jul 20 19:58:57 2023 +0200
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Jul 27 15:23:26 2023 +0200
tdf#154955 svx: PDF/UA export: tag SdrObjGroup properly
ISO 14289-1:2014, 7.3 Graphics
Graphics that possess semantic value only in combination with other
graphics shall be tagged with a single Figure tag for each group.
Also produce the missing alt-text.
Change-Id: I78e802d8e17a29c2d19fcf3a7ec9961f8f04e391
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154684
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit 2582d2407c9b01a80aaa9ff1850eba576ed56eda)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154700
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx
b/include/svx/sdr/contact/viewobjectcontact.hxx
index 6046bd93fe6b..12195a0faa34 100644
--- a/include/svx/sdr/contact/viewobjectcontact.hxx
+++ b/include/svx/sdr/contact/viewobjectcontact.hxx
@@ -116,6 +116,8 @@ public:
// This method will not handle included hierarchies and not check
visibility.
drawinglayer::primitive2d::Primitive2DContainer const &
getPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const;
+ void createStructureTag(drawinglayer::primitive2d::Primitive2DContainer &
rNewPrimitiveSequence) const;
+
/// check if getPrimitive2DSequence() should create tag
virtual bool isExportPDFTags() const;
diff --git a/svx/qa/unit/svdraw.cxx b/svx/qa/unit/svdraw.cxx
index de6ba067fe1f..d61dde7734cd 100644
--- a/svx/qa/unit/svdraw.cxx
+++ b/svx/qa/unit/svdraw.cxx
@@ -397,8 +397,9 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest,
testTdf148000_EOLinCurvedText)
xmlDocUniquePtr pXmlDoc =
lcl_dumpAndParseFirstObjectWithAssert(pSdrPage);
- OString aBasePath
- =
"/primitive2D/objectinfo[4]/unhandled/unhandled/polypolygoncolor/polypolygon/";
+ // this is a group shape, hence 2 nested objectinfo
+ OString aBasePath =
"/primitive2D/objectinfo[4]/objectinfo/unhandled/unhandled/"
+ "polypolygoncolor/polypolygon/";
// The text is: "O" + eop + "O" + eol + "O"
// It should be displayed as 3 line of text. (1 "O" letter in every
line)
diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx
b/svx/source/sdr/contact/viewobjectcontact.cxx
index caac4a301042..3f2ce8dc34fa 100644
--- a/svx/source/sdr/contact/viewobjectcontact.cxx
+++ b/svx/source/sdr/contact/viewobjectcontact.cxx
@@ -350,53 +350,18 @@ bool ViewObjectContact::isExportPDFTags() const
return GetObjectContact().isExportTaggedPDF();
}
-drawinglayer::primitive2d::Primitive2DContainer const &
ViewObjectContact::getPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const
+/** Check if we need to embed to a StructureTagPrimitive2D, too. This
+ was done at ImplRenderPaintProc::createRedirectedPrimitive2DSequence before
+*/
+void
ViewObjectContact::createStructureTag(drawinglayer::primitive2d::Primitive2DContainer
& rNewPrimitiveSequence) const
{
- // only some of the top-level apps are any good at reliably invalidating
us (e.g. writer is not)
- SdrObject* pSdrObj(mrViewContact.TryToGetSdrObject());
-
- if (nullptr != pSdrObj &&
pSdrObj->getSdrModelFromSdrObject().IsVOCInvalidationIsReliable())
- {
- if (!mxPrimitive2DSequence.empty())
- return mxPrimitive2DSequence;
- }
-
- // prepare new representation
- drawinglayer::primitive2d::Primitive2DContainer xNewPrimitiveSequence;
-
- // take care of redirectors and create new list
- ViewObjectContactRedirector* pRedirector =
GetObjectContact().GetViewObjectContactRedirector();
-
- if(pRedirector)
- {
- pRedirector->createRedirectedPrimitive2DSequence(*this, rDisplayInfo,
xNewPrimitiveSequence);
- }
- else
- {
- createPrimitive2DSequence(rDisplayInfo, xNewPrimitiveSequence);
- }
-
- // check and eventually embed to GridOffset transform primitive (calc only)
- if(!xNewPrimitiveSequence.empty() &&
GetObjectContact().supportsGridOffsets())
- {
- const basegfx::B2DVector& rGridOffset(getGridOffset());
-
- if(0.0 != rGridOffset.getX() || 0.0 != rGridOffset.getY())
- {
- const basegfx::B2DHomMatrix aTranslateGridOffset(
- basegfx::utils::createTranslateB2DHomMatrix(
- rGridOffset));
- drawinglayer::primitive2d::Primitive2DReference aEmbed(
- new drawinglayer::primitive2d::TransformPrimitive2D(
- aTranslateGridOffset,
- std::move(xNewPrimitiveSequence)));
- xNewPrimitiveSequence =
drawinglayer::primitive2d::Primitive2DContainer { aEmbed };
- }
- }
+ SdrObject *const pSdrObj(mrViewContact.TryToGetSdrObject());
// Check if we need to embed to a StructureTagPrimitive2D, too. This
// was done at ImplRenderPaintProc::createRedirectedPrimitive2DSequence
before
- if (!xNewPrimitiveSequence.empty() && isExportPDFTags())
+ if (!rNewPrimitiveSequence.empty() && isExportPDFTags()
+ // ISO 14289-1:2014, Clause: 7.3
+ && (!pSdrObj || pSdrObj->getParentSdrObjectFromSdrObject() == nullptr))
{
if (nullptr != pSdrObj && !pSdrObj->IsDecorative())
{
@@ -412,7 +377,7 @@ drawinglayer::primitive2d::Primitive2DContainer const &
ViewObjectContact::getPr
if ( nInventor == SdrInventor::Default )
{
if ( nIdentifier == SdrObjKind::Group )
- eElement = vcl::PDFWriter::Section;
+ eElement = vcl::PDFWriter::Figure;
else if (nIdentifier == SdrObjKind::Table)
eElement = vcl::PDFWriter::Table;
else if (nIdentifier == SdrObjKind::Media)
@@ -456,26 +421,73 @@ drawinglayer::primitive2d::Primitive2DContainer const &
ViewObjectContact::getPr
eElement,
bBackground,
bImage,
- std::move(xNewPrimitiveSequence),
+ std::move(rNewPrimitiveSequence),
pAnchorKey,
&annotIds));
- xNewPrimitiveSequence =
drawinglayer::primitive2d::Primitive2DContainer { xReference };
+ rNewPrimitiveSequence =
drawinglayer::primitive2d::Primitive2DContainer { xReference };
}
}
}
else
{
// page backgrounds etc should be tagged as artifacts:
- xNewPrimitiveSequence =
drawinglayer::primitive2d::Primitive2DContainer {
+ rNewPrimitiveSequence =
drawinglayer::primitive2d::Primitive2DContainer {
new drawinglayer::primitive2d::StructureTagPrimitive2D(
// lies to force silly VclMetafileProcessor2D to emit
NonStructElement
vcl::PDFWriter::Division,
true,
true,
- std::move(xNewPrimitiveSequence))
+ std::move(rNewPrimitiveSequence))
};
}
}
+}
+
+drawinglayer::primitive2d::Primitive2DContainer const &
ViewObjectContact::getPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const
+{
+ // only some of the top-level apps are any good at reliably invalidating
us (e.g. writer is not)
+ SdrObject* pSdrObj(mrViewContact.TryToGetSdrObject());
+
+ if (nullptr != pSdrObj &&
pSdrObj->getSdrModelFromSdrObject().IsVOCInvalidationIsReliable())
+ {
+ if (!mxPrimitive2DSequence.empty())
+ return mxPrimitive2DSequence;
+ }
+
+ // prepare new representation
+ drawinglayer::primitive2d::Primitive2DContainer xNewPrimitiveSequence;
+
+ // take care of redirectors and create new list
+ ViewObjectContactRedirector* pRedirector =
GetObjectContact().GetViewObjectContactRedirector();
+
+ if(pRedirector)
+ {
+ pRedirector->createRedirectedPrimitive2DSequence(*this, rDisplayInfo,
xNewPrimitiveSequence);
+ }
+ else
+ {
+ createPrimitive2DSequence(rDisplayInfo, xNewPrimitiveSequence);
+ }
+
+ // check and eventually embed to GridOffset transform primitive (calc only)
+ if(!xNewPrimitiveSequence.empty() &&
GetObjectContact().supportsGridOffsets())
+ {
+ const basegfx::B2DVector& rGridOffset(getGridOffset());
+
+ if(0.0 != rGridOffset.getX() || 0.0 != rGridOffset.getY())
+ {
+ const basegfx::B2DHomMatrix aTranslateGridOffset(
+ basegfx::utils::createTranslateB2DHomMatrix(
+ rGridOffset));
+ drawinglayer::primitive2d::Primitive2DReference aEmbed(
+ new drawinglayer::primitive2d::TransformPrimitive2D(
+ aTranslateGridOffset,
+ std::move(xNewPrimitiveSequence)));
+ xNewPrimitiveSequence =
drawinglayer::primitive2d::Primitive2DContainer { aEmbed };
+ }
+ }
+
+ createStructureTag(xNewPrimitiveSequence);
// Local up-to-date checks. New list different from local one?
// This is the important point where it gets decided if the current or the
new
diff --git a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx
b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx
index 90a74cfabc8a..6a59cfc3357d 100644
--- a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx
@@ -45,6 +45,8 @@ namespace sdr::contact
if(!isPrimitiveVisible(rDisplayInfo))
return;
+ drawinglayer::primitive2d::Primitive2DContainer primitiveSequence;
+
const sal_uInt32
nSubHierarchyCount(GetViewContact().GetObjectCount());
if(nSubHierarchyCount)
{
@@ -59,7 +61,7 @@ namespace sdr::contact
}
// visit object hierarchy
- getPrimitive2DSequenceSubHierarchy(rDisplayInfo, rVisitor);
+ getPrimitive2DSequenceSubHierarchy(rDisplayInfo,
primitiveSequence);
if(bDoGhostedDisplaying)
{
@@ -70,8 +72,15 @@ namespace sdr::contact
{
// draw replacement object for group. This will use
ViewContactOfGroup::createViewIndependentPrimitive2DSequence
// which creates the replacement primitives for an empty group
-
ViewObjectContactOfSdrObj::getPrimitive2DSequenceHierarchy(rDisplayInfo,
rVisitor);
+
ViewObjectContactOfSdrObj::getPrimitive2DSequenceHierarchy(rDisplayInfo,
primitiveSequence);
}
+
+ primitiveSequence =
GetViewContact().embedToObjectSpecificInformation(primitiveSequence);
+
+ // ISO 14289-1:2014, Clause: 7.3
+ createStructureTag(primitiveSequence);
+
+ rVisitor.visit(primitiveSequence);
}
bool ViewObjectContactOfGroup::isPrimitiveVisibleOnAnyLayer(const
SdrLayerIDSet& aLayers) const
diff --git a/vcl/qa/cppunit/pdfexport/data/grouped-shape.fodt
b/vcl/qa/cppunit/pdfexport/data/grouped-shape.fodt
new file mode 100644
index 000000000000..af506d9688c1
--- /dev/null
+++ b/vcl/qa/cppunit/pdfexport/data/grouped-shape.fodt
@@ -0,0 +1,213 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<office:document xmlns:css3t="http://www.w3.org/TR/css3-text/";
xmlns:grddl="http://www.w3.org/2003/g/data-view#";
xmlns:xhtml="http://www.w3.org/1999/xhtml";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xforms="http://www.w3.org/2002/xforms";
xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:ooo="http://openoffice.org/2004/office";
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
xmlns:ooow="http://openoffice.org/2004/writer";
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:drawooo="http://openoffice.org/2010/draw";
xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:c
alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
xmlns:tableooo="http://openoffice.org/2009/table";
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:rpt="http://openoffice.org/2005/report";
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:officeooo="http://openoffice.org/2009/office";
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:
meta:1.0"
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
+ <office:meta><meta:initial-creator>Gabor Kelemen
LO</meta:initial-creator><meta:creation-date>2023-04-19T23:36:32.150000000</meta:creation-date><dc:date>2023-07-20T19:34:33.405705509</dc:date><meta:editing-duration>PT7M23S</meta:editing-duration><meta:editing-cycles>4</meta:editing-cycles><meta:generator>LibreOfficeDev/24.2.0.0.alpha0$Linux_X86_64
LibreOffice_project/9c21d86f20871f2840fe390c5f365de48d48258a</meta:generator><dc:title>Grouped
shapes a11y example</dc:title><meta:document-statistic meta:table-count="0"
meta:image-count="0" meta:object-count="0" meta:page-count="1"
meta:paragraph-count="0" meta:word-count="0" meta:character-count="0"
meta:non-whitespace-character-count="0"/></office:meta>
+ <office:font-face-decls>
+ <style:font-face style:name="Liberation Serif" svg:font-family="'Liberation
Serif'" style:font-family-generic="roman" style:font-pitch="variable"/>
+ <style:font-face style:name="Lucida Sans1" svg:font-family="'Lucida Sans'"
style:font-family-generic="system" style:font-pitch="variable"/>
+ <style:font-face style:name="NSimSun" svg:font-family="NSimSun"
style:font-family-generic="system" style:font-pitch="variable"/>
+ </office:font-face-decls>
+ <office:styles>
+ <style:default-style style:family="graphic">
+ <style:graphic-properties svg:stroke-color="#3465a4"
draw:fill-color="#729fcf" fo:wrap-option="no-wrap" draw:shadow-offset-x="0.3cm"
draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm"
draw:start-line-spacing-vertical="0.283cm"
draw:end-line-spacing-horizontal="0.283cm"
draw:end-line-spacing-vertical="0.283cm" style:writing-mode="lr-tb"
style:flow-with-text="false"/>
+ <style:paragraph-properties style:text-autospace="ideograph-alpha"
style:line-break="strict" loext:tab-stop-distance="0cm"
style:font-independent-line-spacing="false">
+ <style:tab-stops/>
+ </style:paragraph-properties>
+ <style:text-properties style:use-window-font-color="true"
loext:opacity="0%" style:font-name="Liberation Serif" fo:font-size="12pt"
fo:language="en" fo:country="US" style:letter-kerning="true"
style:font-name-asian="NSimSun" style:font-size-asian="10.5pt"
style:language-asian="zh" style:country-asian="CN"
style:font-name-complex="Lucida Sans1" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN"/>
+ </style:default-style>
+ <style:default-style style:family="paragraph">
+ <style:paragraph-properties fo:orphans="2" fo:widows="2"
fo:hyphenation-ladder-count="no-limit" style:text-autospace="ideograph-alpha"
style:punctuation-wrap="hanging" style:line-break="strict"
style:tab-stop-distance="1.251cm" style:writing-mode="page"/>
+ <style:text-properties style:use-window-font-color="true"
loext:opacity="0%" style:font-name="Liberation Serif" fo:font-size="12pt"
fo:language="en" fo:country="US" style:letter-kerning="true"
style:font-name-asian="NSimSun" style:font-size-asian="10.5pt"
style:language-asian="zh" style:country-asian="CN"
style:font-name-complex="Lucida Sans1" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN" fo:hyphenate="false"
fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2"
loext:hyphenation-no-caps="false" loext:hyphenation-no-last-word="false"
loext:hyphenation-word-char-count="5" loext:hyphenation-zone="no-limit"/>
+ </style:default-style>
+ <style:default-style style:family="table">
+ <style:table-properties table:border-model="collapsing"/>
+ </style:default-style>
+ <style:default-style style:family="table-row">
+ <style:table-row-properties fo:keep-together="auto"/>
+ </style:default-style>
+ <style:style style:name="Standard" style:family="paragraph"
style:class="text"/>
+ <text:outline-style style:name="Outline">
+ <text:outline-level-style text:level="1" loext:num-list-format="%1%"
style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="2" loext:num-list-format="%2%"
style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="3" loext:num-list-format="%3%"
style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="4" loext:num-list-format="%4%"
style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="5" loext:num-list-format="%5%"
style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="6" loext:num-list-format="%6%"
style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="7" loext:num-list-format="%7%"
style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="8" loext:num-list-format="%8%"
style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="9" loext:num-list-format="%9%"
style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="10" loext:num-list-format="%10%"
style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ </text:outline-style>
+ <text:notes-configuration text:note-class="footnote" style:num-format="1"
text:start-value="0" text:footnotes-position="page"
text:start-numbering-at="document"/>
+ <text:notes-configuration text:note-class="endnote" style:num-format="i"
text:start-value="0"/>
+ <text:linenumbering-configuration text:number-lines="false"
text:offset="0.499cm" style:num-format="1" text:number-position="left"
text:increment="5"/>
+ <loext:theme loext:name="Office Theme">
+ <loext:theme-colors loext:name="LibreOffice">
+ <loext:color loext:name="dark1" loext:color="#000000"/>
+ <loext:color loext:name="light1" loext:color="#ffffff"/>
+ <loext:color loext:name="dark2" loext:color="#000000"/>
+ <loext:color loext:name="light2" loext:color="#ffffff"/>
+ <loext:color loext:name="accent1" loext:color="#18a303"/>
+ <loext:color loext:name="accent2" loext:color="#0369a3"/>
+ <loext:color loext:name="accent3" loext:color="#a33e03"/>
+ <loext:color loext:name="accent4" loext:color="#8e03a3"/>
+ <loext:color loext:name="accent5" loext:color="#c99c00"/>
+ <loext:color loext:name="accent6" loext:color="#c9211e"/>
+ <loext:color loext:name="hyperlink" loext:color="#0000ee"/>
+ <loext:color loext:name="followed-hyperlink" loext:color="#551a8b"/>
+ </loext:theme-colors>
+ </loext:theme>
+ </office:styles>
+ <office:automatic-styles>
+ <style:style style:name="P1" style:family="paragraph">
+ <loext:graphic-properties draw:fill="solid" draw:fill-color="#00a933"/>
+ </style:style>
+ <style:style style:name="P2" style:family="paragraph">
+ <loext:graphic-properties draw:fill="solid" draw:fill-color="#00a933"/>
+ <style:paragraph-properties style:writing-mode="lr-tb"/>
+ </style:style>
+ <style:style style:name="P3" style:family="paragraph">
+ <style:paragraph-properties style:writing-mode="lr-tb"/>
+ </style:style>
+ <style:style style:name="gr1" style:family="graphic">
+ <style:graphic-properties style:writing-mode="lr-tb"
loext:decorative="false" style:run-through="foreground"
style:vertical-pos="from-top" style:vertical-rel="paragraph"
style:horizontal-pos="from-left" style:horizontal-rel="paragraph"
draw:wrap-influence-on-position="once-concurrent" loext:allow-overlap="true"
style:flow-with-text="false"/>
+ </style:style>
+ <style:style style:name="gr2" style:family="graphic">
+ <style:graphic-properties draw:fill="solid" draw:fill-color="#00a933"
draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle"
draw:auto-grow-height="false" fo:min-height="3.247cm" fo:min-width="4.089cm"
loext:decorative="false" style:run-through="foreground"/>
+ </style:style>
+ <style:style style:name="gr3" style:family="graphic">
+ <style:graphic-properties draw:fill="solid" draw:fill-color="#00a933"
draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle"
draw:auto-grow-height="false" fo:min-height="1.762cm" fo:min-width="1.762cm"
style:writing-mode="lr-tb" loext:decorative="false"
style:run-through="foreground"/>
+ <style:paragraph-properties style:writing-mode="lr-tb"/>
+ </style:style>
+ <style:style style:name="gr4" style:family="graphic">
+ <style:graphic-properties draw:textarea-horizontal-align="justify"
draw:textarea-vertical-align="middle" draw:auto-grow-height="false"
fo:min-height="3.247cm" fo:min-width="4.089cm" loext:decorative="false"
style:run-through="foreground"/>
+ </style:style>
+ <style:style style:name="gr5" style:family="graphic">
+ <style:graphic-properties draw:textarea-horizontal-align="justify"
draw:textarea-vertical-align="middle" draw:auto-grow-height="false"
fo:min-height="1.762cm" fo:min-width="1.762cm" style:writing-mode="lr-tb"
loext:decorative="false" style:run-through="foreground"/>
+ <style:paragraph-properties style:writing-mode="lr-tb"/>
+ </style:style>
+ <style:page-layout style:name="pm1">
+ <style:page-layout-properties fo:page-width="21.59cm"
fo:page-height="27.94cm" style:num-format="1"
style:print-orientation="portrait" fo:margin-top="2cm" fo:margin-bottom="2cm"
fo:margin-left="2cm" fo:margin-right="2cm" style:writing-mode="lr-tb"
style:layout-grid-color="#c0c0c0" style:layout-grid-lines="20"
style:layout-grid-base-height="0.706cm" style:layout-grid-ruby-height="0.353cm"
style:layout-grid-mode="none" style:layout-grid-ruby-below="false"
style:layout-grid-print="false" style:layout-grid-display="false"
style:footnote-max-height="0cm" loext:margin-gutter="0cm">
+ <style:footnote-sep style:width="0.018cm"
style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm"
style:line-style="solid" style:adjustment="left" style:rel-width="25%"
style:color="#000000"/>
+ </style:page-layout-properties>
+ <style:header-style/>
+ <style:footer-style/>
+ </style:page-layout>
+ <style:page-layout style:name="pm2" style:page-usage="left">
+ <style:page-layout-properties fo:page-width="21.59cm"
fo:page-height="27.94cm" style:num-format="1"
style:print-orientation="portrait" fo:margin-top="2cm" fo:margin-bottom="2cm"
fo:margin-left="2cm" fo:margin-right="2cm" style:writing-mode="lr-tb"
style:layout-grid-color="#c0c0c0" style:layout-grid-lines="20"
style:layout-grid-base-height="0.706cm" style:layout-grid-ruby-height="0.353cm"
style:layout-grid-mode="none" style:layout-grid-ruby-below="false"
style:layout-grid-print="false" style:layout-grid-display="false"
style:footnote-max-height="0cm" loext:margin-gutter="0cm">
+ <style:footnote-sep style:width="0.018cm"
style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm"
style:line-style="solid" style:adjustment="left" style:rel-width="25%"
style:color="#000000"/>
+ </style:page-layout-properties>
+ <style:header-style/>
+ <style:footer-style/>
+ </style:page-layout>
+ <style:page-layout style:name="pm3" style:page-usage="right">
+ <style:page-layout-properties fo:page-width="21.59cm"
fo:page-height="27.94cm" style:num-format="1"
style:print-orientation="portrait" fo:margin-top="2cm" fo:margin-bottom="2cm"
fo:margin-left="2cm" fo:margin-right="2cm" style:writing-mode="lr-tb"
style:layout-grid-color="#c0c0c0" style:layout-grid-lines="20"
style:layout-grid-base-height="0.706cm" style:layout-grid-ruby-height="0.353cm"
style:layout-grid-mode="none" style:layout-grid-ruby-below="false"
style:layout-grid-print="false" style:layout-grid-display="false"
style:footnote-max-height="0cm" loext:margin-gutter="0cm">
+ <style:footnote-sep style:width="0.018cm"
style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm"
style:line-style="solid" style:adjustment="left" style:rel-width="25%"
style:color="#000000"/>
+ </style:page-layout-properties>
+ <style:header-style/>
+ <style:footer-style/>
+ </style:page-layout>
+ <style:page-layout style:name="pm4">
+ <style:page-layout-properties fo:page-width="22.901cm"
fo:page-height="11.4cm" style:num-format="1"
style:print-orientation="landscape" fo:margin-top="0cm" fo:margin-bottom="0cm"
fo:margin-left="0cm" fo:margin-right="0cm" style:writing-mode="lr-tb"
style:layout-grid-color="#c0c0c0" style:layout-grid-lines="20"
style:layout-grid-base-height="0.706cm" style:layout-grid-ruby-height="0.353cm"
style:layout-grid-mode="none" style:layout-grid-ruby-below="false"
style:layout-grid-print="false" style:layout-grid-display="false"
style:footnote-max-height="0cm" loext:margin-gutter="0cm">
+ <style:footnote-sep style:width="0.018cm"
style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm"
style:line-style="solid" style:adjustment="left" style:rel-width="25%"
style:color="#000000"/>
+ </style:page-layout-properties>
+ <style:header-style/>
+ <style:footer-style/>
+ </style:page-layout>
+ <style:page-layout style:name="pm5">
+ <style:page-layout-properties fo:page-width="21.59cm"
fo:page-height="27.94cm" style:num-format="1"
style:print-orientation="portrait" fo:margin-top="1cm" fo:margin-bottom="1cm"
fo:margin-left="2cm" fo:margin-right="1cm" style:writing-mode="lr-tb"
style:layout-grid-color="#c0c0c0" style:layout-grid-lines="20"
style:layout-grid-base-height="0.706cm" style:layout-grid-ruby-height="0.353cm"
style:layout-grid-mode="none" style:layout-grid-ruby-below="false"
style:layout-grid-print="false" style:layout-grid-display="false"
style:footnote-max-height="0cm" loext:margin-gutter="0cm">
+ <style:footnote-sep style:width="0.018cm"
style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm"
style:line-style="solid" style:adjustment="left" style:rel-width="25%"
style:color="#000000"/>
+ </style:page-layout-properties>
+ <style:header-style/>
+ <style:footer-style/>
+ </style:page-layout>
+ <style:page-layout style:name="pm6">
+ <style:page-layout-properties fo:page-width="21.59cm"
fo:page-height="27.94cm" style:num-format="1"
style:print-orientation="portrait" fo:margin-top="2cm" fo:margin-bottom="2cm"
fo:margin-left="2cm" fo:margin-right="2cm" style:writing-mode="lr-tb"
style:layout-grid-color="#c0c0c0" style:layout-grid-lines="20"
style:layout-grid-base-height="0.706cm" style:layout-grid-ruby-height="0.353cm"
style:layout-grid-mode="none" style:layout-grid-ruby-below="false"
style:layout-grid-print="false" style:layout-grid-display="false"
style:footnote-max-height="0cm" loext:margin-gutter="0cm">
+ <style:footnote-sep style:line-style="solid" style:adjustment="left"
style:rel-width="25%" style:color="#000000"/>
+ </style:page-layout-properties>
+ <style:header-style/>
+ <style:footer-style/>
+ </style:page-layout>
+ <style:page-layout style:name="pm7">
+ <style:page-layout-properties fo:page-width="27.94cm"
fo:page-height="21.59cm" style:num-format="1"
style:print-orientation="landscape" fo:margin-top="2cm" fo:margin-bottom="2cm"
fo:margin-left="2cm" fo:margin-right="2cm" style:writing-mode="lr-tb"
style:layout-grid-color="#c0c0c0" style:layout-grid-lines="20"
style:layout-grid-base-height="0.706cm" style:layout-grid-ruby-height="0.353cm"
style:layout-grid-mode="none" style:layout-grid-ruby-below="false"
style:layout-grid-print="false" style:layout-grid-display="false"
style:footnote-max-height="0cm" loext:margin-gutter="0cm">
+ <style:footnote-sep style:width="0.018cm"
style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm"
style:line-style="solid" style:adjustment="left" style:rel-width="25%"
style:color="#000000"/>
+ </style:page-layout-properties>
+ <style:header-style/>
+ <style:footer-style/>
+ </style:page-layout>
+ <style:style style:name="dp1" style:family="drawing-page">
+ <style:drawing-page-properties draw:background-size="full"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page style:name="Standard" style:page-layout-name="pm1"
draw:style-name="dp1"/>
+ </office:master-styles>
+ <office:body>
+ <office:text>
+ <text:sequence-decls>
+ <text:sequence-decl text:display-outline-level="0"
text:name="Illustration"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Table"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Text"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Figure"/>
+ </text:sequence-decls>
+ <text:p text:style-name="Standard"><draw:g text:anchor-type="paragraph"
draw:z-index="0" draw:name="DrawObject1" draw:style-name="gr1">
+ <svg:title>Two rectangles</svg:title>
+ <svg:desc>Grouped</svg:desc><draw:custom-shape draw:name="Shape 1"
draw:style-name="gr4" svg:width="4.089cm" svg:height="3.248cm" svg:x="0.4cm"
svg:y="0.362cm">
+ <text:p/>
+ <draw:enhanced-geometry svg:viewBox="0 0 21600 21600"
draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0
0 Z N"/>
+ </draw:custom-shape><draw:custom-shape draw:name="Shape 2"
draw:style-name="gr5" draw:text-style-name="P3" svg:width="1.763cm"
svg:height="1.763cm" svg:x="6.565cm" svg:y="1.692cm">
+ <text:p/>
+ <draw:enhanced-geometry svg:viewBox="0 0 21600 21600"
draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0
0 Z N"/>
+ </draw:custom-shape>
+ </draw:g><draw:g text:anchor-type="paragraph" draw:z-index="1"
draw:name="DrawObject 1" draw:style-name="gr1">
+ <svg:title>these ones are green</svg:title><draw:custom-shape
draw:name="Shape 5" draw:style-name="gr2" draw:text-style-name="P1"
svg:width="4.089cm" svg:height="3.248cm" svg:x="4.586cm" svg:y="7.41cm">
+ <text:p/>
+ <draw:enhanced-geometry svg:viewBox="0 0 21600 21600"
draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0
0 Z N"/>
+ </draw:custom-shape><draw:custom-shape draw:name="Shape 6"
draw:style-name="gr3" draw:text-style-name="P2" svg:width="1.763cm"
svg:height="1.763cm" svg:x="10.751cm" svg:y="8.74cm">
+ <text:p/>
+ <draw:enhanced-geometry svg:viewBox="0 0 21600 21600"
draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0
0 Z N"/>
+ </draw:custom-shape>
+ </draw:g></text:p>
+ </office:text>
+ </office:body>
+</office:document>
\ No newline at end of file
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index ceda76abf6e1..7bdc38ac1373 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -3875,6 +3875,138 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf135192)
CPPUNIT_ASSERT_EQUAL(int(1), nTable);
}
+CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf154955)
+{
+ aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export");
+
+ // Enable PDF/UA
+ uno::Sequence<beans::PropertyValue> aFilterData(
+ comphelper::InitPropertySequence({ { "PDFUACompliance", uno::Any(true)
} }));
+ aMediaDescriptor["FilterData"] <<= aFilterData;
+ saveAsPDF(u"grouped-shape.fodt");
+
+ vcl::filter::PDFDocument aDocument;
+ SvFileStream aStream(maTempFile.GetURL(), StreamMode::READ);
+ CPPUNIT_ASSERT(aDocument.Read(aStream));
+
+ // The document has one page.
+ std::vector<vcl::filter::PDFObjectElement*> aPages = aDocument.GetPages();
+ CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), aPages.size());
+
+ vcl::filter::PDFObjectElement* pContents =
aPages[0]->LookupObject("Contents");
+ CPPUNIT_ASSERT(pContents);
+ vcl::filter::PDFStreamElement* pStream = pContents->GetStream();
+ CPPUNIT_ASSERT(pStream);
+ SvMemoryStream& rObjectStream = pStream->GetMemory();
+ // Uncompress it.
+ SvMemoryStream aUncompressed;
+ ZCodec aZCodec;
+ aZCodec.BeginCompression();
+ rObjectStream.Seek(0);
+ aZCodec.Decompress(rObjectStream, aUncompressed);
+ CPPUNIT_ASSERT(aZCodec.EndCompression());
+
+ auto pStart = static_cast<const char*>(aUncompressed.GetData());
+ const char* const pEnd = pStart + aUncompressed.GetSize();
+
+ enum
+ {
+ Default,
+ Artifact,
+ Tagged
+ } state
+ = Default;
+
+ auto nLine(0);
+ auto nTagged(0);
+ auto nArtifacts(0);
+ while (true)
+ {
+ ++nLine;
+ auto const pLine = ::std::find(pStart, pEnd, '\n');
+ if (pLine == pEnd)
+ {
+ break;
+ }
+ std::string_view const line(pStart, pLine - pStart);
+ pStart = pLine + 1;
+ if (!line.empty() && line[0] != '%')
+ {
+ ::std::cerr << nLine << ": " << line << "\n";
+ if (o3tl::starts_with(line, "/Artifact "))
+ {
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("unexpected nesting", Default,
state);
+ state = Artifact;
+ ++nArtifacts;
+ }
+ else if (o3tl::starts_with(line, "/Figure<</MCID "))
+ {
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("unexpected nesting", Default,
state);
+ state = Tagged;
+ ++nTagged;
+ }
+ else if (line == "EMC")
+ {
+ CPPUNIT_ASSERT_MESSAGE("unexpected end", state != Default);
+ state = Default;
+ }
+ else if (nLine > 1) // first line is expected "0.1 w"
+ {
+ CPPUNIT_ASSERT_MESSAGE("unexpected content outside MCS", state
!= Default);
+ }
+ }
+ }
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("unclosed MCS", Default, state);
+ CPPUNIT_ASSERT_EQUAL(static_cast<decltype(nTagged)>(2), nTagged);
+ CPPUNIT_ASSERT(nArtifacts >= 1);
+
+ int nFigure(0);
+ for (const auto& rDocElement : aDocument.GetElements())
+ {
+ auto pObject =
dynamic_cast<vcl::filter::PDFObjectElement*>(rDocElement.get());
+ if (!pObject)
+ continue;
+ auto pType =
dynamic_cast<vcl::filter::PDFNameElement*>(pObject->Lookup("Type"));
+ if (pType && pType->GetValue() == "StructElem")
+ {
+ auto pS =
dynamic_cast<vcl::filter::PDFNameElement*>(pObject->Lookup("S"));
+ if (pS && pS->GetValue() == "Figure")
+ {
+ switch (nFigure)
+ {
+ case 0:
+ CPPUNIT_ASSERT_EQUAL(OUString(u"Two rectangles -
Grouped"),
+
::vcl::filter::PDFDocument::DecodeHexStringUTF16BE(
+
*dynamic_cast<vcl::filter::PDFHexStringElement*>(
+ pObject->Lookup("Alt"))));
+ break;
+ case 1:
+ CPPUNIT_ASSERT_EQUAL(OUString(u"these ones are green"),
+
::vcl::filter::PDFDocument::DecodeHexStringUTF16BE(
+
*dynamic_cast<vcl::filter::PDFHexStringElement*>(
+ pObject->Lookup("Alt"))));
+ break;
+ }
+
+ auto pParentRef
+ =
dynamic_cast<vcl::filter::PDFReferenceElement*>(pObject->Lookup("P"));
+ CPPUNIT_ASSERT(pParentRef);
+ auto pParent(pParentRef->LookupObject());
+ CPPUNIT_ASSERT(pParent);
+ auto pParentType
+ =
dynamic_cast<vcl::filter::PDFNameElement*>(pParent->Lookup("Type"));
+ CPPUNIT_ASSERT_EQUAL(OString("StructElem"),
pParentType->GetValue());
+ auto pParentS =
dynamic_cast<vcl::filter::PDFNameElement*>(pParent->Lookup("S"));
+ CPPUNIT_ASSERT_EQUAL(OString("Standard"),
pParentS->GetValue());
+
+ ++nFigure;
+ }
+ }
+ }
+ // the problem was that there were 4 shapes (the sub-shapes of the 2
groups)
+ CPPUNIT_ASSERT_EQUAL(int(2), nFigure);
+}
+
CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf155190)
{
aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export");
