diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-03-10 11:42:46 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-03-10 14:31:47 +0100 |
| commit | 347630dde37113cc56a544ff021d57c91fc99c6b (patch) | |
| tree | b8b5f3d42ada5c33cce5bbddd3de2039494457ae /sc | |
| parent | 71de0e63492779ca28d9933de53464b4c3075661 (diff) | |
escherex: export graphic without GraphicObject uniqueID
Change-Id: Ibf8858ca890b82d5a3ddb8b026a0a4dd03bc9072
Reviewed-on: https://gerrit.libreoffice.org/51021
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/xlchart.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
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; } |