diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/svdograf.hxx | 2 | ||||
| -rw-r--r-- | include/svx/xmlgrhlp.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/graph.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/pdfread.hxx | 12 | ||||
| -rw-r--r-- | include/vcl/vectorgraphicdata.hxx | 4 |
5 files changed, 5 insertions, 18 deletions
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index 8944db82bc2d..db4a3f168892 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -199,8 +199,6 @@ public: bool isEmbeddedVectorGraphicData() const; GDIMetaFile getMetafileFromEmbeddedVectorGraphicData() const; - bool isEmbeddedPdfData() const; - 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/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx index 3f80f0191ba4..37d8c63bda35 100644 --- a/include/svx/xmlgrhlp.hxx +++ b/include/svx/xmlgrhlp.hxx @@ -58,7 +58,6 @@ private: std::unordered_map<OUString, css::uno::Reference<css::graphic::XGraphic>> maGraphicObjects; std::unordered_map<Graphic, std::pair<OUString, OUString>> maExportGraphics; - std::unordered_map<void*, std::pair<OUString, OUString>> maExportPdf; SvXMLGraphicHelperMode meCreateMode; OUString maOutputMimeType; diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx index b159d4bf3797..271de60d1605 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -204,10 +204,6 @@ public: const VectorGraphicDataPtr& getVectorGraphicData() 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. void setPageNumber(sal_Int32 nPageNumber); /// Get 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 d16c951f81cd..b56e8139447d 100644 --- a/include/vcl/pdfread.hxx +++ b/include/vcl/pdfread.hxx @@ -37,16 +37,8 @@ VCL_DLLPUBLIC size_t RenderPDFBitmaps(const void* pBuffer, int nSize, std::vecto size_t nFirstPage = 0, int nPages = 1, double fResolutionDPI = 96.); -/// Imports a PDF stream into rGraphic as a GDIMetaFile. -VCL_DLLPUBLIC bool ImportPDF(SvStream& rStream, Bitmap& rBitmap, size_t nPageIndex, - 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, - std::vector<sal_Int8>& rPdfData, double fResolutionDPI = 96.); +/// Imports a PDF stream into rGraphic as VectorGraphicData. +VCL_DLLPUBLIC bool ImportPDF(SvStream& rStream, Graphic& rGraphic); /// Import PDF as Graphic images (1 per page), all unloaded. /// Since Graphic is unloaded, we need to return the page size (in pixels) separately. diff --git a/include/vcl/vectorgraphicdata.hxx b/include/vcl/vectorgraphicdata.hxx index b05671852c2c..096c89e1aa56 100644 --- a/include/vcl/vectorgraphicdata.hxx +++ b/include/vcl/vectorgraphicdata.hxx @@ -46,7 +46,8 @@ enum class VectorGraphicDataType { Svg = 0, Emf = 1, - Wmf = 2 + Wmf = 2, + Pdf = 3 }; class VCL_DLLPUBLIC VectorGraphicData @@ -70,6 +71,7 @@ private: std::unique_ptr<WmfExternal> mpExternalHeader; // on demand creators + void ensurePdfReplacement(); void ensureReplacement(); void ensureSequenceAndRange(); |