[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/source

[Tomaž Vajngerl (via logerrit)]

 vcl/source/gdi/pdfwriter_impl.cxx |    7 ++++++-
 vcl/source/gdi/pdfwriter_impl.hxx |    1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 13631a77f27a9794821745a78e509167881d2252
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Sun Apr 26 12:07:19 2020 +0200
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Sun Jun 7 21:18:20 2020 +0200

    vcl: When exporing PDF, write the correct page of embedded PDF
    
    We can display PDF as an graphic in the document, where the PDF
    is treated as a vector graphic and rendered with Pdfium. When
    in that case we export the document as PDF, we can insert the
    original PDF page as an reference XObject. This workes fine,
    however the PDF as an graphic also contains the page number,
    which page should be rendered. This was not taken into account
    in the PDF export - it was hardcored to first page.
    
    This extends the support so it reads the page index from the
    graphic, and sets the correct PDF page.
    
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92924
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    (cherry picked from commit 218ad66010fdba3c28564e2038876b6822752243)
    
    Change-Id: I15188ee495f9b3fcc3aa7df6f4bad4fa09903c6a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95700
    Tested-by: Tomaž Vajngerl <quikee at gmail.com>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 807c2b5a60d8..b966ef0ed15c 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -8848,7 +8848,9 @@ void PDFWriterImpl::writeReferenceXObject(ReferenceXObjectEmit& rEmit)
             return;
         }
 
-        filter::PDFObjectElement* pPage = aPages[0];
+        size_t nPageIndex = rEmit.m_nPDFPageIndex >= 0 ? rEmit.m_nPDFPageIndex : 0;
+
+        filter::PDFObjectElement* pPage = aPages[nPageIndex];
         if (!pPage)
         {
             SAL_WARN("vcl.pdfwriter", "PDFWriterImpl::writeReferenceXObject: no page");
@@ -9440,7 +9442,10 @@ void PDFWriterImpl::createEmbeddedFile(const Graphic& rGraphic, ReferenceXObject
         rEmit.m_nEmbeddedObject = m_aEmbeddedFiles.back().m_nObject;
     }
     else
+    {
+        rEmit.m_nPDFPageIndex = rGraphic.getVectorGraphicData()->getPageIndex();
         rEmit.m_aPDFData = *pPDFData;
+    }
 
     rEmit.m_nFormObject = createObject();
     rEmit.m_aPixelSize = rGraphic.GetPrefSize();
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 8c88ed6fb172..f8e89949b1be 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -209,6 +209,7 @@ public:
         Size m_aPixelSize;
         /// PDF data from the graphic object, if not writing a reference XObject.
         std::vector<sal_Int8> m_aPDFData;
+        sal_Int32 m_nPDFPageIndex;
 
         ReferenceXObjectEmit()
             : m_nFormObject(0),