diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-11-30 14:35:08 +0100 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-11-30 14:35:08 +0100 |
| commit | 4146c1003f796f662a2f5b4ec150173df28fd9de (patch) | |
| tree | 69e025e298736eeec2673446b1800dc40208ea18 /oox | |
| parent | 664a56b3c81503bdf199edf1806676f0a35b956f (diff) | |
PPTX import: shape effect properties defined by theme
Effect import is so poor by now that this changes does not seem
to have any effect, but later it can be helpful.
See also:
81cd386facedfbb15be6dffc10351262abf733f3
and
664a56b3c81503bdf199edf1806676f0a35b956f
Change-Id: I4e6a9952aa138959ab273db0494ef0cf76d8fc24
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index ee6b268a2b27..9cffa093af6d 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -102,6 +102,7 @@ Shape::Shape( const sal_Char* pServiceName, bool bDefaultHeight ) , mpCustomShapePropertiesPtr( new CustomShapeProperties ) , mp3DPropertiesPtr( new Shape3DProperties ) , mpEffectPropertiesPtr( new EffectProperties ) +, mpShapeRefEffectPropPtr( new EffectProperties ) , mpMasterTextListStyle( new TextListStyle ) , mnSubType( 0 ) , meFrameType( FRAMETYPE_GENERIC ) @@ -134,6 +135,7 @@ Shape::Shape( const ShapePtr& pSourceShape ) , mpTablePropertiesPtr( pSourceShape->mpTablePropertiesPtr ) , mp3DPropertiesPtr( pSourceShape->mp3DPropertiesPtr ) , mpEffectPropertiesPtr (pSourceShape->mpEffectPropertiesPtr) +, mpShapeRefEffectPropPtr(pSourceShape->mpShapeRefEffectPropPtr) , maShapeProperties( pSourceShape->maShapeProperties ) , mpMasterTextListStyle( pSourceShape->mpMasterTextListStyle ) , mxShape() @@ -299,7 +301,7 @@ void Shape::applyShapeReference( const Shape& rReferencedShape, bool bUseText ) mpShapeRefFillPropPtr = FillPropertiesPtr( new FillProperties( *rReferencedShape.mpFillPropertiesPtr.get() ) ); mpCustomShapePropertiesPtr = CustomShapePropertiesPtr( new CustomShapeProperties( *rReferencedShape.mpCustomShapePropertiesPtr.get() ) ); mpTablePropertiesPtr = table::TablePropertiesPtr( rReferencedShape.mpTablePropertiesPtr.get() ? new table::TableProperties( *rReferencedShape.mpTablePropertiesPtr.get() ) : NULL ); - mpEffectPropertiesPtr = EffectPropertiesPtr( new EffectProperties( *rReferencedShape.mpEffectPropertiesPtr.get() ) ); + mpShapeRefEffectPropPtr = EffectPropertiesPtr( new EffectProperties( *rReferencedShape.mpEffectPropertiesPtr.get() ) ); mpMasterTextListStyle = TextListStylePtr( new TextListStyle( *rReferencedShape.mpMasterTextListStyle.get() ) ); maShapeStyleRefs = rReferencedShape.maShapeStyleRefs; maSize = rReferencedShape.maSize; @@ -582,6 +584,7 @@ Reference< XShape > Shape::createAndInsert( // First apply reference shape's properties (shape on the master slide) aFillProperties.assignUsed( *mpShapeRefFillPropPtr ); aLineProperties.assignUsed( *mpShapeRefLinePropPtr ); + aEffectProperties.assignUsed( *mpShapeRefEffectPropPtr ); if( pTheme ) { |