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 /oox | |
| 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 'oox')
| -rw-r--r-- | oox/source/export/shapes.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index c487d2dddf36..d4b65ff140c3 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -675,12 +675,12 @@ ShapeExport& ShapeExport::WriteCustomShape( Reference< XShape > xShape ) DBG(printf("write custom shape\n")); Reference< XPropertySet > rXPropSet( xShape, UNO_QUERY ); - SdrObjCustomShape* pShape = (SdrObjCustomShape*) GetSdrObjectFromXShape( xShape ); - sal_Bool bIsDefaultObject = EscherPropertyContainer::IsDefaultObject( pShape ); sal_Bool bPredefinedHandlesUsed = sal_True; OUString sShapeType; sal_uInt32 nMirrorFlags = 0; MSO_SPT eShapeType = EscherPropertyContainer::GetCustomShapeType( xShape, nMirrorFlags, sShapeType ); + SdrObjCustomShape* pShape = (SdrObjCustomShape*) GetSdrObjectFromXShape( xShape ); + sal_Bool bIsDefaultObject = EscherPropertyContainer::IsDefaultObject( pShape, eShapeType ); const char* sPresetShape = lcl_GetPresetGeometry( USS( sShapeType ) ); DBG(printf("custom shape type: %s ==> %s\n", USS( sShapeType ), sPresetShape)); Sequence< PropertyValue > aGeometrySeq; |