diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-02-06 13:24:50 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-02-07 08:34:59 +0000 |
| commit | 90dd417259170f74ec74dfdd80183e49dc9a1f6d (patch) | |
| tree | 21edba6355b84a71bb1932a8239856858bdede35 /oox | |
| parent | faad3143c88b9b378b273abef36727405dcf3697 (diff) | |
tdf#31488: Background fill changes its color when saving a PPTX file to ODP
For a gradient fill we need to generate a name because
ODP export works with this name.
In case of shapes it works because when fill attribute
changes some internal name generation is triggered.
The same thing doesn't work for slide background
so generate this name explicitely in oox code.
Reviewed-on: https://gerrit.libreoffice.org/33937
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit aeece6f198685b96579bdbd1409b3535fb5f09d1)
Change-Id: Ic6ebf37ef3d66a9c274747ca04653363b1fe6d02
Reviewed-on: https://gerrit.libreoffice.org/33941
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ppt/slidepersist.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx index ec7932548824..f79131d58384 100644 --- a/oox/source/ppt/slidepersist.cxx +++ b/oox/source/ppt/slidepersist.cxx @@ -173,7 +173,10 @@ void SlidePersist::createBackground( const XmlFilterBase& rFilterBase ) sal_Int32 nPhClr = maBackgroundColor.isUsed() ? maBackgroundColor.getColor( rFilterBase.getGraphicHelper() ) : API_RGB_TRANSPARENT; - ::oox::drawingml::ShapePropertyMap aPropMap( rFilterBase.getModelObjectHelper() ); + oox::drawingml::ShapePropertyIds aPropertyIds = (oox::drawingml::ShapePropertyInfo::DEFAULT).mrPropertyIds; + aPropertyIds[oox::drawingml::ShapeProperty::FillGradient] = PROP_FillGradientName; + oox::drawingml::ShapePropertyInfo aPropInfo( aPropertyIds, true, false, true, false ); + oox::drawingml::ShapePropertyMap aPropMap( rFilterBase.getModelObjectHelper(), aPropInfo ); mpBackgroundPropertiesPtr->pushToPropMap( aPropMap, rFilterBase.getGraphicHelper(), 0, nPhClr ); PropertySet( mxPage ).setProperty( PROP_Background, aPropMap.makePropertySet() ); } |