diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2016-11-19 00:10:01 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-11-26 22:50:26 +0000 |
| commit | 502b8d0d4178174130609b4b3085714864fb7b64 (patch) | |
| tree | 0e9aa0d4adac8b8001c3239a4e272450260971d8 /include | |
| parent | f75d03bd90b27034a69c47f5413ec013dafc97c6 (diff) | |
tdf#104015: PPTX import: Title shape does not inherit fill properties
...from slide master.
The problem caused by that PPTX files contains not a
one-level master slide set, but has two levels: one
called slide master, other called slide layout.
Slide layout inherit properties from slide master and
normal slide inherit propetries from slide layout.
Bug appeared because, slide layout inherited properties
were not forwarded to the normal slide.
Reviewed-on: https://gerrit.libreoffice.org/30969
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 8d613870b2cd2e3e4396b4fa97dbd8080fda8f52)
Conflicts:
sd/qa/unit/import-tests.cxx
Change-Id: I587582498cf4315087f9a576c1b7fc41ee23e2fd
Reviewed-on: https://gerrit.libreoffice.org/30971
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/drawingml/shape.hxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 520bc51bc1f9..80c17b232ce2 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -125,7 +125,7 @@ public: table::TablePropertiesPtr getTableProperties(); - EffectProperties& getEffectProperties() { return *mpEffectPropertiesPtr; } + EffectProperties& getEffectProperties() const { return *mpEffectPropertiesPtr; } void setChildPosition( css::awt::Point nPosition ){ maChPosition = nPosition; } void setChildSize( css::awt::Size aSize ){ maChSize = aSize; } @@ -259,6 +259,10 @@ protected: void putPropertiesToGrabBag( const css::uno::Sequence< css::beans::PropertyValue >& aProperties ); + FillProperties getActualFillProperties(const Theme* pTheme, const FillProperties* pParentShapeFillProps) const; + LineProperties getActualLineProperties(const Theme* pTheme) const; + EffectProperties getActualEffectProperties(const Theme* pTheme) const; + std::vector< ShapePtr > maChildren; // only used for group shapes css::awt::Size maChSize; // only used for group shapes css::awt::Point maChPosition; // only used for group shapes |