diff options
Diffstat (limited to 'filter/source/msfilter/escherex.cxx')
-rw-r--r-- | filter/source/msfilter/escherex.cxx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 68bd12dd6352..3f31b255cef3 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -2354,9 +2354,19 @@ void ConvertEnhancedCustomShapeEquation( SdrObjCustomShape* pCustoShape, } } -sal_Bool EscherPropertyContainer::IsDefaultObject( SdrObjCustomShape* pCustoShape ) +sal_Bool EscherPropertyContainer::IsDefaultObject( SdrObjCustomShape* pCustoShape , const MSO_SPT eShapeType ) { sal_Bool bIsDefaultObject = sal_False; + switch(eShapeType) + { + //if the custom shape is not default shape of ppt, return sal_Fasle; + case mso_sptTearDrop: + return bIsDefaultObject; + + default: + break; + } + if ( pCustoShape ) { if ( pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_EQUATIONS ) @@ -2439,7 +2449,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT sal_Int32 nAdjustmentsWhichNeedsToBeConverted = 0; uno::Sequence< beans::PropertyValues > aHandlesPropSeq; sal_Bool bPredefinedHandlesUsed = sal_True; - sal_Bool bIsDefaultObject = IsDefaultObject( pCustoShape ); + sal_Bool bIsDefaultObject = IsDefaultObject( pCustoShape , eShapeType); // convert property "Equations" into std::vector< EnhancedCustomShapeEquationEquation > std::vector< EnhancedCustomShapeEquation > aEquations; |