Kaydet (Commit) 4146c100 authored tarafından Zolnai Tamás's avatar Zolnai Tamás

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:
81cd386f
and
664a56b3

Change-Id: I4e6a9952aa138959ab273db0494ef0cf76d8fc24
üst 664a56b3
......@@ -254,6 +254,7 @@ protected:
table::TablePropertiesPtr mpTablePropertiesPtr;
Shape3DPropertiesPtr mp3DPropertiesPtr;
EffectPropertiesPtr mpEffectPropertiesPtr;
EffectPropertiesPtr mpShapeRefEffectPropPtr;
PropertyMap maShapeProperties;
PropertyMap maDefaultShapeProperties;
TextListStylePtr mpMasterTextListStyle;
......
......@@ -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 )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment