diff options
| author | Tamás Zolnai <zolnaitamas2000@gmail.com> | 2016-11-18 22:57:29 +0000 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2016-11-18 22:42:12 +0000 |
| commit | 8d613870b2cd2e3e4396b4fa97dbd8080fda8f52 (patch) | |
| tree | 0e9bb4ce750b48773f2e592bb68fcedf0db5c398 /include | |
| parent | 9745d29227e471ce40e9992fefd92e10a48696fb (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.
Change-Id: I587582498cf4315087f9a576c1b7fc41ee23e2fd
Reviewed-on: https://gerrit.libreoffice.org/30969
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@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 978b71b52cae..67f9a9b48afd 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -125,7 +125,7 @@ public: table::TablePropertiesPtr const & 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; } @@ -258,6 +258,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 |