[Libreoffice-commits] core.git: Branch 'feature/cib_contract139' - drawinglayer/source vcl/source

[Libreoffice Gerrit user]

 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |    8 +++-----
 vcl/source/gdi/pdfwriter_impl.cxx                          |    2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit bf1a62e15628eb3915acf01cdbbdd25dae925602
Author:     Katarina Behrens <Katarina.Behrens at cib.de>
AuthorDate: Fri Mar 8 21:43:27 2019 +0100
Commit:     Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Fri Mar 8 22:01:35 2019 +0100

    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

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;