diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-03-06 18:29:40 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-03-07 03:23:00 +0100 |
| commit | e030fbbf67a2490c4e734583d9f987c27506179e (patch) | |
| tree | 653c775e39be54e36264ab8b543c1dffa506a5de /sc | |
| parent | d55a7fca9c1bb1989d5a70d2d9098a9156c82ac4 (diff) | |
oox: remove property FillBitmapURL, BackGraphicURL and GraphicURL
Change-Id: I1f75b1775fec4b47ad78a32724785333a90d3baf
Reviewed-on: https://gerrit.libreoffice.org/50809
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/inc/pagesettings.hxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/oox/pagesettings.cxx | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/sc/source/filter/inc/pagesettings.hxx b/sc/source/filter/inc/pagesettings.hxx index 03a0c8d32e36..2868d8eac4ad 100644 --- a/sc/source/filter/inc/pagesettings.hxx +++ b/sc/source/filter/inc/pagesettings.hxx @@ -34,7 +34,7 @@ class HeaderFooterParser; /** Holds page style data for a single sheet. */ struct PageSettingsModel { - OUString maGraphicUrl; /// URL of the graphic object. + css::uno::Reference<css::graphic::XGraphic> mxGraphic; /// Background Graphic OUString maBinSettPath; /// Relation identifier of binary printer settings. OUString maOddHeader; /// Header string for odd pages. OUString maOddFooter; /// Footer string for odd pages. diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx index 19aad8e64093..7dee9ab6d944 100644 --- a/sc/source/filter/oox/pagesettings.cxx +++ b/sc/source/filter/oox/pagesettings.cxx @@ -334,9 +334,11 @@ void PageSettings::finalizeImport() void PageSettings::importPictureData( const Relations& rRelations, const OUString& rRelId ) { - OUString aPicturePath = rRelations.getFragmentPathFromRelId( rRelId ); - if( !aPicturePath.isEmpty() ) - maModel.maGraphicUrl = getBaseFilter().getGraphicHelper().importEmbeddedGraphicObject( aPicturePath ); + OUString aPicturePath = rRelations.getFragmentPathFromRelId(rRelId); + if (!aPicturePath.isEmpty()) + { + maModel.mxGraphic = getBaseFilter().getGraphicHelper().importEmbeddedGraphic(aPicturePath); + } } enum HFPortionId @@ -979,10 +981,10 @@ void PageSettingsConverter::writePageSettingsProperties( aPropMap.setProperty( PROP_FooterHeight, maFooterData.mnHeight); aPropMap.setProperty( PROP_FooterBodyDistance, maFooterData.mnBodyDist); // background image - if( !rModel.maGraphicUrl.isEmpty() ) + if (rModel.mxGraphic.is()) { - aPropMap.setProperty( PROP_BackGraphicURL, rModel.maGraphicUrl); - aPropMap.setProperty( PROP_BackGraphicLocation, css::style::GraphicLocation_TILED); + aPropMap.setProperty(PROP_BackGraphic, rModel.mxGraphic); + aPropMap.setProperty(PROP_BackGraphicLocation, css::style::GraphicLocation_TILED); } rPropSet.setProperties( aPropMap ); |