diff options
| author | Matus Uzak <matus.uzak@gmail.com> | 2016-03-12 21:11:42 +0100 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-03-29 12:18:28 +0000 |
| commit | bc14ec0f86647a39a954bd1c32b1671c22d7f475 (patch) | |
| tree | f1b9404e72c669a5cf7a75e10aab219060e749cd /oox/source | |
| parent | 0f2e6f1fbb42fe33bee3ffd5b5200b17be3382d9 (diff) | |
tdf#95932: PPTX import: Incorrect inheritance of shape style
Inheritance Order: 1. Reference Shape's properties, 2. Shape style,
3. Shape properties.
You MUST NOT inherit reference shape's style, because it's already
part of inherited reference shape's properties. That would overwrite
shape properties applied at point 3, at slide layout/master level.
Change-Id: Id1ab550295988b0087a67c6819dfe32f84825e4e
Reviewed-on: https://gerrit.libreoffice.org/23182
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'oox/source')
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 63d8c5a4d422..e832227071e7 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -307,7 +307,6 @@ void Shape::applyShapeReference( const Shape& rReferencedShape, bool bUseText ) mpTablePropertiesPtr = table::TablePropertiesPtr( rReferencedShape.mpTablePropertiesPtr.get() ? new table::TableProperties( *rReferencedShape.mpTablePropertiesPtr.get() ) : nullptr ); mpShapeRefEffectPropPtr = EffectPropertiesPtr( new EffectProperties( *rReferencedShape.mpEffectPropertiesPtr.get() ) ); mpMasterTextListStyle = TextListStylePtr( new TextListStyle( *rReferencedShape.mpMasterTextListStyle.get() ) ); - maShapeStyleRefs = rReferencedShape.maShapeStyleRefs; maSize = rReferencedShape.maSize; maPosition = rReferencedShape.maPosition; mnRotation = rReferencedShape.mnRotation; |