From eb581eff6ac41b938299b4c154ded6891bdd0c11 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Tue, 2 Apr 2019 22:12:28 +0200 Subject: pdfium: Use std::vector to hold the PdfData. This fixes the destruction of the static cache of the PDF data; without this, there were already missing uno runtime info. (cherry picked from commit 20055ebe1b27f716a2acf1f0f4dda2864ae811bf) Change-Id: I877c9ccf96c4b7eabf3d643e17f324d86d987f94 Reviewed-on: https://gerrit.libreoffice.org/77691 Tested-by: Jenkins Reviewed-by: Ashod Nakashian --- vcl/inc/impgraph.hxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'vcl/inc') diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx index 8837dc63903c..1a1d2f283f1c 100644 --- a/vcl/inc/impgraph.hxx +++ b/vcl/inc/impgraph.hxx @@ -91,7 +91,7 @@ private: /// The PDF stream from which this Graphic is rendered, /// as converted (version downgraded) from the original, /// which should be in GfxLink. - std::shared_ptr> mpPdfData; + std::shared_ptr> mpPdfData; std::unique_ptr mpGraphicID; GraphicExternalLink maGraphicExternalLink; @@ -143,7 +143,7 @@ private: bool hasPdfData() const { - return mpPdfData && mpPdfData->hasElements(); + return mpPdfData && !mpPdfData->empty(); } void ImplCreateSwapInfo(); @@ -227,9 +227,9 @@ private: const VectorGraphicDataPtr& getVectorGraphicData() const; - const std::shared_ptr>& getPdfData() const; + const std::shared_ptr>& getPdfData() const; - void setPdfData(const std::shared_ptr>& rPdfData); + void setPdfData(const std::shared_ptr>& rPdfData); bool ensureAvailable () const; -- cgit