diff options
| author | Matus Uzak <matus.uzak@gmail.com> | 2016-03-08 21:44:21 +0100 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-03-23 06:49:01 +0000 |
| commit | f3d1ac75c4b7fa63022e54a9cbff46ba99535076 (patch) | |
| tree | d327b5f81c4eaf7869d8349274d308ed497f19f7 /include | |
| parent | 15b53976e5d119877e53f34b34cee33a5f2883fd (diff) | |
tdf#93868: PPTX import: Incorrect inheritance of shape fill properties
DrawingML: The useBgFill attribute specifies that the shape fill
should be set to that of the slide background.
Change-Id: I8b568e730f00326d51e7b604579f4ff990b26f8a
Reviewed-on: https://gerrit.libreoffice.org/23039
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/ppt/slidepersist.hxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx index 3c08f6865438..1a61603ae26f 100644 --- a/include/oox/ppt/slidepersist.hxx +++ b/include/oox/ppt/slidepersist.hxx @@ -83,7 +83,7 @@ public: oox::drawingml::ClrMapPtr getClrMap() const { return mpClrMapPtr; } void setBackgroundProperties( const oox::drawingml::FillPropertiesPtr& rFillPropertiesPtr ){ mpBackgroundPropertiesPtr = rFillPropertiesPtr; } - oox::drawingml::Color& getBackgroundColor() { return maBackgroundColor; } + const oox::drawingml::FillPropertiesPtr getBackgroundProperties() const { return mpBackgroundPropertiesPtr; } bool isMasterPage() const { return mbMaster; } bool isNotesPage() const { return mbNotes; } @@ -127,7 +127,6 @@ private: SlidePersistPtr mpMasterPagePtr; oox::drawingml::ShapePtr maShapesPtr; - oox::drawingml::Color maBackgroundColor; oox::drawingml::FillPropertiesPtr mpBackgroundPropertiesPtr; ::std::list< std::shared_ptr< TimeNode > > maTimeNodeList; |