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

(-)svx/source/customshapes/EnhancedCustomShapeGeometry.cxx (-5 / +11 lines)
Lines 6463-6477 Link Here
6463
	(SvxMSDffHandle*)mso_sptTextChevronInvertedHandle, sizeof( mso_sptTextChevronInvertedHandle ) / sizeof( SvxMSDffHandle )
6463
	(SvxMSDffHandle*)mso_sptTextChevronInvertedHandle, sizeof( mso_sptTextChevronInvertedHandle ) / sizeof( SvxMSDffHandle )
6464
};
6464
};
6465
6465
6466
//mso_sptTextRingOutside
6467
//path = U 10800 ?f0 21600 ?f2 180 539 N U 10800 ?f1 21600 ?f2 180 539 N
6466
static const SvxMSDffVertPair mso_sptTextRingOutsideVert[] =
6468
static const SvxMSDffVertPair mso_sptTextRingOutsideVert[] =
6467
{
6469
{
6468
	{ 10800, 0 MSO_I }, { 10800, 0 MSO_I }, { 180, 359 },
6470
	{ 10800, 0 MSO_I }, { 21600, 2 MSO_I }, { 180, 539},//U
6469
	{ 10800, 1 MSO_I }, { 10800, 0 MSO_I }, { 180, 359 }
6471
	{ 10800, 1 MSO_I }, { 21600, 2 MSO_I }, { 180, 539 }//U
6472
	//{ 10800, 0 MSO_I }, { 10800, 0 MSO_I }, { 180, 359 },
6473
	//{ 10800, 1 MSO_I }, { 10800, 0 MSO_I }, { 180, 359 }
6470
};
6474
};
6471
static const SvxMSDffCalculationData mso_sptTextRingOutsideCalc[] =	// adjustment1 : 6629 - 14971
6475
static const SvxMSDffCalculationData mso_sptTextRingOutsideCalc[] =	// adjustment1 : 6629 - 14971
6472
{
6476
{
6473
	{ 0x2001, { DFF_Prop_adjustValue, 1, 2 } },
6477
	{ 0x2001, { DFF_Prop_adjustValue, 1, 2 } },
6474
	{ 0x8000, { 21600, 0, 0x400 } }
6478
	{ 0x8000, { 21600, 0, 0x400 } },
6479
	{ 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, //$0
6480
	{ 0x8000, { 21600, 0, DFF_Prop_adjustValue } }//21600-$0
6475
};
6481
};
6476
static const sal_uInt16 mso_sptTextRingOutsideSegm[] =
6482
static const sal_uInt16 mso_sptTextRingOutsideSegm[] =
6477
{
6483
{
Lines 6480-6486 Link Here
6480
};
6486
};
6481
static const SvxMSDffHandle mso_sptTextRingOutsideHandle[] =
6487
static const SvxMSDffHandle mso_sptTextRingOutsideHandle[] =
6482
{
6488
{
6483
	{	MSDFF_HANDLE_FLAGS_RANGE,
6489
	{	MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
6484
		10800, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 10800, 21600 }
6490
		10800, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 10800, 21600 }
6485
};
6491
};
6486
static const mso_CustomShape msoTextRingOutside =
6492
static const mso_CustomShape msoTextRingOutside =
Lines 6488-6494 Link Here
6488
	(SvxMSDffVertPair*)mso_sptTextRingOutsideVert, sizeof( mso_sptTextRingOutsideVert ) / sizeof( SvxMSDffVertPair ),
6494
	(SvxMSDffVertPair*)mso_sptTextRingOutsideVert, sizeof( mso_sptTextRingOutsideVert ) / sizeof( SvxMSDffVertPair ),
6489
	(sal_uInt16*)mso_sptTextRingOutsideSegm, sizeof( mso_sptTextRingOutsideSegm ) >> 1,
6495
	(sal_uInt16*)mso_sptTextRingOutsideSegm, sizeof( mso_sptTextRingOutsideSegm ) >> 1,
6490
	(SvxMSDffCalculationData*)mso_sptTextRingOutsideCalc, sizeof( mso_sptTextRingOutsideCalc ) / sizeof( SvxMSDffCalculationData ),
6496
	(SvxMSDffCalculationData*)mso_sptTextRingOutsideCalc, sizeof( mso_sptTextRingOutsideCalc ) / sizeof( SvxMSDffCalculationData ),
6491
	(sal_Int32*)mso_sptDefault16200,
6497
	(sal_Int32*)mso_sptDefault13500,
6492
	(SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
6498
	(SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
6493
	21600, 21600,
6499
	21600, 21600,
6494
	0x80000000, 0x80000000,
6500
	0x80000000, 0x80000000,

Return to issue 120556