diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-03-10 15:26:08 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-03-10 14:32:03 +0100 |
| commit | 9844d63c93e56fdb81d8ca6bbb2b67e9aa3a77c4 (patch) | |
| tree | b9b3012008fa06e804505b5f15ed16269413dbe1 /filter | |
| parent | 347630dde37113cc56a544ff021d57c91fc99c6b (diff) | |
svdfppt: use FillBitmap and xBitmap instead of Graph.Obj. URL
Change-Id: I9b431a598b6cadab6b345ee41bdc8ed2f94b8d3a
Reviewed-on: https://gerrit.libreoffice.org/51022
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 21b335dadf53..97032a01a56c 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -7455,21 +7455,18 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell > const & xCel eFS = css::drawing::FillStyle_BITMAP; const XFillBitmapItem aXFillBitmapItem(pObj->GetMergedItem( XATTR_FILLBITMAP )); - OUString aURL( UNO_NAME_GRAPHOBJ_URLPREFIX); - aURL += OStringToOUString( - aXFillBitmapItem.GetGraphicObject().GetUniqueID(), - RTL_TEXTENCODING_ASCII_US); - - xPropSet->setPropertyValue("FillBitmapURL", Any( aURL ) ); + uno::Reference<graphic::XGraphic> xGraphic = aXFillBitmapItem.GetGraphicObject().GetGraphic().GetXGraphic(); + uno::Reference<awt::XBitmap> xBitmap(xGraphic, uno::UNO_QUERY); + xPropSet->setPropertyValue("FillBitmap", uno::makeAny(xBitmap)); const XFillBmpStretchItem aStretchItem(pObj->GetMergedItem( XATTR_FILLBMP_STRETCH )); const XFillBmpTileItem aTileItem(pObj->GetMergedItem( XATTR_FILLBMP_TILE )); if( aTileItem.GetValue() ) - xPropSet->setPropertyValue( "FillBitmapMode", Any( css::drawing::BitmapMode_REPEAT ) ); + xPropSet->setPropertyValue("FillBitmapMode", uno::makeAny(drawing::BitmapMode_REPEAT)); else if( aStretchItem.GetValue() ) - xPropSet->setPropertyValue( "FillBitmapMode", Any( css::drawing::BitmapMode_STRETCH ) ); + xPropSet->setPropertyValue("FillBitmapMode", uno::makeAny(drawing::BitmapMode_STRETCH)); else - xPropSet->setPropertyValue( "FillBitmapMode", Any( css::drawing::BitmapMode_NO_REPEAT ) ); + xPropSet->setPropertyValue("FillBitmapMode", uno::makeAny(drawing::BitmapMode_NO_REPEAT)); } break; default: |