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

(-)svx/source/customshapes/EnhancedCustomShapeGeometry.cxx (-1 / +42 lines)
Lines 6463-6468 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
//V 0 0 21600 ?f2 0 ?f0 21600 ?f0 
6467
//W 0 0 21600 ?f2 21600 ?f0 0 ?f0 N 
6468
//V 0 ?f3 21600 21600 0 ?f1 21600 ?f1 
6469
//W 0 ?f3 21600 21600 21600 ?f1 0 ?f1 N
6470
//mso_sptTextRingInside
6471
static const SvxMSDffVertPair mso_sptTextRingInsideVert[] =
6472
{
6473
	{ 0, 0 }, { 21600, 2 MSO_I }, { 0, 0 MSO_I },{ 21600, 0 MSO_I },//V
6474
	{ 0, 0 }, { 21600, 2 MSO_I }, { 21600, 0 MSO_I },{ 0, 0 MSO_I },//W
6475
	{ 0, 3 MSO_I }, { 21600, 21600 }, { 0, 1 MSO_I },{ 21600, 1 MSO_I },//V
6476
	{ 0, 3 MSO_I }, { 21600, 21600 }, { 21600, 1 MSO_I },{ 0, 1 MSO_I }//W
6477
};
6478
static const SvxMSDffCalculationData mso_sptTextRingInsideCalc[] =	// adjustment1 : 6629 - 14971
6479
{
6480
	{ 0x2001, { DFF_Prop_adjustValue, 1, 2 } },
6481
	{ 0x8000, { 21600, 0, 0x400 } },
6482
	{ 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, //$0
6483
	{ 0x8000, { 21600, 0, DFF_Prop_adjustValue } }//21600-$0
6484
};
6485
static const sal_uInt16 mso_sptTextRingInsideSegm[] =
6486
{
6487
	0xa604, 0xa504,0x8000,
6488
	0xa604, 0xa504,0x8000
6489
};
6490
static const SvxMSDffHandle mso_sptTextRingInsideHandle[] =
6491
{
6492
	{	MSDFF_HANDLE_FLAGS_RANGE| MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
6493
		10800, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 10800, 21600 }
6494
};
6495
static const mso_CustomShape msoTextRingInside =
6496
{
6497
	(SvxMSDffVertPair*)mso_sptTextRingInsideVert, sizeof( mso_sptTextRingInsideVert ) / sizeof( SvxMSDffVertPair ),
6498
	(sal_uInt16*)mso_sptTextRingInsideSegm, sizeof( mso_sptTextRingInsideSegm ) >> 1,
6499
	(SvxMSDffCalculationData*)mso_sptTextRingInsideCalc, sizeof( mso_sptTextRingInsideCalc ) / sizeof( SvxMSDffCalculationData ),
6500
	(sal_Int32*)mso_sptDefault13500,
6501
	(SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
6502
	21600, 21600,
6503
	0x80000000, 0x80000000,
6504
	NULL, 0,
6505
	(SvxMSDffHandle*)mso_sptTextRingInsideHandle, sizeof( mso_sptTextRingInsideHandle ) / sizeof( SvxMSDffHandle )
6506
};
6466
static const SvxMSDffVertPair mso_sptTextRingOutsideVert[] =
6507
static const SvxMSDffVertPair mso_sptTextRingOutsideVert[] =
6467
{
6508
{
6468
	{ 10800, 0 MSO_I }, { 10800, 0 MSO_I }, { 180, 359 },
6509
	{ 10800, 0 MSO_I }, { 10800, 0 MSO_I }, { 180, 359 },
Lines 8418-8424 Link Here
8418
		case mso_sptTextTriangleInverted :		pCustomShape = &msoTextTriangleInverted; break;
8459
		case mso_sptTextTriangleInverted :		pCustomShape = &msoTextTriangleInverted; break;
8419
		case mso_sptTextChevron :				pCustomShape = &msoTextChevron; break;
8460
		case mso_sptTextChevron :				pCustomShape = &msoTextChevron; break;
8420
		case mso_sptTextChevronInverted :		pCustomShape = &msoTextChevronInverted; break;
8461
		case mso_sptTextChevronInverted :		pCustomShape = &msoTextChevronInverted; break;
8421
		case mso_sptTextRingInside :			pCustomShape = &msoTextRingOutside; break;	// SJ: TODO->the orientation of the ellipse needs to be changed
8462
		case mso_sptTextRingInside :			pCustomShape = &msoTextRingInside; break;	// SJ: TODO->the orientation of the ellipse needs to be changed
8422
		case mso_sptTextRingOutside :			pCustomShape = &msoTextRingOutside; break;
8463
		case mso_sptTextRingOutside :			pCustomShape = &msoTextRingOutside; break;
8423
		case mso_sptTextFadeRight :				pCustomShape = &msoTextFadeRight; break;
8464
		case mso_sptTextFadeRight :				pCustomShape = &msoTextFadeRight; break;
8424
		case mso_sptTextFadeLeft :				pCustomShape = &msoTextFadeLeft; break;
8465
		case mso_sptTextFadeLeft :				pCustomShape = &msoTextFadeLeft; break;

Return to issue 119881