sw/inc/EnhancedPDFExportHelper.hxx | 5
sw/source/core/layout/paintfrm.cxx | 14
sw/source/core/text/EnhancedPDFExportHelper.cxx | 45 ++-
sw/source/core/text/frmpaint.cxx | 2
sw/source/core/text/itrpaint.cxx | 6
vcl/qa/cppunit/pdfexport/data/image-hyperlink-alttext.fodt | 195 +++++++++++++
vcl/qa/cppunit/pdfexport/pdfexport.cxx | 130 ++++++++
7 files changed, 381 insertions(+), 16 deletions(-)
New commits:
commit 56229692918505efcc5d466901e7f1123de45a66
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Mon Jul 10 17:39:03 2023 +0200
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Aug 2 13:01:44 2023 +0200
tdf#154939 sw: PDF/UA export: produce Link StructElem inside Figure
... for a fly frame with a hyperlink set.
Specification: ISO 14289-1:2014, Clause: 7.18.5, Test number: 1
Links shall be tagged according to ISO 32000-1:2008, 14.8.4.4.2, Link
Element.
A Link annotation is nested within null tag instead of Link
Change-Id: I7a2bef8d6100adffb1f40085bba8f18fc68bd8d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154280
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit f2d5653a6792a19e9a45d34ac9dce22e717b8cbf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154263
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx
b/sw/inc/EnhancedPDFExportHelper.hxx
index eee6496bd17d..a6fad2594ae8 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -103,7 +103,10 @@ struct Num_Info
struct Frame_Info
{
const SwFrame& mrFrame;
- Frame_Info( const SwFrame& rFrame ) : mrFrame( rFrame ) {};
+ bool const m_isLink;
+
+ Frame_Info(const SwFrame& rFrame, bool const isLink)
+ : mrFrame(rFrame), m_isLink(isLink) {}
};
struct Por_Info
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 0a43dbb587ab..117ac8eb5e61 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -33,6 +33,7 @@
#include <calbck.hxx>
#include <fmtsrnd.hxx>
#include <fmtclds.hxx>
+#include <fmturl.hxx>
#include <strings.hrc>
#include <swmodule.hxx>
#include <rootfrm.hxx>
@@ -3509,8 +3510,19 @@ SwShortCut::SwShortCut( const SwFrame& rFrame, const
SwRect& rRect )
void SwLayoutFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect
const& rRect, SwPrintData const*const) const
{
// #i16816# tagged pdf support
- Frame_Info aFrameInfo( *this );
+ Frame_Info aFrameInfo(*this, false);
SwTaggedPDFHelper aTaggedPDFHelper( nullptr, &aFrameInfo, nullptr,
rRenderContext );
+ ::std::optional<SwTaggedPDFHelper> oTaggedLink;
+ if (IsFlyFrame())
+ {
+ // tdf#154939 Link nested inside Figure
+ auto const pItem(GetFormat()->GetAttrSet().GetItemIfSet(RES_URL));
+ if (pItem && !pItem->GetURL().isEmpty())
+ {
+ Frame_Info linkInfo(*this, true);
+ oTaggedLink.emplace(nullptr, &linkInfo, nullptr, rRenderContext);
+ }
+ }
const SwFrame *pFrame = Lower();
if ( !pFrame )
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx
b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 483597ca52b5..a864b389ceb9 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -391,7 +391,7 @@ bool SwTaggedPDFHelper::CheckReopenTag()
{
pKeyFrame = &rFrame;
}
- else if ( rFrame.IsFlyFrame() )
+ else if (rFrame.IsFlyFrame() && !mpFrameInfo->m_isLink)
{
const SwFormatAnchor& rAnchor =
static_cast<const
SwFlyFrame*>(&rFrame)->GetFormat()->GetAnchor();
@@ -531,6 +531,23 @@ void SwTaggedPDFHelper::EndTag()
#endif
}
+namespace {
+
+ // link the link annotation to the link structured element
+ void LinkLinkLink(vcl::PDFExtOutDevData & rPDFExtOutDevData, SwRect const&
rRect)
+ {
+ const LinkIdMap& rLinkIdMap =
SwEnhancedPDFExportHelper::GetLinkIdMap();
+ const Point aCenter = rRect.Center();
+ auto aIter = std::find_if(rLinkIdMap.begin(), rLinkIdMap.end(),
+ [&aCenter](const IdMapEntry& rEntry) { return
rEntry.first.Contains(aCenter); });
+ if (aIter != rLinkIdMap.end())
+ {
+ sal_Int32 nLinkId = (*aIter).second;
+
rPDFExtOutDevData.SetStructureAttributeNumerical(vcl::PDFWriter::LinkAnnotation,
nLinkId);
+ }
+ }
+}
+
// Sets the attributes according to the structure type.
void SwTaggedPDFHelper::SetAttributes( vcl::PDFWriter::StructElement eType )
{
@@ -805,6 +822,12 @@ void SwTaggedPDFHelper::SetAttributes(
vcl::PDFWriter::StructElement eType )
}
}
}
+
+ if (mpFrameInfo->m_isLink)
+ {
+ SwRect const aRect(mpFrameInfo->mrFrame.getFrameArea());
+ LinkLinkLink(*mpPDFExtOutDevData, aRect);
+ }
}
/*
@@ -905,17 +928,9 @@ void SwTaggedPDFHelper::SetAttributes(
vcl::PDFWriter::StructElement eType )
if ( bLinkAttribute )
{
- const LinkIdMap& rLinkIdMap =
SwEnhancedPDFExportHelper::GetLinkIdMap();
SwRect aPorRect;
rInf.CalcRect( *pPor, &aPorRect );
- const Point aPorCenter = aPorRect.Center();
- auto aIter = std::find_if(rLinkIdMap.begin(), rLinkIdMap.end(),
- [&aPorCenter](const IdMapEntry& rEntry) { return
rEntry.first.Contains(aPorCenter); });
- if (aIter != rLinkIdMap.end())
- {
- sal_Int32 nLinkId = (*aIter).second;
- mpPDFExtOutDevData->SetStructureAttributeNumerical(
vcl::PDFWriter::LinkAnnotation, nLinkId );
- }
+ LinkLinkLink(*mpPDFExtOutDevData, aPorRect);
}
}
else if (mpNumInfo && eType == vcl::PDFWriter::List)
@@ -1434,6 +1449,12 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
// FlyFrame: Figure, Formula, Control
// fly in content or fly at page
+ if (mpFrameInfo->m_isLink)
+ { // tdf#154939 additional inner link element for flys
+ nPDFType = vcl::PDFWriter::Link;
+ aPDFType = aLinkString;
+ }
+ else
{
const SwFlyFrame* pFly = static_cast<const
SwFlyFrame*>(pFrame);
if (pFly->GetAnchorFrame()->FindFooterOrHeader() != nullptr
@@ -1984,6 +2005,10 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
const sal_Int32 nLinkId =
pPDFExtOutDevData->CreateLink(aRect, formatName,
aLinkPageNum);
+ // Store link info for tagged pdf output:
+ const IdMapEntry aLinkEntry(aLinkRect, nLinkId);
+ s_aLinkIdMap.push_back(aLinkEntry);
+
// Connect Link and Destination:
if ( bInternal )
pPDFExtOutDevData->SetLinkDest( nLinkId, nDestId );
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index a701470a1c61..e7e779eb0ea4 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -694,7 +694,7 @@ void SwTextFrame::PaintSwFrame(vcl::RenderContext&
rRenderContext, SwRect const&
if (isPDFTaggingEnabled &&
!GetPara()->HasNumberingPortion(SwParaPortion::FootnoteToo))
{ // no Lbl needed => open paragraph tag now
- Frame_Info aFrameInfo(*this);
+ Frame_Info aFrameInfo(*this, false);
oTaggedParagraph.emplace(nullptr, &aFrameInfo, nullptr,
rRenderContext);
}
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index a189e5abf25b..620838d10171 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -157,7 +157,7 @@ void SwTextPainter::DrawTextLine( const SwRect &rPaint,
SwSaveClip &rClip,
{ // there is a num portion but it is outside of the frame area and not
painted
assert(!roTaggedLabel);
assert(!roTaggedParagraph);
- Frame_Info aFrameInfo(*m_pFrame); // open LBody
+ Frame_Info aFrameInfo(*m_pFrame, false); // open LBody
roTaggedParagraph.emplace(nullptr, &aFrameInfo, nullptr,
*GetInfo().GetOut());
}
@@ -437,7 +437,7 @@ void SwTextPainter::DrawTextLine( const SwRect &rPaint,
SwSaveClip &rClip,
assert(roTaggedLabel);
roTaggedLabel.reset(); // close Lbl
assert(!roTaggedParagraph);
- Frame_Info aFrameInfo(*m_pFrame); // open LBody
+ Frame_Info aFrameInfo(*m_pFrame, false); // open LBody
roTaggedParagraph.emplace(nullptr, &aFrameInfo, nullptr, *pOut);
}
@@ -473,7 +473,7 @@ void SwTextPainter::DrawTextLine( const SwRect &rPaint,
SwSaveClip &rClip,
{
roTaggedLabel.reset();
} // else, if the numbering isn't visible at all, no
Lbl
- Frame_Info aFrameInfo(*m_pFrame); // open LBody
+ Frame_Info aFrameInfo(*m_pFrame, false); // open LBody
roTaggedParagraph.emplace(nullptr, &aFrameInfo,
nullptr, *GetInfo().GetOut());
return true;
}
diff --git a/vcl/qa/cppunit/pdfexport/data/image-hyperlink-alttext.fodt
b/vcl/qa/cppunit/pdfexport/data/image-hyperlink-alttext.fodt
new file mode 100644
index 000000000000..211d3a7e5eac
--- /dev/null
+++ b/vcl/qa/cppunit/pdfexport/data/image-hyperlink-alttext.fodt
@@ -0,0 +1,195 @@
+<?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-19T18:19:46.288000000</meta:creation-date><dc:date>2023-04-20T15:37:33.898000000</dc:date><dc:creator>Gabor
Kelemen
LO</dc:creator><meta:editing-duration>PT4H18M23S</meta:editing-duration><meta:editing-cycles>8</meta:editing-cycles><meta:generator>LibreOfficeDev/24.2.0.0.alpha0$Linux_X86_64
LibreOffice_project/255ea355f14bdb3efd78f5cfada88c8ac0accfb8</meta:generator><dc:title>Ship
image with hyperlink</dc:title><meta:document-statistic meta:table-count="0"
meta:image-count="1" meta:object-count="0" meta:page-count="2"
meta:paragraph-count="1" meta:word-count="3" meta:character-count="33"
meta:non-whitespace-character-count="31"/></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:writing-mode="lr-tb" 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"/>
+ <style:style style:name="Graphics" style:family="graphic">
+ <style:graphic-properties text:anchor-type="paragraph" svg:x="0cm"
svg:y="0cm" style:wrap="dynamic" style:number-wrapped-paragraphs="no-limit"
style:wrap-contour="false" style:vertical-pos="top"
style:vertical-rel="paragraph" style:horizontal-pos="center"
style:horizontal-rel="paragraph" draw:fill="none"/>
+ </style:style>
+ <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"
style:parent-style-name="Standard">
+ <style:text-properties/>
+ </style:style>
+ <style:style style:name="T1" style:family="text">
+ <style:text-properties/>
+ </style:style>
+ <style:style style:name="fr1" style:family="graphic"
style:parent-style-name="Graphics">
+ <style:graphic-properties style:vertical-pos="from-top"
style:vertical-rel="paragraph" style:horizontal-pos="from-left"
style:horizontal-rel="paragraph" style:mirror="none" fo:clip="rect(0cm, 0cm,
0cm, 0cm)" draw:luminance="0%" draw:contrast="0%" draw:red="0%" draw:green="0%"
draw:blue="0%" draw:gamma="100%" draw:color-inversion="false"
draw:image-opacity="100%" draw:color-mode="standard"
draw:wrap-influence-on-position="once-concurrent" loext:allow-overlap="true"/>
+ </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="P1">Image with <text:span
text:style-name="T1">hyperlink!</text:span>description:<draw:a
xlink:type="simple" xlink:href="https://bugs.documentfoundation.org/";
office:name="Ship to Bugzilla"><draw:frame draw:style-name="fr1"
draw:name="Image2" text:anchor-type="char" svg:x="2.769cm" svg:y="0.409cm"
svg:width="10.804cm" svg:height="7.634cm" draw:z-index="0"><draw:image
draw:mime-type="image/png">
+
<office:binary-data>iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAABGdBTUEAANbY1E9YMgAAABl0
+ RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFpSURBVHjaYvz//z8DtQBAADER
+ o+jjZGuibAQIICZiDOK/cgzFwEnrV/4HYXS1AAHERIxBR58yMiAb2DtzM1b1AAHERIxBIIBu
+ IDYAEEBMxBjE0bgdxcBL3vcZLl16jaEPIICYiDFIU9MSw8BeoeUYhgEEEBMxBnFx8WE1EN3L
+ AAHERIxBIECMgQABxAhKtPgM+vbtE9xmGP/69eMMP+o9wWLW0kD9OlYM/LlHGQECiAndoKg/
+ USgGgTTmdS8C0yA+zIUgdeguBAggljtWdQwMVkDXACWMjd0ZXRun/Id5DWTA9C23GSaVxoEN
+ zISoARvoamnBYF2/hPHs2Z3/z0JdDhBADCBvIuPkhsn/QeDr14//QWwQjY0PVYeiFyCA8OaA
+ 3cdPoEQAiI8PAAQQEwMVAUAAsWATBAX0jx9fsWrAJQ4CAAGE1TBQwOMC9+9fwikHEEBYDQPF
+ IAzIe8TglEMHAAHESM2SFiDAADEwCe4BJwcYAAAAAElFTkSuQmCC
+ </office:binary-data>
+ </draw:image>
+ <svg:title>Ship drawing</svg:title>
+ <svg:desc>Very cute</svg:desc>
+ </draw:frame></draw:a></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 7bdc38ac1373..9b528c6c4f8b 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -4233,6 +4233,136 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testMediaShapeAnnot)
CPPUNIT_ASSERT_EQUAL(static_cast<decltype(nRef)>(1), nRef);
}
+CPPUNIT_TEST_FIXTURE(PdfExportTest, testFlyFrameHyperlinkAnnot)
+{
+ 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"image-hyperlink-alttext.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());
+
+ auto pAnnots =
dynamic_cast<vcl::filter::PDFArrayElement*>(aPages[0]->Lookup("Annots"));
+ CPPUNIT_ASSERT(pAnnots);
+
+ // There should be one annotation
+ CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1),
pAnnots->GetElements().size());
+ auto pAnnotReference
+ =
dynamic_cast<vcl::filter::PDFReferenceElement*>(pAnnots->GetElements()[0]);
+ CPPUNIT_ASSERT(pAnnotReference);
+ // check /Annot - produced by sw
+ vcl::filter::PDFObjectElement* pAnnot = pAnnotReference->LookupObject();
+ CPPUNIT_ASSERT(pAnnot);
+ CPPUNIT_ASSERT_EQUAL(
+ OString("Annot"),
+
static_cast<vcl::filter::PDFNameElement*>(pAnnot->Lookup("Type"))->GetValue());
+ CPPUNIT_ASSERT_EQUAL(
+ OString("Link"),
+
static_cast<vcl::filter::PDFNameElement*>(pAnnot->Lookup("Subtype"))->GetValue());
+
+ auto pContents =
dynamic_cast<vcl::filter::PDFHexStringElement*>(pAnnot->Lookup("Contents"));
+ CPPUNIT_ASSERT_EQUAL(OUString("Image2"),
+
::vcl::filter::PDFDocument::DecodeHexStringUTF16BE(*pContents));
+
+ auto pStructParent
+ =
dynamic_cast<vcl::filter::PDFNumberElement*>(pAnnot->Lookup("StructParent"));
+ CPPUNIT_ASSERT(pStructParent);
+
+ vcl::filter::PDFReferenceElement* pStructElemRef(nullptr);
+
+ // check ParentTree to find StructElem
+ auto nRoots(0);
+ for (const auto& rDocElement : aDocument.GetElements())
+ {
+ auto pObject1 =
dynamic_cast<vcl::filter::PDFObjectElement*>(rDocElement.get());
+ if (!pObject1)
+ continue;
+ auto pType1 =
dynamic_cast<vcl::filter::PDFNameElement*>(pObject1->Lookup("Type"));
+ if (pType1 && pType1->GetValue() == "StructTreeRoot")
+ {
+ ++nRoots;
+ auto pParentTree
+ =
dynamic_cast<vcl::filter::PDFReferenceElement*>(pObject1->Lookup("ParentTree"));
+ CPPUNIT_ASSERT(pParentTree);
+ auto pNumTree = pParentTree->LookupObject();
+ CPPUNIT_ASSERT(pNumTree);
+ auto pNums =
dynamic_cast<vcl::filter::PDFArrayElement*>(pNumTree->Lookup("Nums"));
+ CPPUNIT_ASSERT(pNums);
+ auto nFound(0);
+ for (size_t i = 0; i < pNums->GetElements().size(); i += 2)
+ {
+ auto pI =
dynamic_cast<vcl::filter::PDFNumberElement*>(pNums->GetElement(i));
+ if (pI->GetValue() == pStructParent->GetValue())
+ {
+ ++nFound;
+ CPPUNIT_ASSERT(i < pNums->GetElements().size() - 1);
+ pStructElemRef
+ =
dynamic_cast<vcl::filter::PDFReferenceElement*>(pNums->GetElement(i + 1));
+ CPPUNIT_ASSERT(pStructElemRef);
+ }
+ }
+ CPPUNIT_ASSERT_EQUAL(static_cast<decltype(nFound)>(1), nFound);
+ }
+ }
+ CPPUNIT_ASSERT_EQUAL(static_cast<decltype(nRoots)>(1), nRoots);
+
+ // check /StructElem - produced by sw painting code
+ CPPUNIT_ASSERT(pStructElemRef);
+ auto pStructElem(pStructElemRef->LookupObject());
+ CPPUNIT_ASSERT(pStructElem);
+
+ auto pType =
dynamic_cast<vcl::filter::PDFNameElement*>(pStructElem->Lookup("Type"));
+ CPPUNIT_ASSERT_EQUAL(OString("StructElem"), pType->GetValue());
+ auto pS =
dynamic_cast<vcl::filter::PDFNameElement*>(pStructElem->Lookup("S"));
+ CPPUNIT_ASSERT_EQUAL(OString("Link"), pS->GetValue());
+ auto pKids =
dynamic_cast<vcl::filter::PDFArrayElement*>(pStructElem->Lookup("K"));
+ auto nMCID(0);
+ auto nRef(0);
+ for (size_t i = 0; i < pKids->GetElements().size(); ++i)
+ {
+ auto pNum =
dynamic_cast<vcl::filter::PDFNumberElement*>(pKids->GetElement(i));
+ auto pRef =
dynamic_cast<vcl::filter::PDFReferenceElement*>(pKids->GetElement(i));
+ if (pNum)
+ {
+ ++nMCID;
+ }
+ if (pRef)
+ {
+ ++nRef;
+ auto pObjR = pRef->LookupObject();
+ auto pOType =
dynamic_cast<vcl::filter::PDFNameElement*>(pObjR->Lookup("Type"));
+ CPPUNIT_ASSERT_EQUAL(OString("OBJR"), pOType->GetValue());
+ auto pAnnotRef =
dynamic_cast<vcl::filter::PDFReferenceElement*>(pObjR->Lookup("Obj"));
+ CPPUNIT_ASSERT_EQUAL(pAnnot, pAnnotRef->LookupObject());
+ }
+ }
+ CPPUNIT_ASSERT_EQUAL(static_cast<decltype(nMCID)>(1), nMCID);
+ CPPUNIT_ASSERT_EQUAL(static_cast<decltype(nRef)>(1), nRef);
+
+ // the Link is inside a Figure
+ auto pParentRef =
dynamic_cast<vcl::filter::PDFReferenceElement*>(pStructElem->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("Figure"), pParentS->GetValue());
+ auto pAlt =
dynamic_cast<vcl::filter::PDFHexStringElement*>(pParent->Lookup("Alt"));
+ CPPUNIT_ASSERT_EQUAL(OUString("Ship drawing - Very cute"),
+
::vcl::filter::PDFDocument::DecodeHexStringUTF16BE(*pAlt));
+}
+
CPPUNIT_TEST_FIXTURE(PdfExportTest, testFormControlAnnot)
{
aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export");
