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 /include | |
| 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 'include')
| -rw-r--r-- | include/filter/msfilter/escherex.hxx | 2 | ||||
| -rw-r--r-- | include/svx/msdffdef.hxx | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index c4807e80875d..d21e2f0f066e 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -1344,7 +1344,7 @@ public: sal_Int32& rnArrowLength, sal_Int32& rnArrowWidth ); - static sal_Bool IsDefaultObject( SdrObjCustomShape* pCustoShape ); + static sal_Bool IsDefaultObject( SdrObjCustomShape* pCustoShape, const MSO_SPT eShapeType ); static void LookForPolarHandles( const MSO_SPT eShapeType, sal_Int32& nAdjustmentsWhichNeedsToBeConverted diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx index 007f273ae837..671932c2f9fa 100644 --- a/include/svx/msdffdef.hxx +++ b/include/svx/msdffdef.hxx @@ -781,6 +781,8 @@ typedef enum mso_sptActionButtonMovie = 200, mso_sptHostControl = 201, mso_sptTextBox = 202, + //for pptx shape which not exist in ppt + mso_sptTearDrop = 203, mso_sptMax = 0x0FFF, mso_sptNil = mso_sptMax } MSO_SPT; |