diff options
| author | Zhe Wang <wangzcdl@apache.org> | 2012-09-07 04:05:43 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-31 10:53:10 +0100 |
| commit | cd582f922bf7bf350669c5d7cec379fe6bb7c886 (patch) | |
| tree | a53cdcebd88407f2483036fa18a75bfc4ae2773a /filter/source/msfilter/escherex.cxx | |
| parent | 30c3032920be91741ab089966f7e458ce08d09a4 (diff) | |
Resolves: #i119631# Teardrop shape cannot be shown correctly in pptx
* subversion/main/filter/inc/filter/msfilter/escherex.hxx
* subversion/main/filter/source/msfilter/escherex.cxx
[]check whether one shape is default shape of ppt by shape type
* subversion/main/svx/inc/svx/msdffdef.hxx
* subversion/main/oox/source/drawingml/customshapegeometry.cxx
* subversion/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
[]add definition and declaration for tear drop
* subversion/main/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
[]the content of tear drop shape which incudes "path, adjust value, handle"
Patch by: Ma Bingbing <jiazema@gmail.com>
Suggested by: Wang Zhe <kingwisemmx@gmail.com>
Found by: Zong Dongjun <zongdongjun@gmail.com>
Review by: Wang Zhe <kingwisemmx@gmail.com>
(cherry picked from commit 26218ac2472838d63485c3c6b4dc2f1aa0bdd0f6)
Conflicts:
filter/inc/filter/msfilter/escherex.hxx
oox/source/drawingml/customshapegeometry.cxx
svx/inc/svx/msdffdef.hxx
Change-Id: I8347832bc842cca8b944c28e807af7f45a7da5b0
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; |