diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2019-03-08 21:43:27 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-03-12 22:24:49 +0100 |
| commit | 13b4916833a54037bcf3bef1dc0ddf3b416d2100 (patch) | |
| tree | 1b677ab2dadd498562814b27a160cc49b8ad456a | |
| parent | 114176935b6fbb846e27955f59d730663486f755 (diff) | |
For now, skip tagged PDF export of background objects
This reverts commit 9d5eceaaa5705bddd687db8b4e7aef91591dd5fc and
bf978a527fb0bba27cd2c83443e70ad86a63d819 until a better solution is
found because exporting them as either Figure or Artifact screws up
document structure badly
Change-Id: I6c0f28a29653aa294362c6249ad16e48f603707a
| -rw-r--r-- | drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index 76ca3013fb9c..1573c7fb7880 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -2292,14 +2292,12 @@ namespace drawinglayer { // structured tag primitive const vcl::PDFWriter::StructElement& rTagElement(rStructureTagCandidate.getStructureElement()); - const bool bTagUsed(vcl::PDFWriter::NonStructElement != rTagElement); - const bool bIsBackground(rStructureTagCandidate.isBackground()); + bool bTagUsed((vcl::PDFWriter::NonStructElement != rTagElement) && !rStructureTagCandidate.isBackground()); if(mpPDFExtOutDevData && bTagUsed) { - // Write start tag. For background elements use NonStructElement instead of real element type (e.g. Figure) - // to guarantee it gets exported as artifact (tagged PDF) - mpPDFExtOutDevData->BeginStructureElement(bIsBackground ? vcl::PDFWriter::NonStructElement : rTagElement); + // write start tag + mpPDFExtOutDevData->BeginStructureElement(rTagElement); } // process children normally diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index f52893c2b237..acec33b4ec5c 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -10750,7 +10750,7 @@ void PDFWriterImpl::beginStructureElementMCSeq() ) { OStringBuffer aLine( 128 ); - aLine.append( "/Artifact <<>>BDC\n" ); + aLine.append( "/Artifact BMC\n" ); writeBuffer( aLine.getStr(), aLine.getLength() ); // mark element MC sequence as open m_aStructure[ m_nCurrentStructElement ].m_bOpenMCSeq = true; |