diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2019-04-02 22:12:28 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2020-03-21 15:50:38 +0100 |
| commit | 29852ce9ca039d34e6be73a2e006a577ff64adcd (patch) | |
| tree | 3fedbe97ee7931239dfcb75fa089e143f7ff7faf /include | |
| parent | 53a2ff7260b61242c7e29af11c2e24c89857c233 (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.
(cherry picked from commit 20055ebe1b27f716a2acf1f0f4dda2864ae811bf)
Reviewed-on: https://gerrit.libreoffice.org/77691
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
(cherry picked from commit eb581eff6ac41b938299b4c154ded6891bdd0c11)
Change-Id: I877c9ccf96c4b7eabf3d643e17f324d86d987f94
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90841
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/svdograf.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/graph.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/pdfread.hxx | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index c3e2ae0c1874..4309e65956a7 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -144,7 +144,9 @@ public: const Graphic& GetGraphic() const; Graphic GetTransformedGraphic( SdrGrafObjTransformsAttrs nTransformFlags = SdrGrafObjTransformsAttrs::ALL ) const; + GraphicType GetGraphicType() const; + GraphicAttr GetGraphicAttr( SdrGrafObjTransformsAttrs nTransformFlags = SdrGrafObjTransformsAttrs::ALL ) const; // Keep ATM for SD. @@ -197,7 +199,7 @@ public: GDIMetaFile getMetafileFromEmbeddedVectorGraphicData() const; bool isEmbeddedPdfData() const; - std::shared_ptr<css::uno::Sequence<sal_Int8>> const & getEmbeddedPdfData() const; + std::shared_ptr<std::vector<sal_Int8>> const & 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 cc8df96fc68c..2ad98c871cae 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -232,8 +232,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 1e555d9841c7..a088ed2c002b 100644 --- a/include/vcl/pdfread.hxx +++ b/include/vcl/pdfread.hxx @@ -39,15 +39,14 @@ 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, double fResolutionDPI = 96.); VCL_DLLPUBLIC bool ImportPDF(SvStream& rStream, Graphic& rGraphic, double fResolutionDPI = 96.); VCL_DLLPUBLIC size_t ImportPDF(const OUString& rURL, std::vector<Bitmap>& rBitmaps, - css::uno::Sequence<sal_Int8>& rPdfData, - const double fResolutionDPI = 96.); + std::vector<sal_Int8>& rPdfData, const double fResolutionDPI = 96.); /// Import PDF as Graphic images (1 per page), all unloaded. /// Since Graphic is unloaded, we need to return the page size (in pixels) separately. |