diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2019-04-02 22:12:28 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2019-04-03 17:54:02 +0200 |
| commit | ba328bb8862810712393e2ce3329ce798db84541 (patch) | |
| tree | ac28251c29c5b3d9d8e0be298d5d1a1da24a0dce /include | |
| parent | 8aca771675f7f76c84bbbd117b9dc1cc9c5ada8b (diff) | |
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.
Change-Id: I877c9ccf96c4b7eabf3d643e17f324d86d987f94
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/svdograf.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/graph.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/pdfread.hxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index aa7a6c221506..9e9b5a9625ba 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -194,7 +194,7 @@ public: GDIMetaFile getMetafileFromEmbeddedVectorGraphicData() const; bool isEmbeddedPdfData() const; - std::shared_ptr<css::uno::Sequence<sal_Int8>> getEmbeddedPdfData() const; + std::shared_ptr<std::vector<sal_Int8>> getEmbeddedPdfData() const; /// Returns the page number of the embedded data (typically to re-render or import it). sal_Int32 getEmbeddedPageNumber() const; diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx index 881abda221e4..4f5108b3f2ce 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -229,8 +229,8 @@ public: const VectorGraphicDataPtr& getVectorGraphicData() const; - void setPdfData(const std::shared_ptr<css::uno::Sequence<sal_Int8>>& rPdfData); - const std::shared_ptr<css::uno::Sequence<sal_Int8>>& getPdfData() const; + void setPdfData(const std::shared_ptr<std::vector<sal_Int8>>& rPdfData); + const std::shared_ptr<std::vector<sal_Int8>>& getPdfData() const; bool hasPdfData() const; /// Set the page number of the multi-page source this Graphic is rendered from. diff --git a/include/vcl/pdfread.hxx b/include/vcl/pdfread.hxx index e579f435261e..0ff6b39941c0 100644 --- a/include/vcl/pdfread.hxx +++ b/include/vcl/pdfread.hxx @@ -40,7 +40,7 @@ VCL_DLLPUBLIC size_t RenderPDFBitmaps(const void* pBuffer, int nSize, std::vecto /// Imports a PDF stream into rGraphic as a GDIMetaFile. VCL_DLLPUBLIC bool ImportPDF(SvStream& rStream, Bitmap& rBitmap, size_t nPageIndex, - css::uno::Sequence<sal_Int8>& rPdfData, + std::vector<sal_Int8>& rPdfData, sal_uInt64 nPos = STREAM_SEEK_TO_BEGIN, sal_uInt64 nSize = STREAM_SEEK_TO_END, const double fResolutionDPI = 96.); @@ -49,7 +49,7 @@ VCL_DLLPUBLIC bool ImportPDF(SvStream& rStream, Graphic& rGraphic, const double fResolutionDPI = 96.); VCL_DLLPUBLIC size_t ImportPDF(const OUString& rURL, std::vector<Bitmap>& rBitmaps, - css::uno::Sequence<sal_Int8>& rPdfData, + std::vector<sal_Int8>& rPdfData, const double fResolutionDPI = 96.); /// Import PDF as Graphic images (1 per page), all unloaded. |