You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by su...@apache.org on 2012/08/16 07:25:06 UTC
svn commit: r1373732 -
/incubator/ooo/trunk/main/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
Author: sunying
Date: Thu Aug 16 05:25:06 2012
New Revision: 1373732
URL: http://svn.apache.org/viewvc?rev=1373732&view=rev
Log:
#120556# fix the "RingOutside" fontwork display incorrectly when open .ppt file
Reported by: Li Feng Wang
Patch by: Ying Sun
Review by: Jian Yuan Li
Modified:
incubator/ooo/trunk/main/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
Modified: incubator/ooo/trunk/main/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx?rev=1373732&r1=1373731&r2=1373732&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx (original)
+++ incubator/ooo/trunk/main/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx Thu Aug 16 05:25:06 2012
@@ -6463,15 +6463,21 @@ static const mso_CustomShape msoTextChev
(SvxMSDffHandle*)mso_sptTextChevronInvertedHandle, sizeof( mso_sptTextChevronInvertedHandle ) / sizeof( SvxMSDffHandle )
};
+//mso_sptTextRingOutside
+//path = U 10800 ?f0 21600 ?f2 180 539 N U 10800 ?f1 21600 ?f2 180 539 N
static const SvxMSDffVertPair mso_sptTextRingOutsideVert[] =
{
- { 10800, 0 MSO_I }, { 10800, 0 MSO_I }, { 180, 359 },
- { 10800, 1 MSO_I }, { 10800, 0 MSO_I }, { 180, 359 }
+ { 10800, 0 MSO_I }, { 21600, 2 MSO_I }, { 180, 539},//U
+ { 10800, 1 MSO_I }, { 21600, 2 MSO_I }, { 180, 539 }//U
+ //{ 10800, 0 MSO_I }, { 10800, 0 MSO_I }, { 180, 359 },
+ //{ 10800, 1 MSO_I }, { 10800, 0 MSO_I }, { 180, 359 }
};
static const SvxMSDffCalculationData mso_sptTextRingOutsideCalc[] = // adjustment1 : 6629 - 14971
{
{ 0x2001, { DFF_Prop_adjustValue, 1, 2 } },
- { 0x8000, { 21600, 0, 0x400 } }
+ { 0x8000, { 21600, 0, 0x400 } },
+ { 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, //$0
+ { 0x8000, { 21600, 0, DFF_Prop_adjustValue } }//21600-$0
};
static const sal_uInt16 mso_sptTextRingOutsideSegm[] =
{
@@ -6480,7 +6486,7 @@ static const sal_uInt16 mso_sptTextRingO
};
static const SvxMSDffHandle mso_sptTextRingOutsideHandle[] =
{
- { MSDFF_HANDLE_FLAGS_RANGE,
+ { MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
10800, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 10800, 21600 }
};
static const mso_CustomShape msoTextRingOutside =
@@ -6488,7 +6494,7 @@ static const mso_CustomShape msoTextRing
(SvxMSDffVertPair*)mso_sptTextRingOutsideVert, sizeof( mso_sptTextRingOutsideVert ) / sizeof( SvxMSDffVertPair ),
(sal_uInt16*)mso_sptTextRingOutsideSegm, sizeof( mso_sptTextRingOutsideSegm ) >> 1,
(SvxMSDffCalculationData*)mso_sptTextRingOutsideCalc, sizeof( mso_sptTextRingOutsideCalc ) / sizeof( SvxMSDffCalculationData ),
- (sal_Int32*)mso_sptDefault16200,
+ (sal_Int32*)mso_sptDefault13500,
(SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
0x80000000, 0x80000000,