diff options
| author | Armin Le Grand <alg@apache.org> | 2012-08-01 13:45:21 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-18 15:34:06 +0100 |
| commit | 569dfd22e09e954654f4a383da9d0ac7dad33737 (patch) | |
| tree | 9bcc94fff375f776a1ccaef7e9709d8c345cb98f /include | |
| parent | 20dee85b6390ef3edc5434889523cd9fd0137bae (diff) | |
Resolves: #i119755# A new custom shape ellipse ribbon is added and used
Patch by: Jianyuan Li
Review by: alg
(cherry picked from commit 462656d2f30fade52e38094dcc2392f75b28ef79)
Conflicts:
svx/inc/svx/EnhancedCustomShape2d.hxx
svx/inc/svx/EnhancedCustomShapeGeometry.hxx
svx/source/customshapes/EnhancedCustomShape2d.cxx
Change-Id: Ifd1fdf1b79db8229b52db43b3c30f109a9930988
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/EnhancedCustomShape2d.hxx | 4 | ||||
| -rw-r--r-- | include/svx/EnhancedCustomShapeGeometry.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx index 600e247db6b5..2aee4f527488 100644 --- a/include/svx/EnhancedCustomShape2d.hxx +++ b/include/svx/EnhancedCustomShape2d.hxx @@ -209,9 +209,9 @@ class EnhancedCustomShape2d : public SfxItemSet double GetEquationValueAsDouble( const sal_Int32 nIndex ) const; sal_Int32 GetAdjustValueAsInteger( const sal_Int32 nIndex, const sal_Int32 nDefault = 0 ) const; - SVX_DLLPUBLIC static OUString GetEquation( const sal_uInt16 nFlags, sal_Int16 nPara1, sal_Int16 nPara2, sal_Int16 nPara3 ); + SVX_DLLPUBLIC static OUString GetEquation( const sal_uInt16 nFlags, sal_Int32 nPara1, sal_Int32 nPara2, sal_Int32 nPara3 ); - static void AppendEnhancedCustomShapeEquationParameter( OUString& rParameter, const sal_Int16 nPara, const bool bIsSpecialValue ); + static void AppendEnhancedCustomShapeEquationParameter( OUString& rParameter, const sal_Int32 nPara, const bool bIsSpecialValue ); static void SetEnhancedCustomShapeEquationParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter, const sal_Int16 nPara, const sal_Bool bIsSpecialValue ); diff --git a/include/svx/EnhancedCustomShapeGeometry.hxx b/include/svx/EnhancedCustomShapeGeometry.hxx index 4669e68ca137..b5744884ca53 100644 --- a/include/svx/EnhancedCustomShapeGeometry.hxx +++ b/include/svx/EnhancedCustomShapeGeometry.hxx @@ -31,7 +31,7 @@ struct SvxMSDffVertPair struct SvxMSDffCalculationData { sal_uInt16 nFlags; - sal_Int16 nVal[ 3 ]; + sal_Int32 nVal[ 3 ]; }; struct SvxMSDffTextRectangles { |