diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2019-04-02 22:12:28 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashnakash@gmail.com> | 2019-08-25 13:42:06 +0200 |
| commit | eb581eff6ac41b938299b4c154ded6891bdd0c11 (patch) | |
| tree | 8cc33a7850cc65d754667d7d1dfb3376b2428f1c /svx/source/svdraw/svdograf.cxx | |
| parent | 81f73f1c1706d790c010e8fc0abcb2a0e9e86ace (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)
Change-Id: I877c9ccf96c4b7eabf3d643e17f324d86d987f94
Reviewed-on: https://gerrit.libreoffice.org/77691
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Diffstat (limited to 'svx/source/svdraw/svdograf.cxx')
| -rw-r--r-- | svx/source/svdraw/svdograf.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index c74de64e69a4..8ac19ae1525a 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -145,6 +145,7 @@ std::unique_ptr<sdr::contact::ViewContact> SdrGrafObj::CreateObjectSpecificViewC return std::make_unique<sdr::contact::ViewContactOfGraphic>(*this); } + // check if SVG and if try to get ObjectInfoPrimitive2D and extract info void SdrGrafObj::onGraphicChanged() @@ -342,7 +343,6 @@ void SdrGrafObj::SetGraphic( const Graphic& rGraphic ) const Graphic& SdrGrafObj::GetGraphic() const { - ForceSwapIn(); return mpGraphicObject->GetGraphic(); } @@ -463,6 +463,7 @@ Size SdrGrafObj::getOriginalSize() const return aSize; } +// TODO Remove void SdrGrafObj::ForceSwapIn() const { if (pGraphicLink && (mpGraphicObject->GetType() == GraphicType::NONE || @@ -711,7 +712,6 @@ SdrObject* SdrGrafObj::getFullDragClone() const // temporary interaction object and load graphic if(pRetval && IsLinkedGraphic()) { - pRetval->ForceSwapIn(); pRetval->ReleaseGraphicLink(); } @@ -907,7 +907,7 @@ bool SdrGrafObj::isEmbeddedPdfData() const return mpGraphicObject->GetGraphic().hasPdfData(); } -std::shared_ptr<uno::Sequence<sal_Int8>> const & SdrGrafObj::getEmbeddedPdfData() const +std::shared_ptr<std::vector<sal_Int8>> const & SdrGrafObj::getEmbeddedPdfData() const { return mpGraphicObject->GetGraphic().getPdfData(); } |