diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-02-13 17:05:19 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-02-13 16:54:04 +0000 |
| commit | 6657d52417295265367cf3ffe5832b60e3c38011 (patch) | |
| tree | a664018f1eb611c88d8d73fd3b0241090ec36f8d /svx | |
| parent | 7c9c6a4425b679596acae6f67ee8ac5f3d98bd6e (diff) | |
vcl pdf import: use pdfium instead of draw_pdf_import
Replace creating a full Draw component with direct pdfium library calls.
This also means that the result is now a bitmap, not a metafile for now.
Also decouple HAVE_FEATURE_PDFIMPORT and HAVE_FEATURE_PDFIUM, the first
is the "import PDF into Draw" feature, the second is the "insert PDF as
image" feature.
Change-Id: I72c25642ec84cc831df362e02b1520c6e6d9adcf
Reviewed-on: https://gerrit.libreoffice.org/34217
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/qa/unit/xoutdev.cxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdograf.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/svx/qa/unit/xoutdev.cxx b/svx/qa/unit/xoutdev.cxx index 5bd31799eaee..7b472b9628d7 100644 --- a/svx/qa/unit/xoutdev.cxx +++ b/svx/qa/unit/xoutdev.cxx @@ -34,7 +34,7 @@ public: void XOutdevTest::testPdfGraphicExport() { -#if HAVE_FEATURE_PDFIMPORT +#if HAVE_FEATURE_PDFIUM // Import the graphic. Graphic aGraphic; test::Directories aDirectories; diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 0103498ca4af..4875a4f8d6c0 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -439,8 +439,8 @@ const GraphicObject* SdrGrafObj::GetReplacementGraphicObject() const const_cast< SdrGrafObj* >(this)->mpReplacementGraphic = new GraphicObject(rSvgDataPtr->getReplacement()); } else if (pGraphic->GetGraphic().getPdfData().hasElements()) - // Replacement graphic for metafile + PDF is just the metafile. - const_cast<SdrGrafObj*>(this)->mpReplacementGraphic = new GraphicObject(pGraphic->GetGraphic().GetGDIMetaFile()); + // Replacement graphic for bitmap + PDF is just the bitmap. + const_cast<SdrGrafObj*>(this)->mpReplacementGraphic = new GraphicObject(pGraphic->GetGraphic().GetBitmapEx()); } return mpReplacementGraphic; |