From e820522037ff95818b9a40dfd77671f84c714cd5 Mon Sep 17 00:00:00 2001
From: Sun Ying <sunying@apache.org>
Date: Thu, 16 Aug 2012 04:25:06 +0000
Subject: Related: #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

(cherry picked from commit 3473dbf606f525d95b898a08072259018eb4056f)

Conflicts:
	svx/source/customshapes/EnhancedCustomShapeGeometry.cxx

Change-Id: I356bf0b5af720765e8ca60ae79bd04e449ff6e18
---
 svx/source/customshapes/EnhancedCustomShapeGeometry.cxx | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index 2c3cdd753146..3eb6308097d3 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -6439,15 +6439,21 @@ static const mso_CustomShape msoTextChevronInverted =
     (SvxMSDffHandle*)mso_sptTextChevronInvertedHandle, SAL_N_ELEMENTS( mso_sptTextChevronInvertedHandle )
 };
 
+//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[] =
 {
@@ -6456,7 +6462,7 @@ static const sal_uInt16 mso_sptTextRingOutsideSegm[] =
 };
 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, MIN_INT32, 0x7fffffff, 10800, 21600 }
 };
 static const mso_CustomShape msoTextRingOutside =
@@ -6464,7 +6470,7 @@ static const mso_CustomShape msoTextRingOutside =
     (SvxMSDffVertPair*)mso_sptTextRingOutsideVert, SAL_N_ELEMENTS( mso_sptTextRingOutsideVert ),
     (sal_uInt16*)mso_sptTextRingOutsideSegm, sizeof( mso_sptTextRingOutsideSegm ) >> 1,
     (SvxMSDffCalculationData*)mso_sptTextRingOutsideCalc, SAL_N_ELEMENTS( mso_sptTextRingOutsideCalc ),
-    (sal_Int32*)mso_sptDefault16200,
+    (sal_Int32*)mso_sptDefault13500,
     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ),
     21600, 21600,
     MIN_INT32, MIN_INT32,
-- 
cgit