Attachment #78788 for issue #119755

View | Details | Raw Unified | Return to issue 119755
Collapse All | Expand All

Lines 199-207 Link Here

(-)svx/inc/svx/EnhancedCustomShape2d.hxx (-2 / +2 lines)
199	double GetEquationValueAsDouble( const sal_Int32 nIndex ) const;	199	double GetEquationValueAsDouble( const sal_Int32 nIndex ) const;
200	sal_Int32 GetAdjustValueAsInteger( const sal_Int32 nIndex, const sal_Int32 nDefault = 0 ) const;	200	sal_Int32 GetAdjustValueAsInteger( const sal_Int32 nIndex, const sal_Int32 nDefault = 0 ) const;
201		201
202	SVX_DLLPUBLIC static rtl::OUString GetEquation( const sal_uInt16 nFlags, sal_Int16 nPara1, sal_Int16 nPara2, sal_Int16 nPara3 );	202	SVX_DLLPUBLIC static rtl::OUString GetEquation( const sal_uInt16 nFlags, sal_Int32 nPara1, sal_Int32 nPara2, sal_Int32 nPara3 );
203		203
204	static void AppendEnhancedCustomShapeEquationParameter( rtl::OUString& rParameter, const sal_Int16 nPara, const sal_Bool bIsSpecialValue );	204	static void AppendEnhancedCustomShapeEquationParameter( rtl::OUString& rParameter, const sal_Int32 nPara, const sal_Bool bIsSpecialValue );
205		205
206	static void SetEnhancedCustomShapeEquationParameter( com::sun::star::drawing::EnhancedCustomShapeParameter&	206	static void SetEnhancedCustomShapeEquationParameter( com::sun::star::drawing::EnhancedCustomShapeParameter&
207	rParameter, const sal_Int16 nPara, const sal_Bool bIsSpecialValue );	207	rParameter, const sal_Int16 nPara, const sal_Bool bIsSpecialValue );

Lines 35-41 Link Here

