[Libreoffice-commits] core.git: vcl/source

[Arnaud Versini (via logerrit)]

 vcl/source/gdi/pdfwriter_impl.cxx |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit ee8bc3fbd5aa83112cd9cfef6788d2b3a2e55afe
Author:     Arnaud Versini <arnaud.versini at gmail.com>
AuthorDate: Fri Sep 13 11:52:27 2019 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Mon Sep 16 01:34:13 2019 +0200

    vcl:pdf : simplify PDF/A code generation
    
    Change-Id: I2c5116891d28d37e23048a027124b803af8e25e4
    Reviewed-on: https://gerrit.libreoffice.org/78867
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index cb7070c78021..abfa1682e347 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -5270,13 +5270,15 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata()
         aMetadataStream.append( "  <rdf:Description rdf:about=\"\"\n" );
         aMetadataStream.append( "      xmlns:pdfaid=\"http://www.aiim.org/pdfa/ns/id/\">\n" );
         if( m_bIsPDF_A2 )
+        {
             aMetadataStream.append( "   <pdfaid:part>2</pdfaid:part>\n" );
-        else
-            aMetadataStream.append( "   <pdfaid:part>1</pdfaid:part>\n" );
-        if( m_bIsPDF_A2 )
             aMetadataStream.append( "   <pdfaid:conformance>B</pdfaid:conformance>\n" );
+        }
         else
+        {
+            aMetadataStream.append( "   <pdfaid:part>1</pdfaid:part>\n" );
             aMetadataStream.append( "   <pdfaid:conformance>A</pdfaid:conformance>\n" );
+        }
         aMetadataStream.append( "  </rdf:Description>\n" );
         //... Dublin Core properties go here
         if( !m_aContext.DocumentInfo.Title.isEmpty() ||