diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-02-21 19:32:17 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-02-25 08:43:19 +0100 |
| commit | ab3890b5f4ff4654eae7360d0cf34f3e26a1026f (patch) | |
| tree | bc772d6f4469b5e37dda0328bacd58a53aed842f /oox | |
| parent | 4256ffa959f994f0964f7391fad70df8a9c884f0 (diff) | |
use "Graphic" property to transport Graphic for controls
Currently "ImageURL" property is used to transport the Graphic
(as an string URL), which is being replaced by transporting
XGraphic directly. There is already a property that all
controls use - "Graphic", so use that instead.
Change-Id: I2514b475735f3e430c2baa9b1685a231fc694b28
Reviewed-on: https://gerrit.libreoffice.org/50139
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ole/axcontrol.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 9d5f4c5d27f2..ea6f461bbdcf 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -264,9 +264,9 @@ void ControlConverter::convertPicture( PropertyMap& rPropMap, const StreamDataSe { if( rPicData.hasElements() ) { - OUString aGraphicUrl = mrGraphicHelper.importGraphicObject( rPicData ); - if( !aGraphicUrl.isEmpty() ) - rPropMap.setProperty( PROP_ImageURL, aGraphicUrl ); + uno::Reference<graphic::XGraphic> xGraphic = mrGraphicHelper.importGraphic(rPicData); + if (xGraphic.is()) + rPropMap.setProperty(PROP_Graphic, xGraphic); } } |