(-)svx/inc/svx/EnhancedCustomShapeGeometry.hxx (-1 / +1 lines)
35	struct SvxMSDffCalculationData	35	struct SvxMSDffCalculationData
36	{	36	{
37	sal_uInt16 nFlags;	37	sal_uInt16 nFlags;
38	sal_Int16 nVal[ 3 ];	38	sal_Int32 nVal[ 3 ];
39	};	39	};
40	struct SvxMSDffTextRectangles	40	struct SvxMSDffTextRectangles
41	{	41	{

Lines 89-95 Link Here

(-)svx/source/customshapes/EnhancedCustomShape2d.cxx (-2 / +2 lines)
89	rParameter.Value <<= nNewValue;	89	rParameter.Value <<= nNewValue;
90	}	90	}
91		91
92	rtl::OUString EnhancedCustomShape2d::GetEquation( const sal_uInt16 nFlags, sal_Int16 nP1, sal_Int16 nP2, sal_Int16 nP3 )	92	rtl::OUString EnhancedCustomShape2d::GetEquation( const sal_uInt16 nFlags, sal_Int32 nP1, sal_Int32 nP2, sal_Int32 nP3 )
93	{	93	{
94	rtl::OUString aEquation;	94	rtl::OUString aEquation;
95	sal_Bool b1Special = ( nFlags & 0x2000 ) != 0;	95	sal_Bool b1Special = ( nFlags & 0x2000 ) != 0;
Lines 335-341 Link Here
335	return aEquation;	335	return aEquation;
336	}	336	}
337		337
338	void EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( rtl::OUString& rParameter, const sal_Int16 nPara, const sal_Bool bIsSpecialValue )	338	void EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( rtl::OUString& rParameter, const sal_Int32 nPara, const sal_Bool bIsSpecialValue )
339	{	339	{
340	if ( bIsSpecialValue )	340	if ( bIsSpecialValue )
341	{	341	{




	(SvxMSDffVertPair*)mso_sptRibbonGluePoints, sizeof( mso_sptRibbonGluePoints ) / sizeof( SvxMSDffVertPair ),
	(SvxMSDffHandle*)mso_sptRibbonHandle, sizeof( mso_sptRibbonHandle ) / sizeof( SvxMSDffHandle )
};
//msosptEllipseRibbon
//svg path = ar@9@38@8@37,0@27@0@26@9@13@8@4@0@25@22@25@9@38@8@37@22@26@3@27l@7@40@3,wa@9@35@8@10@3,0@21@33@9@36@8@1@21@31@20@31@9@35@8@10@20@33,,l@5@40xewr@9@36@8@1@20@31@0@32nfl@20@33ear@9@36@8@1@21@31@22@32nfl@21@33em@0@26nfl@0@32em@22@26nfl@22@32e
//odp path = A ?f9 ?f38 ?f8 ?f37 0 ?f27 ?f0 ?f26 ?f9 ?f13 ?f8 ?f4 ?f0 ?f25 ?f22 ?f25 ?f9 ?f38 ?f8 ?f37 ?f22 ?f26 ?f3 ?f27 L ?f7 ?f40 ?f3 0 W ?f9 ?f35 ?f8 ?f10 ?f3 0 ?f21 ?f33 ?f9 ?f36 ?f8 ?f1 ?f21 ?f31 ?f20 ?f31 ?f9 ?f35 ?f8 ?f10 ?f20 ?f33 0 0 L ?f5 ?f40 Z N W ?f9 ?f36 ?f8 ?f1 ?f20 ?f31 ?f0 ?f32 F L ?f20 ?f33 N A ?f9 ?f36 ?f8 ?f1 ?f21 ?f31 ?f22 ?f32 F L ?f21 ?f33 N M ?f0 ?f26 F L ?f0 ?f32 N M ?f22 ?f26 F L ?f22 ?f32 N
static const SvxMSDffVertPair mso_sptEllipseRibbonVert[] =		
{	
	{ 9 MSO_I , 38 MSO_I },
	{ 8 MSO_I , 37 MSO_I },
	{ 0 , 27 MSO_I },
	{ 0 MSO_I , 26 MSO_I },
	{ 9 MSO_I , 13 MSO_I },
	{ 8 MSO_I , 4 MSO_I },
	{ 0 MSO_I , 25 MSO_I },
	{ 22 MSO_I , 25 MSO_I },
	{ 9 MSO_I , 38 MSO_I },
	{ 8 MSO_I , 37 MSO_I },
	{ 22 MSO_I , 26 MSO_I },
	{ 3 MSO_I , 27 MSO_I },
	{ 7 MSO_I , 40 MSO_I },
	{ 3 MSO_I , 0 },
	{ 9 MSO_I , 35 MSO_I },
	{ 8 MSO_I , 10 MSO_I },
	{ 3 MSO_I , 0 },
	{ 21 MSO_I , 33 MSO_I },
	{ 9 MSO_I , 36 MSO_I },
	{ 8 MSO_I , 1 MSO_I },
	{ 21 MSO_I , 31 MSO_I },
	{ 20 MSO_I , 31 MSO_I },
	{ 9 MSO_I , 35 MSO_I },
	{ 8 MSO_I , 10 MSO_I },
	{ 20 MSO_I , 33 MSO_I },
	{ 0 , 0 },
	{ 5 MSO_I , 40 MSO_I },
	{ 9 MSO_I , 36 MSO_I },
	{ 8 MSO_I , 1 MSO_I },
	{ 20 MSO_I , 31 MSO_I },
	{ 0 MSO_I , 32 MSO_I },
	{ 20 MSO_I , 33 MSO_I },
	{ 9 MSO_I , 36 MSO_I },
	{ 8 MSO_I , 1 MSO_I },
	{ 21 MSO_I , 31 MSO_I },
	{ 22 MSO_I , 32 MSO_I },
	{ 21 MSO_I , 33 MSO_I },
	{ 0 MSO_I , 26 MSO_I },
	{ 0 MSO_I , 32 MSO_I },
	{ 22 MSO_I , 26 MSO_I },
	{ 22 MSO_I , 32 MSO_I }
};

static const sal_uInt16 mso_sptEllipseRibbonSegm[] =
{
	0xa30c /*ar*/,0x0002/*l*/,0xa50c/*wa*/,0x0001/*l*/,
	0x6001/*x*/, 0x8000/*e*/,0xa504/*wr*/,0xaa00/*nf*/, 
	0x0001/*l*/, 0x8000/*e*/,0xa304/*ar*/,0xaa00/*nf*/,
	0x0001/*l*/, 0x8000/*e*/,0x4000/*m*/,0xaa00/*nf*/,
	0x0001/*l*/, 0x8000/*e*/,0x4000/*m*/,0xaa00/*nf*/,
	0x0001/*l*/, 0x8000/*e*/
};

static const SvxMSDffCalculationData mso_sptEllipseRibbonCalc[] =
{
	{ 0x2000 , { DFF_Prop_adjustValue , 0 , 0 } }, //val #0
	{ 0x2000 , { DFF_Prop_adjust2Value , 0 , 0 } }, //val #1
	{ 0x2000 , { DFF_Prop_adjust3Value , 0 , 0 } }, //val #2
	{ 0x2000 , { DFF_Prop_geoRight , 0 , 0 } }, //val width
	{ 0x2000 , { DFF_Prop_geoBottom , 0 , 0 } }, //val height
	{ 0x2001 , { DFF_Prop_geoRight , 1 , 8 } }, //prod width 1 8
	{ 0x2001 , { DFF_Prop_geoRight , 1 , 2 } }, //prod width 1 2
	{ 0x2001 , { DFF_Prop_geoRight , 7 , 8 } }, //prod width 7 8
	{ 0x2001 , { DFF_Prop_geoRight , 3 , 2 } }, //prod width 3 2
	{ 0x8000 , { 0 , 0 , 0x406 } }, //sum 0 0 @6
	{ 0xa000 , { DFF_Prop_geoBottom , 0 , DFF_Prop_adjust3Value } }, //sum height 0 #2
	{ 0x2001 , { 0x40a , 30573 , 4096 } }, //prod @10 30573 4096
	{ 0x2001 , { 0x40b , 2 , 1 } }, //prod @11 2 1
	{ 0xa000 , { DFF_Prop_geoBottom , 0 , 0x40c } }, //sum height 0 @12
	{ 0x6000 , { 0x40b , DFF_Prop_adjust3Value , 0 } }, //sum @11 #2 0
	{ 0xe000 , { 0x40b , DFF_Prop_geoBottom , DFF_Prop_adjust2Value } }, //sum @11 height #1
	{ 0xa000 , { DFF_Prop_geoBottom , 0 , DFF_Prop_adjust2Value } }, //sum height 0 #1
	{ 0x2001 , { 0x410 , 1 , 2 } }, //prod @16 1 2
	{ 0x6000 , { 0x40b , 0x411 , 0 } }, //sum @11 @17 0
	{ 0xe000 , { 0x40e , DFF_Prop_adjust2Value , DFF_Prop_geoBottom } }, //sum @14 #1 height
	{ 0x6000 , { DFF_Prop_adjustValue , 0x405 , 0 } }, //sum #0 @5 0
	{ 0xa000 , { DFF_Prop_geoRight , 0 , 0x414 } }, //sum width 0 @20
	{ 0xa000 , { DFF_Prop_geoRight , 0 , DFF_Prop_adjustValue } }, //sum width 0 #0
	{ 0xa000 , { 0x406 , 0 , DFF_Prop_adjustValue } }, //sum @6 0 #0
	{ 0xe00f , { 0x417 , DFF_Prop_geoRight , 0x40b } }, //ellipse @23 width @11
	{ 0xe000 , { 0x418 , DFF_Prop_geoBottom , 0x40b } }, //sum @24 height @11
	{ 0xe000 , { 0x419 , 0x40b , 0x413 } }, //sum @25 @11 @19
	{ 0xe000 , { DFF_Prop_adjust3Value , 0x40b , 0x413 } }, //sum #2 @11 @19
	{ 0x2001 , { 0x40b , 2391 , 32768 } }, //prod @11 2391 32768
	{ 0xa000 , { 0x406 , 0 , 0x414 } }, //sum @6 0 @20
	{ 0xe00f , { 0x41d , DFF_Prop_geoRight , 0x40b } }, //ellipse @29 width @11
	{ 0xe000 , { DFF_Prop_adjust2Value , 0x41e , 0x40b } }, //sum #1 @30 @11
	{ 0xe000 , { 0x419 , DFF_Prop_adjust2Value , DFF_Prop_geoBottom } }, //sum @25 #1 height
	{ 0xe000 , { DFF_Prop_geoBottom , 0x41e , 0x40e } }, //sum height @30 @14
	{ 0x6000 , { 0x40b , 0x40e , 0 } }, //sum @11 @14 0
	{ 0xa000 , { DFF_Prop_geoBottom , 0 , 0x422 } }, //sum height 0 @34
	{ 0xe000 , { 0x423 , 0x413 , 0x40b } }, //sum @35 @19 @11
	{ 0xe000 , { 0x40a , 0x40f , 0x40b } }, //sum @10 @15 @11
	{ 0xe000 , { 0x423 , 0x40f , 0x40b } }, //sum @35 @15 @11
	{ 0xe000 , { 0x41c , 0x40e , 0x412 } }, //sum @28 @14 @18
	{ 0xa000 , { DFF_Prop_geoBottom , 0 , 0x427 } }, //sum height 0 @39
	{ 0xa000 , { 0x413 , 0 , 0x412 } }, //sum @19 0 @18
	{ 0x2001 , { 0x429 , 2 , 3 } }, //prod @41 2 3
	{ 0xa000 , { DFF_Prop_adjust2Value , 0 , 0x42a } }, //sum #1 0 @42
	{ 0xa000 , { DFF_Prop_adjust3Value , 0 , 0x42a } }, //sum #2 0 @42
	{ 0x2004 , { 0x42c , 20925 , 0 } }, //min @44 20925
	{ 0x2001 , { DFF_Prop_geoRight , 3 , 8 } }, //prod width 3 8
	{ 0x2000 , { 0x42e , 0 , 4 } }, //sum @46 0 4
};

static const SvxMSDffTextRectangles mso_sptEllipseRibbonTextRect[] =
{//@0,@1,@22,@25
	{ { 0 MSO_I, 1 MSO_I }, { 22 MSO_I, 25 MSO_I } }
};

static const sal_Int32 mso_sptEllipseRibbonDefault[] =
{ 
	3,5400,5400,18900 
};

static const SvxMSDffHandle mso_sptEllipseRibbonHandle[] =
{
//position="#0,bottomRight" xrange="@5,@47
//position="center,#1" yrange="@10,@43
//position="topLeft,#2" yrange="@27,@45
	{   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL| MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL,
		0x100, 21600, 0, 0, 0x8/*5+3*/, 0x32/*47+3*/, 0x80000000, 0x7fffffff },
	{	MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
		10800, 0x101, 0, 0, 0x80000000, 0x7fffffff,0xd/*10+3*/, 0x2e /*43+3*/ },
	{	MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
		0, 0x102, 0, 0, 0x80000000, 0x7fffffff,0x1e/*27+3*/, 0x30 /*45+3*/ }
};

static const mso_CustomShape msosptEllipseRibbon =
{
	(SvxMSDffVertPair*)mso_sptEllipseRibbonVert, sizeof( mso_sptEllipseRibbonVert ) / sizeof( SvxMSDffVertPair ),
	(sal_uInt16*)mso_sptEllipseRibbonSegm, sizeof( mso_sptEllipseRibbonSegm ) >> 1,
	(SvxMSDffCalculationData*)mso_sptEllipseRibbonCalc, sizeof( mso_sptEllipseRibbonCalc ) / sizeof( SvxMSDffCalculationData ),
	(sal_Int32*)mso_sptEllipseRibbonDefault,
	(SvxMSDffTextRectangles*)mso_sptEllipseRibbonTextRect, sizeof( mso_sptEllipseRibbonTextRect ) / sizeof( SvxMSDffTextRectangles ),
	21600, 21600,
	0x80000000, 0x80000000,
	NULL, 0,
	(SvxMSDffHandle*)mso_sptEllipseRibbonHandle, sizeof( mso_sptEllipseRibbonHandle ) / sizeof( SvxMSDffHandle )
};

//msosptEllipseRibbon2
//svg path = wr@9@34@8@35,0@24@0@23@9,0@8@11@0@22@19@22@9@34@8@35@19@23@3@24l@7@36@3@4at@9@31@8@32@3@4@18@30@9@1@8@33@18@28@17@28@9@31@8@32@17@30,0@4l@5@36xear@9@1@8@33@17@28@0@29nfl@17@30ewr@9@1@8@33@18@28@19@29nfl@18@30em@0@23nfl@0@29em@19@23nfl@19@29e
static const SvxMSDffVertPair mso_sptEllipseRibbon2Vert[] =		
{
	{ 9 MSO_I , 34 MSO_I },
	{ 8 MSO_I , 35 MSO_I },
	{ 0 , 24 MSO_I },
	{ 0 MSO_I , 23 MSO_I },
	{ 9 MSO_I , 0 },
	{ 8 MSO_I , 11 MSO_I },
	{ 0 MSO_I , 22 MSO_I },
	{ 19 MSO_I , 22 MSO_I },
	{ 9 MSO_I , 34 MSO_I },
	{ 8 MSO_I , 35 MSO_I },
	{ 19 MSO_I , 23 MSO_I },
	{ 3 MSO_I , 24 MSO_I },
	{ 7 MSO_I , 36 MSO_I },
	{ 3 MSO_I , 4 MSO_I },
	{ 9 MSO_I , 31 MSO_I },
	{ 8 MSO_I , 32 MSO_I },
	{ 3 MSO_I , 4 MSO_I },
	{ 18 MSO_I , 30 MSO_I },
	{ 9 MSO_I , 1 MSO_I },
	{ 8 MSO_I , 33 MSO_I },
	{ 18 MSO_I , 28 MSO_I },
	{ 17 MSO_I , 28 MSO_I },
	{ 9 MSO_I , 31 MSO_I },
	{ 8 MSO_I , 32 MSO_I },
	{ 17 MSO_I , 30 MSO_I },
	{ 0 , 4l MSO_I },
	{ 5 MSO_I , 36 MSO_I },
	{ 9 MSO_I , 1 MSO_I },
	{ 8 MSO_I , 33 MSO_I },
	{ 17 MSO_I , 28 MSO_I },
	{ 0 MSO_I , 29 MSO_I },
	{ 17 MSO_I , 30 MSO_I },
	{ 9 MSO_I , 1 MSO_I },
	{ 8 MSO_I , 33 MSO_I },
	{ 18 MSO_I , 28 MSO_I },
	{ 19 MSO_I , 29 MSO_I },
	{ 18 MSO_I , 30 MSO_I },
	{ 0 MSO_I , 23 MSO_I },
	{ 0 MSO_I , 29 MSO_I },
	{ 19 MSO_I , 23 MSO_I },
	{ 19 MSO_I , 29 MSO_I }
};
static const sal_uInt16 mso_sptEllipseRibbon2Segm[] =
{
	0xa50c/*wr*/,0x0002/*l*/,0xa30c/*at*/,0x0001/*l*/,
	0x6001/*x*/, 0x8000/*e*/,0xa304/*ar*/,0xaa00/*nf*/, 
	0x0001/*l*/, 0x8000/*e*/,0xa504/*wr*/,0xaa00/*nf*/,
	0x0001/*l*/, 0x8000/*e*/,0x4000/*m*/,0xaa00/*nf*/,
	0x0001/*l*/, 0x8000/*e*/,0x4000/*m*/,0xaa00/*nf*/,
	0x0001/*l*/, 0x8000/*e*/
};

static const SvxMSDffCalculationData mso_sptEllipseRibbon2Calc[] =
{
	{ 0x2000 , { DFF_Prop_adjustValue , 0 , 0 } }, //val #0
	{ 0x2000 , { DFF_Prop_adjust2Value , 0 , 0 } }, //val #1
	{ 0x2000 , { DFF_Prop_adjust3Value , 0 , 0 } }, //val #2
	{ 0x2000 , { DFF_Prop_geoRight , 0 , 0 } }, //val width
	{ 0x2000 , { DFF_Prop_geoBottom , 0 , 0 } }, //val height
	{ 0x2001 , { DFF_Prop_geoRight , 1 , 8 } }, //prod width 1 8
	{ 0x2001 , { DFF_Prop_geoRight , 1 , 2 } }, //prod width 1 2
	{ 0x2001 , { DFF_Prop_geoRight , 7 , 8 } }, //prod width 7 8
	{ 0x2001 , { DFF_Prop_geoRight , 3 , 2 } }, //prod width 3 2
	{ 0x8000 , { 0 , 0 , 0x406 } }, //sum 0 0 @6
	{ 0x2001 , { DFF_Prop_adjust3Value , 30573 , 4096 } }, //prod #2 30573 4096
	{ 0x2001 , { 0x40a , 2 , 1 } }, //prod @10 2 1
	{ 0xe000 , { 0x40a , DFF_Prop_geoBottom , DFF_Prop_adjust3Value } }, //sum @10 height #2
	{ 0x6000 , { 0x40a , DFF_Prop_adjust2Value , 0 } }, //sum @10 #1 0
	{ 0x2001 , { DFF_Prop_adjust2Value , 1 , 2 } }, //prod #1 1 2
	{ 0x6000 , { 0x40a , 0x40e , 0 } }, //sum @10 @14 0
	{ 0xa000 , { 0x40c , 0 , DFF_Prop_adjust2Value } }, //sum @12 0 #1
	{ 0x6000 , { DFF_Prop_adjustValue , 0x405 , 0 } }, //sum #0 @5 0
	{ 0xa000 , { DFF_Prop_geoRight , 0 , 0x411 } }, //sum width 0 @17
	{ 0xa000 , { DFF_Prop_geoRight , 0 , DFF_Prop_adjustValue } }, //sum width 0 #0
	{ 0xa000 , { 0x406 , 0 , DFF_Prop_adjustValue } }, //sum @6 0 #0
	{ 0xe00f , { 0x414 , DFF_Prop_geoRight , 0x40a } }, //ellipse @20 width @10
	{ 0xa000 , { 0x40a , 0 , 0x415 } }, //sum @10 0 @21
	{ 0xe000 , { 0x416 , 0x410 , 0x40a } }, //sum @22 @16 @10
	{ 0xe000 , { DFF_Prop_adjust3Value , 0x410 , 0x40a } }, //sum #2 @16 @10
	{ 0x2001 , { 0x40a , 2391 , 32768 } }, //prod @10 2391 32768
	{ 0xa000 , { 0x406 , 0 , 0x411 } }, //sum @6 0 @17
	{ 0xe00f , { 0x41a , DFF_Prop_geoRight , 0x40a } }, //ellipse @26 width @10
	{ 0xe000 , { 0x40a , DFF_Prop_adjust2Value , 0x41b } }, //sum @10 #1 @27
	{ 0x6000 , { 0x416 , DFF_Prop_adjust2Value , 0 } }, //sum @22 #1 0
	{ 0xa000 , { 0x40c , 0 , 0x41b } }, //sum @12 0 @27
	{ 0xa000 , { DFF_Prop_geoBottom , 0 , DFF_Prop_adjust3Value } }, //sum height 0 #2
	{ 0x6000 , { 0x40a , 0x40c , 0 } }, //sum @10 @12 0
	{ 0xe000 , { 0x420 , 0x40a , 0x410 } }, //sum @32 @10 @16
	{ 0xe000 , { 0x41f , 0x40a , 0x40d } }, //sum @31 @10 @13
	{ 0xe000 , { 0x420 , 0x40a , 0x40d } }, //sum @32 @10 @13
	{ 0xe000 , { 0x419 , 0x40c , 0x40f } }, //sum @25 @12 @15
	{ 0xa000 , { 0x410 , 0 , 0x40f } }, //sum @16 0 @15
	{ 0x2001 , { 0x425 , 2 , 3 } }, //prod @37 2 3
	{ 0x6000 , { 0x401 , 0x426 , 0 } }, //sum @1 @38 0
	{ 0x6000 , { DFF_Prop_adjust3Value , 0x426 , 0 } }, //sum #2 @38 0
	{ 0x2005 , { 0x428 , 675 , 0 } }, //max @40 675
	{ 0x2001 , { DFF_Prop_geoRight , 3 , 8 } }, //prod width 3 8
	{ 0x2000 , { 0x42a , 0 , 4 } } //sum @42 0 4
};

static const SvxMSDffTextRectangles mso_sptEllipseRibbon2TextRect[] =
{//@0,@22,@19,@1
	{ { 0 MSO_I, 22 MSO_I }, { 19 MSO_I, 1 MSO_I } }
};

static const sal_Int32 mso_sptEllipseRibbon2Default[] =
{ 
	3,5400,16200,2700
};

static const SvxMSDffHandle mso_sptEllipseRibbon2Handle[] =
{
//position="#0,topLeft" xrange="@5,@43
//position="center,#1" yrange="@39,@31
//position="topLeft,#2" yrange="@41,@24
	{   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL| MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL,
		0x100, 0, 0, 0, 0x8/*5+3*/, 0x2e/*43+3*/, 0x80000000, 0x7fffffff },
	{	MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
		10800, 0x101, 0, 0, 0x80000000, 0x7fffffff,0x2a/*39+3*/, 0x22 /*31+3*/ },
	{	MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
		0, 0x102, 0, 0, 0x80000000, 0x7fffffff,0x2c/*41+3*/, 0x1b /*24+3*/ }
};

static const mso_CustomShape msosptEllipseRibbon2 =
{
	(SvxMSDffVertPair*)mso_sptEllipseRibbon2Vert, sizeof( mso_sptEllipseRibbon2Vert ) / sizeof( SvxMSDffVertPair ),
	(sal_uInt16*)mso_sptEllipseRibbon2Segm, sizeof( mso_sptEllipseRibbon2Segm ) >> 1,
	(SvxMSDffCalculationData*)mso_sptEllipseRibbon2Calc, sizeof( mso_sptEllipseRibbon2Calc ) / sizeof( SvxMSDffCalculationData ),
	(sal_Int32*)mso_sptEllipseRibbon2Default,
	(SvxMSDffTextRectangles*)mso_sptEllipseRibbon2TextRect, sizeof( mso_sptEllipseRibbon2TextRect ) / sizeof( SvxMSDffTextRectangles ),
	21600, 21600,
	0x80000000, 0x80000000,
	NULL, 0,
	(SvxMSDffHandle*)mso_sptEllipseRibbon2Handle, sizeof( mso_sptEllipseRibbon2Handle ) / sizeof( SvxMSDffHandle )
};
// End
static const SvxMSDffVertPair mso_sptVerticalScrollVert[] =	// adjustment1 : 0 - 5400
{
	{ 1 MSO_I, 21600 }, { 0, 11 MSO_I }, { 1 MSO_I, 12 MSO_I }, { 0 MSO_I, 12 MSO_I },

		case mso_sptSeal32 :					pCustomShape = &msoSeal32; break;
		case mso_sptRibbon2 :					pCustomShape = &msoRibbon2; break;
		case mso_sptRibbon :					pCustomShape = &msoRibbon; break;
		case mso_sptEllipseRibbon2 :			pCustomShape = &msosptEllipseRibbon2; break;	// SJ: TODO
		case mso_sptEllipseRibbon :				pCustomShape = &msosptEllipseRibbon; break;	// SJ: TODO
		case mso_sptVerticalScroll :			pCustomShape = &msoVerticalScroll;	break;
		case mso_sptHorizontalScroll :			pCustomShape = &msoHorizontalScroll; break;
		case mso_sptFlowChartProcess :			pCustomShape = &msoFlowChartProcess; break;

Return to issue 119755

Lines 4507-4513 Link Here

(-)svx/source/customshapes/EnhancedCustomShapeGeometry.cxx (-2 / +287 lines)
4507	(SvxMSDffVertPair*)mso_sptRibbonGluePoints, sizeof( mso_sptRibbonGluePoints ) / sizeof( SvxMSDffVertPair ),	4507	(SvxMSDffVertPair*)mso_sptRibbonGluePoints, sizeof( mso_sptRibbonGluePoints ) / sizeof( SvxMSDffVertPair ),
4508	(SvxMSDffHandle*)mso_sptRibbonHandle, sizeof( mso_sptRibbonHandle ) / sizeof( SvxMSDffHandle )	4508	(SvxMSDffHandle*)mso_sptRibbonHandle, sizeof( mso_sptRibbonHandle ) / sizeof( SvxMSDffHandle )
4509	};	4509	};
		4510	//msosptEllipseRibbon
		4511	//svg path = ar@9@38@8@37,0@27@0@26@9@13@8@4@0@25@22@25@9@38@8@37@22@26@3@27l@7@40@3,wa@9@35@8@10@3,0@21@33@9@36@8@1@21@31@20@31@9@35@8@10@20@33,,l@5@40xewr@9@36@8@1@20@31@0@32nfl@20@33ear@9@36@8@1@21@31@22@32nfl@21@33em@0@26nfl@0@32em@22@26nfl@22@32e
		4512	//odp path = A ?f9 ?f38 ?f8 ?f37 0 ?f27 ?f0 ?f26 ?f9 ?f13 ?f8 ?f4 ?f0 ?f25 ?f22 ?f25 ?f9 ?f38 ?f8 ?f37 ?f22 ?f26 ?f3 ?f27 L ?f7 ?f40 ?f3 0 W ?f9 ?f35 ?f8 ?f10 ?f3 0 ?f21 ?f33 ?f9 ?f36 ?f8 ?f1 ?f21 ?f31 ?f20 ?f31 ?f9 ?f35 ?f8 ?f10 ?f20 ?f33 0 0 L ?f5 ?f40 Z N W ?f9 ?f36 ?f8 ?f1 ?f20 ?f31 ?f0 ?f32 F L ?f20 ?f33 N A ?f9 ?f36 ?f8 ?f1 ?f21 ?f31 ?f22 ?f32 F L ?f21 ?f33 N M ?f0 ?f26 F L ?f0 ?f32 N M ?f22 ?f26 F L ?f22 ?f32 N
		4513	static const SvxMSDffVertPair mso_sptEllipseRibbonVert[] =
		4514	{
		4515	{ 9 MSO_I , 38 MSO_I },
		4516	{ 8 MSO_I , 37 MSO_I },
		4517	{ 0 , 27 MSO_I },
		4518	{ 0 MSO_I , 26 MSO_I },
		4519	{ 9 MSO_I , 13 MSO_I },
		4520	{ 8 MSO_I , 4 MSO_I },
		4521	{ 0 MSO_I , 25 MSO_I },
		4522	{ 22 MSO_I , 25 MSO_I },
		4523	{ 9 MSO_I , 38 MSO_I },
		4524	{ 8 MSO_I , 37 MSO_I },
		4525	{ 22 MSO_I , 26 MSO_I },
		4526	{ 3 MSO_I , 27 MSO_I },
		4527	{ 7 MSO_I , 40 MSO_I },
		4528	{ 3 MSO_I , 0 },
		4529	{ 9 MSO_I , 35 MSO_I },
		4530	{ 8 MSO_I , 10 MSO_I },
		4531	{ 3 MSO_I , 0 },
		4532	{ 21 MSO_I , 33 MSO_I },
		4533	{ 9 MSO_I , 36 MSO_I },
		4534	{ 8 MSO_I , 1 MSO_I },
		4535	{ 21 MSO_I , 31 MSO_I },
		4536	{ 20 MSO_I , 31 MSO_I },
		4537	{ 9 MSO_I , 35 MSO_I },
		4538	{ 8 MSO_I , 10 MSO_I },
		4539	{ 20 MSO_I , 33 MSO_I },
		4540	{ 0 , 0 },
		4541	{ 5 MSO_I , 40 MSO_I },
		4542	{ 9 MSO_I , 36 MSO_I },
		4543	{ 8 MSO_I , 1 MSO_I },
		4544	{ 20 MSO_I , 31 MSO_I },
		4545	{ 0 MSO_I , 32 MSO_I },
		4546	{ 20 MSO_I , 33 MSO_I },
		4547	{ 9 MSO_I , 36 MSO_I },
		4548	{ 8 MSO_I , 1 MSO_I },
		4549	{ 21 MSO_I , 31 MSO_I },
		4550	{ 22 MSO_I , 32 MSO_I },
		4551	{ 21 MSO_I , 33 MSO_I },
		4552	{ 0 MSO_I , 26 MSO_I },
		4553	{ 0 MSO_I , 32 MSO_I },
		4554	{ 22 MSO_I , 26 MSO_I },
		4555	{ 22 MSO_I , 32 MSO_I }
		4556	};
4510		4557
		4558	static const sal_uInt16 mso_sptEllipseRibbonSegm[] =
		4559	{
		4560	0xa30c /ar/,0x0002/l/,0xa50c/wa/,0x0001/l/,
		4561	0x6001/x/, 0x8000/e/,0xa504/wr/,0xaa00/nf/,
		4562	0x0001/l/, 0x8000/e/,0xa304/ar/,0xaa00/nf/,
		4563	0x0001/l/, 0x8000/e/,0x4000/m/,0xaa00/nf/,
		4564	0x0001/l/, 0x8000/e/,0x4000/m/,0xaa00/nf/,
		4565	0x0001/l/, 0x8000/e/
		4566	};
		4567
		4568	static const SvxMSDffCalculationData mso_sptEllipseRibbonCalc[] =
		4569	{
		4570	{ 0x2000 , { DFF_Prop_adjustValue , 0 , 0 } }, //val #0
		4571	{ 0x2000 , { DFF_Prop_adjust2Value , 0 , 0 } }, //val #1
		4572	{ 0x2000 , { DFF_Prop_adjust3Value , 0 , 0 } }, //val #2
		4573	{ 0x2000 , { DFF_Prop_geoRight , 0 , 0 } }, //val width
		4574	{ 0x2000 , { DFF_Prop_geoBottom , 0 , 0 } }, //val height
		4575	{ 0x2001 , { DFF_Prop_geoRight , 1 , 8 } }, //prod width 1 8
		4576	{ 0x2001 , { DFF_Prop_geoRight , 1 , 2 } }, //prod width 1 2
		4577	{ 0x2001 , { DFF_Prop_geoRight , 7 , 8 } }, //prod width 7 8
		4578	{ 0x2001 , { DFF_Prop_geoRight , 3 , 2 } }, //prod width 3 2
		4579	{ 0x8000 , { 0 , 0 , 0x406 } }, //sum 0 0 @6
		4580	{ 0xa000 , { DFF_Prop_geoBottom , 0 , DFF_Prop_adjust3Value } }, //sum height 0 #2
		4581	{ 0x2001 , { 0x40a , 30573 , 4096 } }, //prod @10 30573 4096
		4582	{ 0x2001 , { 0x40b , 2 , 1 } }, //prod @11 2 1
		4583	{ 0xa000 , { DFF_Prop_geoBottom , 0 , 0x40c } }, //sum height 0 @12
		4584	{ 0x6000 , { 0x40b , DFF_Prop_adjust3Value , 0 } }, //sum @11 #2 0
		4585	{ 0xe000 , { 0x40b , DFF_Prop_geoBottom , DFF_Prop_adjust2Value } }, //sum @11 height #1
		4586	{ 0xa000 , { DFF_Prop_geoBottom , 0 , DFF_Prop_adjust2Value } }, //sum height 0 #1
		4587	{ 0x2001 , { 0x410 , 1 , 2 } }, //prod @16 1 2
		4588	{ 0x6000 , { 0x40b , 0x411 , 0 } }, //sum @11 @17 0
		4589	{ 0xe000 , { 0x40e , DFF_Prop_adjust2Value , DFF_Prop_geoBottom } }, //sum @14 #1 height
		4590	{ 0x6000 , { DFF_Prop_adjustValue , 0x405 , 0 } }, //sum #0 @5 0
		4591	{ 0xa000 , { DFF_Prop_geoRight , 0 , 0x414 } }, //sum width 0 @20
		4592	{ 0xa000 , { DFF_Prop_geoRight , 0 , DFF_Prop_adjustValue } }, //sum width 0 #0
		4593	{ 0xa000 , { 0x406 , 0 , DFF_Prop_adjustValue } }, //sum @6 0 #0
		4594	{ 0xe00f , { 0x417 , DFF_Prop_geoRight , 0x40b } }, //ellipse @23 width @11
		4595	{ 0xe000 , { 0x418 , DFF_Prop_geoBottom , 0x40b } }, //sum @24 height @11
		4596	{ 0xe000 , { 0x419 , 0x40b , 0x413 } }, //sum @25 @11 @19
		4597	{ 0xe000 , { DFF_Prop_adjust3Value , 0x40b , 0x413 } }, //sum #2 @11 @19
		4598	{ 0x2001 , { 0x40b , 2391 , 32768 } }, //prod @11 2391 32768
		4599	{ 0xa000 , { 0x406 , 0 , 0x414 } }, //sum @6 0 @20
		4600	{ 0xe00f , { 0x41d , DFF_Prop_geoRight , 0x40b } }, //ellipse @29 width @11
		4601	{ 0xe000 , { DFF_Prop_adjust2Value , 0x41e , 0x40b } }, //sum #1 @30 @11
		4602	{ 0xe000 , { 0x419 , DFF_Prop_adjust2Value , DFF_Prop_geoBottom } }, //sum @25 #1 height
		4603	{ 0xe000 , { DFF_Prop_geoBottom , 0x41e , 0x40e } }, //sum height @30 @14
		4604	{ 0x6000 , { 0x40b , 0x40e , 0 } }, //sum @11 @14 0
		4605	{ 0xa000 , { DFF_Prop_geoBottom , 0 , 0x422 } }, //sum height 0 @34
		4606	{ 0xe000 , { 0x423 , 0x413 , 0x40b } }, //sum @35 @19 @11
		4607	{ 0xe000 , { 0x40a , 0x40f , 0x40b } }, //sum @10 @15 @11
		4608	{ 0xe000 , { 0x423 , 0x40f , 0x40b } }, //sum @35 @15 @11
		4609	{ 0xe000 , { 0x41c , 0x40e , 0x412 } }, //sum @28 @14 @18
		4610	{ 0xa000 , { DFF_Prop_geoBottom , 0 , 0x427 } }, //sum height 0 @39
		4611	{ 0xa000 , { 0x413 , 0 , 0x412 } }, //sum @19 0 @18
		4612	{ 0x2001 , { 0x429 , 2 , 3 } }, //prod @41 2 3
		4613	{ 0xa000 , { DFF_Prop_adjust2Value , 0 , 0x42a } }, //sum #1 0 @42
		4614	{ 0xa000 , { DFF_Prop_adjust3Value , 0 , 0x42a } }, //sum #2 0 @42
		4615	{ 0x2004 , { 0x42c , 20925 , 0 } }, //min @44 20925
		4616	{ 0x2001 , { DFF_Prop_geoRight , 3 , 8 } }, //prod width 3 8
		4617	{ 0x2000 , { 0x42e , 0 , 4 } }, //sum @46 0 4
		4618	};
		4619
		4620	static const SvxMSDffTextRectangles mso_sptEllipseRibbonTextRect[] =
		4621	{//@0,@1,@22,@25
4622	{ { 0 MSO_I, 1 MSO_I }, { 22 MSO_I, 25 MSO_I } }
4623	};
4624
4625	static const sal_Int32 mso_sptEllipseRibbonDefault[] =
4626	{
4627	3,5400,5400,18900
4628	};
4629
4630	static const SvxMSDffHandle mso_sptEllipseRibbonHandle[] =
4631	{
4632	//position="#0,bottomRight" xrange="@5,@47
4633	//position="center,#1" yrange="@10,@43
4634	//position="topLeft,#2" yrange="@27,@45
4635	{ MSDFF_HANDLE_FLAGS_RANGE \| MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL\| MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL,
4636	0x100, 21600, 0, 0, 0x8/5+3/, 0x32/47+3/, 0x80000000, 0x7fffffff },
4637	{ MSDFF_HANDLE_FLAGS_RANGE \| MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL \| MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
4638	10800, 0x101, 0, 0, 0x80000000, 0x7fffffff,0xd/10+3/, 0x2e /43+3/ },
4639	{ MSDFF_HANDLE_FLAGS_RANGE \| MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL \| MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
4640	0, 0x102, 0, 0, 0x80000000, 0x7fffffff,0x1e/27+3/, 0x30 /45+3/ }
4641	};
4642
4643	static const mso_CustomShape msosptEllipseRibbon =
4644	{
4645	(SvxMSDffVertPair*)mso_sptEllipseRibbonVert, sizeof( mso_sptEllipseRibbonVert ) / sizeof( SvxMSDffVertPair ),
4646	(sal_uInt16*)mso_sptEllipseRibbonSegm, sizeof( mso_sptEllipseRibbonSegm ) >> 1,
4647	(SvxMSDffCalculationData*)mso_sptEllipseRibbonCalc, sizeof( mso_sptEllipseRibbonCalc ) / sizeof( SvxMSDffCalculationData ),
4648	(sal_Int32*)mso_sptEllipseRibbonDefault,
4649	(SvxMSDffTextRectangles*)mso_sptEllipseRibbonTextRect, sizeof( mso_sptEllipseRibbonTextRect ) / sizeof( SvxMSDffTextRectangles ),
4650	21600, 21600,
4651	0x80000000, 0x80000000,
4652	NULL, 0,
4653	(SvxMSDffHandle*)mso_sptEllipseRibbonHandle, sizeof( mso_sptEllipseRibbonHandle ) / sizeof( SvxMSDffHandle )
4654	};
4655
4656	//msosptEllipseRibbon2
4657	//svg path = wr@9@34@8@35,0@24@0@23@9,0@8@11@0@22@19@22@9@34@8@35@19@23@3@24l@7@36@3@4at@9@31@8@32@3@4@18@30@9@1@8@33@18@28@17@28@9@31@8@32@17@30,0@4l@5@36xear@9@1@8@33@17@28@0@29nfl@17@30ewr@9@1@8@33@18@28@19@29nfl@18@30em@0@23nfl@0@29em@19@23nfl@19@29e
4658	static const SvxMSDffVertPair mso_sptEllipseRibbon2Vert[] =
4659	{
4660	{ 9 MSO_I , 34 MSO_I },
4661	{ 8 MSO_I , 35 MSO_I },
4662	{ 0 , 24 MSO_I },
4663	{ 0 MSO_I , 23 MSO_I },
4664	{ 9 MSO_I , 0 },
4665	{ 8 MSO_I , 11 MSO_I },
4666	{ 0 MSO_I , 22 MSO_I },
4667	{ 19 MSO_I , 22 MSO_I },
4668	{ 9 MSO_I , 34 MSO_I },
4669	{ 8 MSO_I , 35 MSO_I },
4670	{ 19 MSO_I , 23 MSO_I },
4671	{ 3 MSO_I , 24 MSO_I },
4672	{ 7 MSO_I , 36 MSO_I },
4673	{ 3 MSO_I , 4 MSO_I },
4674	{ 9 MSO_I , 31 MSO_I },
4675	{ 8 MSO_I , 32 MSO_I },
4676	{ 3 MSO_I , 4 MSO_I },
4677	{ 18 MSO_I , 30 MSO_I },
4678	{ 9 MSO_I , 1 MSO_I },
4679	{ 8 MSO_I , 33 MSO_I },
4680	{ 18 MSO_I , 28 MSO_I },
4681	{ 17 MSO_I , 28 MSO_I },
4682	{ 9 MSO_I , 31 MSO_I },
4683	{ 8 MSO_I , 32 MSO_I },
4684	{ 17 MSO_I , 30 MSO_I },
4685	{ 0 , 4l MSO_I },
4686	{ 5 MSO_I , 36 MSO_I },
4687	{ 9 MSO_I , 1 MSO_I },
4688	{ 8 MSO_I , 33 MSO_I },
4689	{ 17 MSO_I , 28 MSO_I },
4690	{ 0 MSO_I , 29 MSO_I },
4691	{ 17 MSO_I , 30 MSO_I },
4692	{ 9 MSO_I , 1 MSO_I },
4693	{ 8 MSO_I , 33 MSO_I },
4694	{ 18 MSO_I , 28 MSO_I },
4695	{ 19 MSO_I , 29 MSO_I },
4696	{ 18 MSO_I , 30 MSO_I },
4697	{ 0 MSO_I , 23 MSO_I },
4698	{ 0 MSO_I , 29 MSO_I },
4699	{ 19 MSO_I , 23 MSO_I },
4700	{ 19 MSO_I , 29 MSO_I }
4701	};
4702	static const sal_uInt16 mso_sptEllipseRibbon2Segm[] =
4703	{
4704	0xa50c/wr/,0x0002/l/,0xa30c/at/,0x0001/l/,
4705	0x6001/x/, 0x8000/e/,0xa304/ar/,0xaa00/nf/,
4706	0x0001/l/, 0x8000/e/,0xa504/wr/,0xaa00/nf/,
4707	0x0001/l/, 0x8000/e/,0x4000/m/,0xaa00/nf/,
4708	0x0001/l/, 0x8000/e/,0x4000/m/,0xaa00/nf/,
4709	0x0001/l/, 0x8000/e/
4710	};
4711
4712	static const SvxMSDffCalculationData mso_sptEllipseRibbon2Calc[] =
4713	{
4714	{ 0x2000 , { DFF_Prop_adjustValue , 0 , 0 } }, //val #0
4715	{ 0x2000 , { DFF_Prop_adjust2Value , 0 , 0 } }, //val #1
4716	{ 0x2000 , { DFF_Prop_adjust3Value , 0 , 0 } }, //val #2
4717	{ 0x2000 , { DFF_Prop_geoRight , 0 , 0 } }, //val width
4718	{ 0x2000 , { DFF_Prop_geoBottom , 0 , 0 } }, //val height
4719	{ 0x2001 , { DFF_Prop_geoRight , 1 , 8 } }, //prod width 1 8
4720	{ 0x2001 , { DFF_Prop_geoRight , 1 , 2 } }, //prod width 1 2
4721	{ 0x2001 , { DFF_Prop_geoRight , 7 , 8 } }, //prod width 7 8
4722	{ 0x2001 , { DFF_Prop_geoRight , 3 , 2 } }, //prod width 3 2
4723	{ 0x8000 , { 0 , 0 , 0x406 } }, //sum 0 0 @6
4724	{ 0x2001 , { DFF_Prop_adjust3Value , 30573 , 4096 } }, //prod #2 30573 4096
4725	{ 0x2001 , { 0x40a , 2 , 1 } }, //prod @10 2 1
4726	{ 0xe000 , { 0x40a , DFF_Prop_geoBottom , DFF_Prop_adjust3Value } }, //sum @10 height #2
4727	{ 0x6000 , { 0x40a , DFF_Prop_adjust2Value , 0 } }, //sum @10 #1 0
4728	{ 0x2001 , { DFF_Prop_adjust2Value , 1 , 2 } }, //prod #1 1 2
4729	{ 0x6000 , { 0x40a , 0x40e , 0 } }, //sum @10 @14 0
4730	{ 0xa000 , { 0x40c , 0 , DFF_Prop_adjust2Value } }, //sum @12 0 #1
4731	{ 0x6000 , { DFF_Prop_adjustValue , 0x405 , 0 } }, //sum #0 @5 0
4732	{ 0xa000 , { DFF_Prop_geoRight , 0 , 0x411 } }, //sum width 0 @17
4733	{ 0xa000 , { DFF_Prop_geoRight , 0 , DFF_Prop_adjustValue } }, //sum width 0 #0
4734	{ 0xa000 , { 0x406 , 0 , DFF_Prop_adjustValue } }, //sum @6 0 #0
4735	{ 0xe00f , { 0x414 , DFF_Prop_geoRight , 0x40a } }, //ellipse @20 width @10
4736	{ 0xa000 , { 0x40a , 0 , 0x415 } }, //sum @10 0 @21
4737	{ 0xe000 , { 0x416 , 0x410 , 0x40a } }, //sum @22 @16 @10
4738	{ 0xe000 , { DFF_Prop_adjust3Value , 0x410 , 0x40a } }, //sum #2 @16 @10
4739	{ 0x2001 , { 0x40a , 2391 , 32768 } }, //prod @10 2391 32768
4740	{ 0xa000 , { 0x406 , 0 , 0x411 } }, //sum @6 0 @17
4741	{ 0xe00f , { 0x41a , DFF_Prop_geoRight , 0x40a } }, //ellipse @26 width @10
4742	{ 0xe000 , { 0x40a , DFF_Prop_adjust2Value , 0x41b } }, //sum @10 #1 @27
4743	{ 0x6000 , { 0x416 , DFF_Prop_adjust2Value , 0 } }, //sum @22 #1 0
4744	{ 0xa000 , { 0x40c , 0 , 0x41b } }, //sum @12 0 @27
4745	{ 0xa000 , { DFF_Prop_geoBottom , 0 , DFF_Prop_adjust3Value } }, //sum height 0 #2
4746	{ 0x6000 , { 0x40a , 0x40c , 0 } }, //sum @10 @12 0
4747	{ 0xe000 , { 0x420 , 0x40a , 0x410 } }, //sum @32 @10 @16
4748	{ 0xe000 , { 0x41f , 0x40a , 0x40d } }, //sum @31 @10 @13
4749	{ 0xe000 , { 0x420 , 0x40a , 0x40d } }, //sum @32 @10 @13
4750	{ 0xe000 , { 0x419 , 0x40c , 0x40f } }, //sum @25 @12 @15
4751	{ 0xa000 , { 0x410 , 0 , 0x40f } }, //sum @16 0 @15
4752	{ 0x2001 , { 0x425 , 2 , 3 } }, //prod @37 2 3
4753	{ 0x6000 , { 0x401 , 0x426 , 0 } }, //sum @1 @38 0
4754	{ 0x6000 , { DFF_Prop_adjust3Value , 0x426 , 0 } }, //sum #2 @38 0
4755	{ 0x2005 , { 0x428 , 675 , 0 } }, //max @40 675
4756	{ 0x2001 , { DFF_Prop_geoRight , 3 , 8 } }, //prod width 3 8
4757	{ 0x2000 , { 0x42a , 0 , 4 } } //sum @42 0 4
4758	};
4759
4760	static const SvxMSDffTextRectangles mso_sptEllipseRibbon2TextRect[] =
4761	{//@0,@22,@19,@1
4762	{ { 0 MSO_I, 22 MSO_I }, { 19 MSO_I, 1 MSO_I } }
4763	};
4764
4765	static const sal_Int32 mso_sptEllipseRibbon2Default[] =
4766	{
4767	3,5400,16200,2700
4768	};
4769
4770	static const SvxMSDffHandle mso_sptEllipseRibbon2Handle[] =
4771	{
4772	//position="#0,topLeft" xrange="@5,@43
4773	//position="center,#1" yrange="@39,@31
4774	//position="topLeft,#2" yrange="@41,@24
4775	{ MSDFF_HANDLE_FLAGS_RANGE \| MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL\| MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL,
4776	0x100, 0, 0, 0, 0x8/5+3/, 0x2e/43+3/, 0x80000000, 0x7fffffff },
4777	{ MSDFF_HANDLE_FLAGS_RANGE \| MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL \| MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
4778	10800, 0x101, 0, 0, 0x80000000, 0x7fffffff,0x2a/39+3/, 0x22 /31+3/ },
4779	{ MSDFF_HANDLE_FLAGS_RANGE \| MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL \| MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
4780	0, 0x102, 0, 0, 0x80000000, 0x7fffffff,0x2c/41+3/, 0x1b /24+3/ }
4781	};
4782
4783	static const mso_CustomShape msosptEllipseRibbon2 =
4784	{
4785	(SvxMSDffVertPair*)mso_sptEllipseRibbon2Vert, sizeof( mso_sptEllipseRibbon2Vert ) / sizeof( SvxMSDffVertPair ),
4786	(sal_uInt16*)mso_sptEllipseRibbon2Segm, sizeof( mso_sptEllipseRibbon2Segm ) >> 1,
4787	(SvxMSDffCalculationData*)mso_sptEllipseRibbon2Calc, sizeof( mso_sptEllipseRibbon2Calc ) / sizeof( SvxMSDffCalculationData ),
4788	(sal_Int32*)mso_sptEllipseRibbon2Default,
4789	(SvxMSDffTextRectangles*)mso_sptEllipseRibbon2TextRect, sizeof( mso_sptEllipseRibbon2TextRect ) / sizeof( SvxMSDffTextRectangles ),
4790	21600, 21600,
4791	0x80000000, 0x80000000,
4792	NULL, 0,
4793	(SvxMSDffHandle*)mso_sptEllipseRibbon2Handle, sizeof( mso_sptEllipseRibbon2Handle ) / sizeof( SvxMSDffHandle )
4794	};
4795	// End
4511	static const SvxMSDffVertPair mso_sptVerticalScrollVert[] = // adjustment1 : 0 - 5400	4796	static const SvxMSDffVertPair mso_sptVerticalScrollVert[] = // adjustment1 : 0 - 5400
4512	{	4797	{
4513	{ 1 MSO_I, 21600 }, { 0, 11 MSO_I }, { 1 MSO_I, 12 MSO_I }, { 0 MSO_I, 12 MSO_I },	4798	{ 1 MSO_I, 21600 }, { 0, 11 MSO_I }, { 1 MSO_I, 12 MSO_I }, { 0 MSO_I, 12 MSO_I },
Lines 8047-8054 Link Here
8047	case mso_sptSeal32 : pCustomShape = &msoSeal32; break;	8332	case mso_sptSeal32 : pCustomShape = &msoSeal32; break;
8048	case mso_sptRibbon2 : pCustomShape = &msoRibbon2; break;	8333	case mso_sptRibbon2 : pCustomShape = &msoRibbon2; break;
8049	case mso_sptRibbon : pCustomShape = &msoRibbon; break;	8334	case mso_sptRibbon : pCustomShape = &msoRibbon; break;
8050	case mso_sptEllipseRibbon2 : pCustomShape = &msoRibbon2; break; // SJ: TODO	8335	case mso_sptEllipseRibbon2 : pCustomShape = &msosptEllipseRibbon2; break; // SJ: TODO
8051	case mso_sptEllipseRibbon : pCustomShape = &msoRibbon; break; // SJ: TODO	8336	case mso_sptEllipseRibbon : pCustomShape = &msosptEllipseRibbon; break; // SJ: TODO
8052	case mso_sptVerticalScroll : pCustomShape = &msoVerticalScroll; break;	8337	case mso_sptVerticalScroll : pCustomShape = &msoVerticalScroll; break;
8053	case mso_sptHorizontalScroll : pCustomShape = &msoHorizontalScroll; break;	8338	case mso_sptHorizontalScroll : pCustomShape = &msoHorizontalScroll; break;
8054	case mso_sptFlowChartProcess : pCustomShape = &msoFlowChartProcess; break;	8339	case mso_sptFlowChartProcess : pCustomShape = &msoFlowChartProcess; break;