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

[Libreoffice Gerrit user]

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

New commits:
commit f580a18103785b2350c0ba72d79d2c9c6a26b56f
Author:     Katarina Behrens <Katarina.Behrens at cib.de>
AuthorDate: Wed Mar 6 17:22:21 2019 +0100
Commit:     Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Wed Mar 6 17:38:23 2019 +0100

    Tentative fix of tagged PDF export of artifacts
    
    quote PDF standard, chapter 14.8.2.2.2:
    " ... to aid in text reflow, artifacts should be defined with property
    lists whenever possible."
    
    So instead of 'Artifact BMC ... EMC', we export
    'Artifact BDC propertyList ... EMC' where property list is empty
    
    This is also how an example at
    
    Change-Id: I06e9a9119dd28ee80136393528fdd59d75f16951

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index acec33b4ec5c..f52893c2b237 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 BMC\n" );
+        aLine.append( "/Artifact <<>>BDC\n" );
         writeBuffer( aLine.getStr(), aLine.getLength() );
         // mark element MC sequence as open
         m_aStructure[ m_nCurrentStructElement ].m_bOpenMCSeq = true;
commit 4631cd40a66874f8f4ebb15c85e8d29bbf939db5
Author:     Katarina Behrens <Katarina.Behrens at cib.de>
AuthorDate: Wed Mar 6 14:26:40 2019 +0100
Commit:     Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Wed Mar 6 17:37:55 2019 +0100

    Correct hierarchy of L, LI structure elements
    
    in particular, don't terminate LI prematurely
    
    Change-Id: Iaf642f547b072b12ccbf861536825a2526b8798a

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 406564ce9f4d..76ca3013fb9c 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1327,8 +1327,8 @@ namespace drawinglayer
                 mpPDFExtOutDevData->EndStructureElement(); // end ListItem
                 mbInListItem = false;
             }
-
-            mpPDFExtOutDevData->EndStructureElement();
+            else
+                mpPDFExtOutDevData->EndStructureElement(); // end Paragraph
         }
 
         void VclMetafileProcessor2D::processTextHierarchyBlockPrimitive2D(const primitive2d::TextHierarchyBlockPrimitive2D& rBlockPrimitive)