From eb581eff6ac41b938299b4c154ded6891bdd0c11 Mon Sep 17 00:00:00 2001
From: Jan Holesovsky <kendy@collabora.com>
Date: Tue, 2 Apr 2019 22:12:28 +0200
Subject: 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>
---
 svx/source/svdraw/svdograf.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'svx/source/svdraw/svdograf.cxx')

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();
 }
-- 
cgit v1.2.3