Resolves: #i119755# A new custom shape ellipse ribbon is added and used

Patch by: Jianyuan Li
Review by: alg

(cherry picked from commit 462656d2)

Conflicts:
	svx/inc/svx/EnhancedCustomShape2d.hxx
	svx/inc/svx/EnhancedCustomShapeGeometry.hxx
	svx/source/customshapes/EnhancedCustomShape2d.cxx

Change-Id: Ifd1fdf1b79db8229b52db43b3c30f109a9930988

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 );

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
 {

svx/source/customshapes/EnhancedCustomShape2d.cxx

@@ -77,7 +77,7 @@ void EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( EnhancedCustomShape
     rParameter.Value <<= nNewValue;
 }
 
-OUString EnhancedCustomShape2d::GetEquation( const sal_uInt16 nFlags, sal_Int16 nP1, sal_Int16 nP2, sal_Int16 nP3 )
+OUString EnhancedCustomShape2d::GetEquation( const sal_uInt16 nFlags, sal_Int32 nP1, sal_Int32 nP2, sal_Int32 nP3 )
 {
     OUString aEquation;
     bool b1Special = ( nFlags & 0x2000 ) != 0;
@@ -321,7 +321,7 @@ OUString EnhancedCustomShape2d::GetEquation( const sal_uInt16 nFlags, sal_Int16
     return aEquation;
 }
 
-void EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( OUString& rParameter, const sal_Int16 nPara, const bool bIsSpecialValue )
+void EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( OUString& rParameter, const sal_Int32 nPara, const bool bIsSpecialValue )
 {
     if ( bIsSpecialValue )
     {