[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - include/vcl sd/qa

[Tomaž Vajngerl (via logerrit)]

 include/vcl/vectorgraphicdata.hxx |    2 ++
 sd/qa/unit/data/pdf/multipage.pdf |binary
 sd/qa/unit/import-tests.cxx       |    4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 2454de2deae39724efd8c04c485a0fc23d6d1b7a
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Thu Mar 26 12:25:10 2020 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Thu Mar 26 20:50:52 2020 +0100

    sd: extend test to check the PDF pages aren't rendered when loaded
    
    Change-Id: I9e407bb20a00ec620fe3f772f50708f997027942
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91093
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    (cherry picked from commit 56a1f9bea2f1b64dee4111ec6671caf42ef63c91)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91113
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/include/vcl/vectorgraphicdata.hxx b/include/vcl/vectorgraphicdata.hxx
index bdcfa8a9c4e0..10069d5119a8 100644
--- a/include/vcl/vectorgraphicdata.hxx
+++ b/include/vcl/vectorgraphicdata.hxx
@@ -110,6 +110,8 @@ public:
     BitmapChecksum GetChecksum() const;
 
     sal_Int32 getPageIndex() const { return mnPageIndex; }
+
+    bool isPrimitiveSequenceCreated() const { return mbSequenceCreated; }
 };
 
 typedef std::shared_ptr< VectorGraphicData > VectorGraphicDataPtr;
diff --git a/sd/qa/unit/data/pdf/multipage.pdf b/sd/qa/unit/data/pdf/multipage.pdf
index 5cd8b4e4e569..65c8eeaa32a5 100644
Binary files a/sd/qa/unit/data/pdf/multipage.pdf and b/sd/qa/unit/data/pdf/multipage.pdf differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 6a561979ccc0..b3e690bf8b75 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -1286,11 +1286,13 @@ void SdImportTest::testPDFImportShared()
 
             const GraphicObject& rGraphicObject = pSdrGrafObj->GetGraphicObject().GetGraphic();
             const Graphic& rGraphic = rGraphicObject.GetGraphic();
+            CPPUNIT_ASSERT_MESSAGE("After loading, the PDF shouldn't have the primitive sequence created yet",
+                                   !rGraphic.getVectorGraphicData()->isPrimitiveSequenceCreated());
             aGraphics.push_back(rGraphic);
         }
     }
 
-    CPPUNIT_ASSERT_EQUAL_MESSAGE("Expected more than one page.", size_t(3), aGraphics.size());
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Expected more than one page.", size_t(9), aGraphics.size());
 
     Graphic const & rFirstGraphic = aGraphics[0];