[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - include/vcl svx/source

[Tomaž Vajngerl (via logerrit)]

 include/vcl/vectorgraphicdata.hxx |    3 ++-
 svx/source/svdraw/svdedtv2.cxx    |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2506d8221dd940dfd93d3d7c183430ba6ba3089d
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Sun May 31 20:25:11 2020 +0200
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Mon Jun 1 10:07:29 2020 +0200

    tdf#133547 Fix breaking of PDF graphic objects
    
    ImpSdrPdfImport did not handle -1 as the page number correctly.
    When the page number is -1 it means it was never explicitly set
    and should be treated as page with index 0 most of the time. So
    instead of allowing -1 as the page index, return it as 0 already
    in Graphic (VectorGraphicData).
    
    Change-Id: I3813f3ceeb5e41cb06fc40d67297d2439d7f3407
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95227
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    (cherry picked from commit 876d644ccfff9c1097abfd7353cfc2cc17714a0a)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95237

diff --git a/include/vcl/vectorgraphicdata.hxx b/include/vcl/vectorgraphicdata.hxx
index 62e7617cdb56..8fce6666e6e8 100644
--- a/include/vcl/vectorgraphicdata.hxx
+++ b/include/vcl/vectorgraphicdata.hxx
@@ -26,6 +26,7 @@
 #include <rtl/ustring.hxx>
 #include <deque>
 #include <memory>
+#include <algorithm>
 
 namespace com::sun::star::graphic { class XPrimitive2D; }
 struct WmfExternal;
@@ -110,7 +111,7 @@ public:
     const BitmapEx& getReplacement() const;
     BitmapChecksum GetChecksum() const;
 
-    sal_Int32 getPageIndex() const { return mnPageIndex; }
+    sal_Int32 getPageIndex() const { return std::max(sal_Int32(0), mnPageIndex); }
 
     bool isPrimitiveSequenceCreated() const { return mbSequenceCreated; }
 };
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 661dd0779e18..de8c521b3119 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -2104,7 +2104,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo)
 #if HAVE_FEATURE_PDFIUM
                 aLogicRect = pGraf->GetLogicRect();
                 ImpSdrPdfImport aFilter(*mpModel, pObj->GetLayer(), aLogicRect, aGraphic);
-                if (pGraf->getEmbeddedPageNumber() < aFilter.GetPageCount())
+                if (aGraphic.getPageNumber() < aFilter.GetPageCount())
                 {
                     nInsCnt = aFilter.DoImport(*pOL, nInsPos, aGraphic.getPageNumber(), pProgrInfo);
                 }