From 347630dde37113cc56a544ff021d57c91fc99c6b Mon Sep 17 00:00:00 2001
From: Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>
Date: Sat, 10 Mar 2018 11:42:46 +0900
Subject: escherex: export graphic without GraphicObject uniqueID
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ibf8858ca890b82d5a3ddb8b026a0a4dd03bc9072
Reviewed-on: https://gerrit.libreoffice.org/51021
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
---
 sc/source/filter/excel/xlchart.cxx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'sc/source')

diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx
index f1f8b287b5d4..a3634ca49b20 100644
--- a/sc/source/filter/excel/xlchart.cxx
+++ b/sc/source/filter/excel/xlchart.cxx
@@ -34,6 +34,7 @@
 #include <com/sun/star/chart/XChartDocument.hpp>
 #include <com/sun/star/chart/XSecondAxisTitleSupplier.hpp>
 #include <com/sun/star/chart2/Symbol.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
 
 #include <sal/macros.h>
 #include <rtl/math.hxx>
@@ -821,12 +822,12 @@ void XclChPropSetHelper::ReadEscherProperties(
             drawing::BitmapMode eApiBmpMode;
             maBitmapHlp.ReadFromPropertySet( rPropSet );
             maBitmapHlp >> eApiStyle >> aBitmapName >> eApiBmpMode;
-            OUString aBitmapUrl;
-            if( rBitmapTable.GetObject( aBitmapName ) >>= aBitmapUrl )
+            uno::Reference<awt::XBitmap> xBitmap;
+            if (rBitmapTable.GetObject( aBitmapName ) >>= xBitmap)
             {
                 // convert to Escher properties
                 rEscherFmt.mxEscherSet.reset( new EscherPropertyContainer );
-                rEscherFmt.mxEscherSet->CreateEmbeddedBitmapProperties( aBitmapUrl, eApiBmpMode );
+                rEscherFmt.mxEscherSet->CreateEmbeddedBitmapProperties( xBitmap, eApiBmpMode );
                 rPicFmt.mnBmpMode = (eApiBmpMode == drawing::BitmapMode_REPEAT) ?
                     EXC_CHPICFORMAT_STACK : EXC_CHPICFORMAT_STRETCH;
             }
-- 
cgit