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

[Julien Nabet (via logerrit)]

 helpcontent2                      |    2 +-
 vcl/source/gdi/pdfwriter_impl.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1cc0fc1f3cdae597912d7204256427e060fcde61
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sat Jan 16 14:32:42 2021 +0100
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Sat Jan 16 16:35:17 2021 +0100

    tdf#139643: fix missing PDF/UA flag
    
    Regression from:
    https://cgit.freedesktop.org/libreoffice/core/commit/vcl/source/gdi/pdfwriter_impl.cxx?id=a795886762a6a4aabd601183598c4e6c819bcb1f
    author  Arnaud Versini <arnaud.versini at libreoffice.org> 2019-09-20 19:01:34 +0200
    committer       Arnaud Versini <arnaud.versini at libreoffice.org> 2020-02-08 15:03:07 +0100
    commit  a795886762a6a4aabd601183598c4e6c819bcb1f (patch)
    tree    93a58d738bf27a0c5f75f80dc7e651763916ee5f /vcl/source/gdi/pdfwriter_impl.cxx
    parent  a2f62a861ba7036e689070c47f72214b1bdd49d4 (diff)
    Add minimum support for PDF/A3
    
    here:
     sal_Int32 PDFWriterImpl::emitDocumentMetadata()
     {
    -    if (!m_bIsPDF_A1 && !m_bIsPDF_A2 && !m_bIsPDF_UA)
    +    if( !m_bIsPDF_A1 && !m_bIsPDF_A2 && !m_bIsPDF_A3 )
    
    Change-Id: Id4b3b9a74ccf5a5abd9e7149cb09b3475dd4ffee
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109437
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index aee37877c7f6..7339c4cbeb19 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -5236,7 +5236,7 @@ static void lcl_assignMeta(const OUString& aValue, OString& aMeta)
 // emits the document metadata
 sal_Int32 PDFWriterImpl::emitDocumentMetadata()
 {
-    if( !m_bIsPDF_A1 && !m_bIsPDF_A2 && !m_bIsPDF_A3 )
+    if( !m_bIsPDF_A1 && !m_bIsPDF_A2 && !m_bIsPDF_A3 && !m_bIsPDF_UA)
         return 0;
 
     //get the object number for all the destinations
commit 208a2e51c32a8918388216bf2f47b513948ebd7d
Author:     Ilmari Lauhakangas <ilmari.lauhakangas at libreoffice.org>
AuthorDate: Sat Jan 16 17:35:09 2021 +0200
Commit:     Gerrit Code Review <gerrit at gerrit.libreoffice.org>
CommitDate: Sat Jan 16 16:35:09 2021 +0100

    Update git submodules
    
    * Update helpcontent2 from branch 'master'
      to 91413eacbe8790505dfd4cc452b0fa2e5589ac33
      - Use switches for Ctrl vs. Command on macOS
    
        Change-Id: I13829b216081021ae321a5c7111de0e11e65a7ee
        Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109440
        Tested-by: Jenkins
        Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/helpcontent2 b/helpcontent2
index 942c4de7eb85..91413eacbe87 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 942c4de7eb854bb99e3ed79caa283608ec1891a7
+Subproject commit 91413eacbe8790505dfd4cc452b0fa2e5589ac33