INTEGRATION: CWS bm3 (1.7.8); FILE MERGED

2004/12/16 13:18:40 bm 1.7.8.2: #i32957# Formulas of circular arrow fixed according to shape in the gallery
2004/12/06 13:10:36 bm 1.7.8.1: #i38295# no filling for the two separate lines in the multidocument

1 files changed, 183 insertions, 170 deletions

diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index 43f6753a84..5680d42519 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: EnhancedCustomShapeGeometry.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: rt $ $Date: 2004-11-26 14:27:15 $
+ *  last change: $Author: vg $ $Date: 2004-12-23 11:08:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -58,7 +58,6 @@
  *
  *
  ************************************************************************/
-
 #ifndef _ENHANCEDCUSTOMSHAPEGEOMETRY_HXX
 #include "EnhancedCustomShapeGeometry.hxx"
 #endif
@@ -110,59 +109,59 @@ static const sal_Int32 mso_sptDefault0[] =
 {
     1, 0
 };
-static const sal_Int32 mso_sptDefault1400[] = 
+static const sal_Int32 mso_sptDefault1400[] =
 {
     1, 1400
 };
-static const sal_Int32 mso_sptDefault1800[] = 
+static const sal_Int32 mso_sptDefault1800[] =
 {
     1, 1800
 };
-static const sal_Int32 mso_sptDefault2500[] = 
+static const sal_Int32 mso_sptDefault2500[] =
 {
     1, 2500
 };
-static const sal_Int32 mso_sptDefault2700[] = 
+static const sal_Int32 mso_sptDefault2700[] =
 {
     1, 2700
 };
-static const sal_Int32 mso_sptDefault3600[] = 
+static const sal_Int32 mso_sptDefault3600[] =
 {
     1, 3600
 };
-static const sal_Int32 mso_sptDefault3700[] = 
+static const sal_Int32 mso_sptDefault3700[] =
 {
     1, 3700
 };
-static const sal_Int32 mso_sptDefault5400[] = 
+static const sal_Int32 mso_sptDefault5400[] =
 {
     1, 5400
 };
-static const sal_Int32 mso_sptDefault7200[] = 
+static const sal_Int32 mso_sptDefault7200[] =
 {
     1, 7200
 };
-static const sal_Int32 mso_sptDefault8100[] = 
+static const sal_Int32 mso_sptDefault8100[] =
 {
     1, 8100
 };
-static const sal_Int32 mso_sptDefault9600[] = 
+static const sal_Int32 mso_sptDefault9600[] =
 {
     1, 9600
 };
-static const sal_Int32 mso_sptDefault10800[] = 
+static const sal_Int32 mso_sptDefault10800[] =
 {
     1, 10800
 };
-static const sal_Int32 mso_sptDefault12000[] = 
+static const sal_Int32 mso_sptDefault12000[] =
 {
     1, 12000
 };
-static const sal_Int32 mso_sptDefault13500[] = 
+static const sal_Int32 mso_sptDefault13500[] =
 {
     1, 13500
 };
-static const sal_Int32 mso_sptDefault16200[] = 
+static const sal_Int32 mso_sptDefault16200[] =
 {
     1, 16200
 };
@@ -171,7 +170,7 @@ static const sal_Int32 mso_sptDefault16200and5400[] =
     2, 16200, 5400
 };
 
-static const sal_Int32 mso_sptArcDefault[] = 
+static const sal_Int32 mso_sptArcDefault[] =
 {
     2, 270, 0
 };
@@ -186,7 +185,7 @@ static const SvxMSDffHandle mso_sptArcHandle[] =
     {	MSDFF_HANDLE_FLAGS_POLAR,
         10800, 0x101, 10800, 10800, 0x80000000, 0x7fffffff, 0x80000000, 0x7fffffff }
 };
-static const mso_CustomShape msoArc = 
+static const mso_CustomShape msoArc =
 {
     NULL, 0,
     NULL, 0,
@@ -203,7 +202,7 @@ static const SvxMSDffVertPair mso_sptTextSimpleVert[] =
 {
     { 0, 0 }, { 21600, 0 }, { 21600, 21600 }, { 0, 21600 }, { 0, 0 }
 };
-static const mso_CustomShape msoTextSimple = 
+static const mso_CustomShape msoTextSimple =
 {
     (SvxMSDffVertPair*)mso_sptTextSimpleVert, sizeof( mso_sptTextSimpleVert ) / sizeof( SvxMSDffVertPair ),
     NULL, 0,
@@ -220,7 +219,7 @@ static const SvxMSDffVertPair mso_sptRectangleVert[] =
 {
     { 0, 0 }, { 21600, 0 }, { 21600, 21600 }, { 0, 21600 }, { 0, 0 }
 };
-static const mso_CustomShape msoRectangle = 
+static const mso_CustomShape msoRectangle =
 {
     (SvxMSDffVertPair*)mso_sptRectangleVert, sizeof( mso_sptRectangleVert ) / sizeof( SvxMSDffVertPair ),
     NULL, 0,
@@ -245,7 +244,7 @@ static const SvxMSDffTextRectangles mso_sptRoundRectangleTextRect[] =
 {
     { { 3 MSO_I, 4 MSO_I }, { 1 MSO_I, 2 MSO_I } }
 };
-static const mso_CustomShape msoRoundRectangle = 
+static const mso_CustomShape msoRoundRectangle =
 {
     NULL, 0,
     NULL, 0,
@@ -273,7 +272,7 @@ static const SvxMSDffVertPair mso_sptRightTriangleGluePoints[] =
 static const mso_CustomShape msoRightTriangle =
 {
     (SvxMSDffVertPair*)mso_sptRightTriangleVert, sizeof( mso_sptRightTriangleVert ) / sizeof( SvxMSDffVertPair ),
-    NULL, 0, 
+    NULL, 0,
     NULL, 0,
     NULL,
     (SvxMSDffTextRectangles*)mso_sptRightTriangleTextRect, sizeof( mso_sptRightTriangleTextRect ) / sizeof( SvxMSDffTextRectangles ),
@@ -294,7 +293,7 @@ static const SvxMSDffVertPair mso_sptEllipseGluePoints[] =
 static const mso_CustomShape msoEllipse =
 {
     NULL, 0,
-    NULL, 0, 
+    NULL, 0,
     NULL, 0,
     NULL,
     (SvxMSDffTextRectangles*)mso_sptEllipseTextRect, sizeof( mso_sptEllipseTextRect ) / sizeof( SvxMSDffTextRectangles ),
@@ -319,7 +318,7 @@ static const SvxMSDffCalculationData mso_sptParallelogramCalc[] =
     { 0x2001, DFF_Prop_adjustValue, 10, 24 },
     { 0x2000, 0x0402, 1750, 0 },
     { 0x8000, 21600, 0, 0x0403 },
-    { 0x2001, 0x400, 1, 2 }, 
+    { 0x2001, 0x400, 1, 2 },
     { 0x4000, 10800, 0x405, 0 },
     { 0x2000, 0x400, 0, 10800 },
     { 0x6006, 0x407, 0x40d, 0 },
@@ -359,7 +358,7 @@ static const SvxMSDffVertPair mso_sptDiamondVert[] =
 {
     { 10800, 0 }, { 21600, 10800 }, { 10800, 21600 }, {	0, 10800 }, { 10800, 0 }
 };
-static const SvxMSDffTextRectangles mso_sptDiamondTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptDiamondTextRect[] =
 {
     { { 5400, 5400 }, { 16200, 16200 } }
 };
@@ -569,7 +568,7 @@ static const SvxMSDffVertPair mso_sptPentagonGluePoints[] =
 static const mso_CustomShape msoPentagon =
 {
     (SvxMSDffVertPair*)mso_sptPentagonVert, sizeof( mso_sptPentagonVert ) / sizeof( SvxMSDffVertPair ),
-    NULL, 0, 
+    NULL, 0,
     NULL, 0,
     NULL,
     (SvxMSDffTextRectangles*)mso_sptPentagonTextRect, sizeof( mso_sptPentagonTextRect ) / sizeof( SvxMSDffTextRectangles ),
@@ -903,7 +902,7 @@ static const mso_CustomShape msoUpDownArrow =
     (SvxMSDffHandle*)mso_sptUpDownArrowHandle, sizeof( mso_sptUpDownArrowHandle ) / sizeof( SvxMSDffHandle )		// handles
 };
 
-static const SvxMSDffVertPair mso_sptQuadArrowVert[] =	// adjustment1: x 0 - 10800, adjustment2: x 0 - 10800	
+static const SvxMSDffVertPair mso_sptQuadArrowVert[] =	// adjustment1: x 0 - 10800, adjustment2: x 0 - 10800
 {														// adjustment3: y 0 - 10800
     { 0, 10800 }, { 0 MSO_I, 1 MSO_I }, { 0 MSO_I, 2 MSO_I }, { 2 MSO_I, 2 MSO_I },
     { 2 MSO_I, 0 MSO_I }, { 1 MSO_I, 0 MSO_I }, { 10800, 0 }, { 3 MSO_I, 0 MSO_I },
@@ -1060,7 +1059,7 @@ static const sal_uInt16 mso_sptUturnArrowSegm[] =
 {
     0x4000, 0x0001, 0x2002, 0x0004, 0x2002, 0x0001, 0x6000, 0x8000
 };
-static const SvxMSDffTextRectangles mso_sptUturnArrowTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptUturnArrowTextRect[] =
 {
     { { 0, 8280 }, { 6110, 21600 } }
 };
@@ -1546,7 +1545,7 @@ static const mso_CustomShape msoUpArrowCallout =
 static const SvxMSDffVertPair mso_sptDownArrowCalloutVert[] =
 {
     { 0, 0 MSO_I }, { 0, 0 }, { 21600, 0 }, { 21600, 0 MSO_I },
-    { 5 MSO_I, 0 MSO_I }, { 5 MSO_I, 2 MSO_I }, { 4 MSO_I, 2 MSO_I }, { 10800, 21600 }, 
+    { 5 MSO_I, 0 MSO_I }, { 5 MSO_I, 2 MSO_I }, { 4 MSO_I, 2 MSO_I }, { 10800, 21600 },
     { 1 MSO_I, 2 MSO_I }, { 3 MSO_I, 2 MSO_I }, { 3 MSO_I, 0 MSO_I }
 };
 static const sal_uInt16 mso_sptDownArrowCalloutSegm[] =
@@ -1756,9 +1755,16 @@ static const mso_CustomShape msoQuadArrowCallout =
 
 static const SvxMSDffVertPair mso_sptCircularArrowVert[] =
 {
-    { 3 MSO_I, 3 MSO_I }, { 20 MSO_I, 20 MSO_I }, { 19 MSO_I, 18 MSO_I }, { 17 MSO_I, 16 MSO_I },
-    { 0, 0 }, { 21600, 21600 }, { 9 MSO_I, 8 MSO_I }, { 11 MSO_I, 10 MSO_I },
-    { 24 MSO_I, 23 MSO_I }, { 40 MSO_I, 39 MSO_I }, { 29 MSO_I, 28 MSO_I }
+    { 0x03 MSO_I, 0x03 MSO_I },
+    { 0x14 MSO_I, 0x14 MSO_I },
+    { 0x13 MSO_I, 0x12 MSO_I },
+    { 0x11 MSO_I, 0x10 MSO_I },
+    { 0, 0 }, { 21600, 21600 },
+    { 0x09 MSO_I, 0x08 MSO_I },
+    { 0x0B MSO_I, 0x0A MSO_I },
+    { 0x18 MSO_I, 0x17 MSO_I },
+    { 0x2F MSO_I, 0x2E MSO_I },
+    { 0x1D MSO_I, 0x1C MSO_I }
 };
 static const sal_uInt16 mso_sptCircularArrowSegm[] =
 {
@@ -1766,47 +1772,54 @@ static const sal_uInt16 mso_sptCircularArrowSegm[] =
 };
 static const SvxMSDffCalculationData mso_sptCircularArrowCalc[] =
 {
-    { 0x2000, DFF_Prop_adjustValue, 0, 0 },			// 0
-    { 0x2000, DFF_Prop_adjust2Value, 0, 0 },		// 1
-    { 0x2000, DFF_Prop_adjust3Value, 0, 0 },		// 2
-    { 0x8000, 10800, 0,DFF_Prop_adjust3Value },		// 3
-    { 0x4009, 10800, DFF_Prop_adjustValue, 0 },		// 4
-    { 0x400a, 10800, DFF_Prop_adjustValue, 0 },		// 5
-    { 0x4009, 10800, DFF_Prop_adjust2Value, 0 },	// 6
-    { 0x400a, 10800, DFF_Prop_adjust2Value, 0 },	// 7
-    { 0x2000, 0x0404, 10800, 0 },					// 8
-    { 0x2000, 0x0405, 10800, 0 },					// 9
-    { 0x2000, 0x0406, 10800, 0 },					// 10
-    { 0x2000, 0x0407, 10800, 0 },					// 11
-    { 0x6009, 0x0403, DFF_Prop_adjustValue, 0 },	// 12
-    { 0x600a, 0x0403, DFF_Prop_adjustValue, 0 },	// 13
-    { 0x6009, 0x0403, DFF_Prop_adjust2Value, 0 },	// 14
-    { 0x600a, 0x0403, DFF_Prop_adjust2Value, 0 },	// 15
-    { 0x2000, 0x040c, 10800, 0 },					// 16
-    { 0x2000, 0x040d, 10800, 0 },					// 17
-    { 0x2000, 0x040e, 10800, 0 },					// 18
-    { 0x2000, 0x040f, 10800, 0 },					// 19
-    { 0x8000, 21600, 0, 0x0403 },					// 20
-    { 0x4009, 12600, DFF_Prop_adjust2Value, 0 },	// 21
-    { 0x400a, 12600, DFF_Prop_adjust2Value, 0 },	// 22
-    { 0x2000, 0x0415, 10800, 0 },					// 23
-    { 0x2000, 0x0416, 10800, 0 },					// 24
-    { 0x2000, DFF_Prop_adjust3Value, 0, 1800 },		// 25
-    { 0x6009, 0x0419, DFF_Prop_adjust2Value, 0 },	// 26
-    { 0x600a, 0x0419, DFF_Prop_adjust2Value, 0 },	// 27
-    { 0x2000, 0x041a, 10800, 0 },					// 28
-    { 0x2000, 0x041b, 10800, 0 },					// 29
-    { 0x2001, 0x0403, 1, 2 },						// 30
-    { 0x8000, 10800, 0, 0x041e },					// 31
-    { 0x4001, 35,	0x0403, 10800 },				// 32
-    { 0x2000, 0x0420, 10, 0 },						// 33
-    { 0x2001, 0x0421, 256, 1 },						// 34
-    { 0x2001, 0x0422, 256, 1 },						// 35
-    { 0x6000, 0x0423, DFF_Prop_adjust2Value, 0 },	// 36
-    { 0x6009, 0x041f, 0x0424, 0 },					// 37
-    { 0x600a, 0x041f, 0x0424, 0 },					// 38
-    { 0x2000, 0x0425, 10800, 0 },					// 39
-    { 0x2000, 0x0426, 10800, 0 }					// 40
+    { 0x2000, 0x0147, 0x0000, 0x0000 },
+    { 0x2000, 0x0148, 0x0000, 0x0000 },
+    { 0x2000, 0x0149, 0x0000, 0x0000 },
+    { 0x4000, 0x2A30, 0x0149, 0x0000 },
+    { 0x4009, 0x2A30, 0x0147, 0x0000 },
+    { 0x400A, 0x2A30, 0x0147, 0x0000 },
+    { 0x4009, 0x2A30, 0x0148, 0x0000 },
+    { 0x400A, 0x2A30, 0x0148, 0x0000 },
+    { 0x2000, 0x0404, 0x2A30, 0x0000 },
+    { 0x2000, 0x0405, 0x2A30, 0x0000 },
+    { 0x2000, 0x0406, 0x2A30, 0x0000 },
+    { 0x2000, 0x0407, 0x2A30, 0x0000 },
+    { 0x6009, 0x0403, 0x0147, 0x0000 },
+    { 0x600A, 0x0403, 0x0147, 0x0000 },
+    { 0x6009, 0x0403, 0x0148, 0x0000 },
+    { 0x600A, 0x0403, 0x0148, 0x0000 },
+    { 0x2000, 0x040C, 0x2A30, 0x0000 },
+    { 0x2000, 0x040D, 0x2A30, 0x0000 },
+    { 0x2000, 0x040E, 0x2A30, 0x0000 },
+    { 0x2000, 0x040F, 0x2A30, 0x0000 },
+    { 0x8000, 0x5460, 0x0000, 0x0403 },
+    { 0x4009, 0x34BC, 0x0148, 0x0000 },
+    { 0x400A, 0x34BC, 0x0148, 0x0000 },
+    { 0x2000, 0x0415, 0x2A30, 0x0000 },
+    { 0x2000, 0x0416, 0x2A30, 0x0000 },
+    { 0x2000, 0x0149, 0x0000, 0x0A8C },
+    { 0x6009, 0x0419, 0x0148, 0x0000 },
+    { 0x600A, 0x0419, 0x0148, 0x0000 },
+    { 0x2000, 0x041A, 0x2A30, 0x0000 },
+    { 0x2000, 0x041B, 0x2A30, 0x0000 },
+    { 0xA000, 0x041D, 0x0000, 0x0418 },
+    { 0xA000, 0x041D, 0x0000, 0x0418 },
+    { 0x6001, 0x041E, 0x041F, 0x0001 },
+    { 0xA000, 0x041C, 0x0000, 0x0417 },
+    { 0xA000, 0x041C, 0x0000, 0x0417 },
+    { 0x6001, 0x0421, 0x0422, 0x0001 },
+    { 0x6000, 0x0420, 0x0423, 0x0000 },
+    { 0x200D, 0x0424, 0x0000, 0x0000 },
+    { 0x200E, 0x0148, 0x002D, 0x0000 },
+    { 0x6009, 0x0425, 0x0426, 0x0000 },
+    { 0x200E, 0x0148, 0x002D, 0x0000 },
+    { 0x600A, 0x0425, 0x0428, 0x0000 },
+    { 0x000E, 0x0000, 0x002D, 0x0000 },
+    { 0x6009, 0x0427, 0x042A, 0x0000 },
+    { 0x000E, 0x0000, 0x002D, 0x0000 },
+    { 0x6009, 0x0429, 0x042C, 0x0000 },
+    { 0x6000, 0x041C, 0x042B, 0x0000 },
+    { 0x6000, 0x041D, 0x042D, 0x0000 }
 };
 static const sal_Int32 mso_sptCircularArrowDefault[] =
 {
@@ -1819,9 +1832,9 @@ static const SvxMSDffTextRectangles mso_sptCircularArrowTextRect[] =	// todo
 static const SvxMSDffHandle mso_sptCircularArrowHandle[] =
 {
     {	MSDFF_HANDLE_FLAGS_POLAR | MSDFF_HANDLE_FLAGS_RADIUS_RANGE,
-        10800, 0x100, 10800, 10800, 10800, 10800, 0x80000000, 0x7fffffff },
+        10800, 0x100, 10800, 10800, 10800, 10800, 0xff4c0000, 0x00b40000 },
     {	MSDFF_HANDLE_FLAGS_POLAR | MSDFF_HANDLE_FLAGS_RADIUS_RANGE,
-        0x102, 0x101, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
+        0x102, 0x101, 10800, 10800, 0, 10800, 0xff4c0000, 0x00b40000 }
 };
 static const mso_CustomShape msoCircularArrow =
 {
@@ -2099,7 +2112,7 @@ static const SvxMSDffCalculationData mso_sptActionButtonHomeCalc[] =	// adj valu
     { 0x6000, 0x0421, 0x0407, 0 },	// 22
     { 0x4001, 4020, 0x0406, 1 },	// 23
     { 0x6000, 0x0423, 0x0408, 0 }	// 24
-    
+
 };
 static const mso_CustomShape msoActionButtonHome =
 {
@@ -2319,7 +2332,7 @@ static const SvxMSDffVertPair mso_sptActionButtonBackPreviousVert[] =
     { 21600, 0 }, { 21600, 21600 }, { 3 MSO_I, 4 MSO_I }, { 3 MSO_I, 2 MSO_I },
     { 21600, 21600 }, { 0, 21600 }, { 1 MSO_I, 4 MSO_I }, { 3 MSO_I,4 MSO_I },
     { 0, 21600 }, { 0, 0 }, { 1 MSO_I, 2 MSO_I }, { 1 MSO_I, 4 MSO_I },
-    
+
     { 0xa MSO_I, 8 MSO_I }, { 0xe MSO_I, 0xc MSO_I }, { 0xe MSO_I, 0x10 MSO_I }
 };
 static const sal_uInt16 mso_sptActionButtonForwardBackSegm[] =
@@ -2328,7 +2341,7 @@ static const sal_uInt16 mso_sptActionButtonForwardBackSegm[] =
     0x4000, 0x0003, 0x6001, 0x8000,
     0x4000, 0x0003, 0x6001, 0x8000,
     0x4000, 0x0003, 0x6001, 0x8000,
-    0x4000, 0x0003, 0x6001, 0x8000,	
+    0x4000, 0x0003, 0x6001, 0x8000,
     0x4000, 0x0002, 0x6001, 0x8000
 };
 static const SvxMSDffCalculationData mso_sptActionButtonForwardBackCalc[] =	// adj value 0 - 5400
@@ -2395,7 +2408,7 @@ static const SvxMSDffVertPair mso_sptActionButtonBeginningVert[] =
     { 21600, 0 }, { 21600, 21600 }, { 3 MSO_I, 4 MSO_I }, { 3 MSO_I, 2 MSO_I },
     { 21600, 21600 }, { 0, 21600 }, { 1 MSO_I, 4 MSO_I }, { 3 MSO_I, 4 MSO_I },
     { 0, 21600 }, { 0, 0 }, { 1 MSO_I, 2 MSO_I }, { 1 MSO_I, 4 MSO_I },
-    
+
     { 0xa MSO_I, 8 MSO_I }, { 0xe MSO_I, 0xc MSO_I }, { 0xe MSO_I, 0x10 MSO_I }, { 0x12 MSO_I, 0xc MSO_I },
     { 0x14 MSO_I, 0xc MSO_I }, { 0x14 MSO_I, 0x10 MSO_I }, { 0x12 MSO_I, 0x10 MSO_I }
 };
@@ -2405,7 +2418,7 @@ static const sal_uInt16 mso_sptActionButtonBeginningEndSegm[] =
     0x4000, 0x0003, 0x6001, 0x8000,
     0x4000, 0x0003, 0x6001, 0x8000,
     0x4000, 0x0003, 0x6001, 0x8000,
-    0x4000, 0x0003, 0x6001, 0x8000,	
+    0x4000, 0x0003, 0x6001, 0x8000,
 
     0x4000, 0x0002, 0x6001, 0x8000,
     0x4000, 0x0003, 0x6001, 0x8000
@@ -2436,7 +2449,7 @@ static const SvxMSDffCalculationData mso_sptActionButtonBeginningEndCalc[] =	//
     { 0x4001, -6140, 0x0406, 1 },	// 13
     { 0x6000, 0x0413, 0x0407, 0 },	// 14
 
-    
+
     { 0x4001, 4020, 0x0406, 1 },	// 15
     { 0x6000, 0x0415, 0x0407, 0 },	// 16
     { 0x4001, 6140, 0x0406, 1 },	// 17
@@ -2462,7 +2475,7 @@ static const SvxMSDffVertPair mso_sptActionButtonEndVert[] =
     { 21600, 0 }, { 21600, 21600 },	{ 3 MSO_I, 4 MSO_I }, { 3 MSO_I, 2 MSO_I },
     { 21600, 21600 }, { 0, 21600 }, { 1 MSO_I, 4 MSO_I }, { 3 MSO_I, 4 MSO_I },
     { 0, 21600 }, { 0, 0 },	{ 1 MSO_I, 2 MSO_I }, { 1 MSO_I, 4 MSO_I },
-    
+
     { 0x16 MSO_I, 8 MSO_I }, { 0x12 MSO_I, 0x10 MSO_I }, { 0x12 MSO_I, 0xc MSO_I },
 
     { 0x18 MSO_I, 0xc MSO_I }, { 0x18 MSO_I, 0x10 MSO_I }, { 0xe MSO_I, 0x10 MSO_I }, { 0xe MSO_I, 0xc MSO_I }
@@ -2885,8 +2898,8 @@ static const SvxMSDffCalculationData mso_sptNoSmokingCalc[] =
     { 0x2000, DFF_Prop_adjustValue, 0, 0 },			// 0
     { 0x8000, 21600, 0, DFF_Prop_adjustValue },		// 1
     { 0x8000, 10800, 0, DFF_Prop_adjustValue },		// 2
-    { 0x2001, DFF_Prop_adjustValue, 1, 2 },			// 3		
-    { 0xa080, 0x403, 0, 0x402 },					// 4	
+    { 0x2001, DFF_Prop_adjustValue, 1, 2 },			// 3
+    { 0xa080, 0x403, 0, 0x402 },					// 4
     { 0x8000, 10800, 0, 0x403 },					// 5 x1
     { 0x4000, 10800, 0x403, 0 },					// 6 x2
     { 0x8000, 10800, 0, 0x404 },					// 7 y1
@@ -2948,7 +2961,7 @@ static const SvxMSDffHandle mso_sptBlockArcHandle[] =
     {	MSDFF_HANDLE_FLAGS_POLAR | MSDFF_HANDLE_FLAGS_RADIUS_RANGE,
         0x101, 0x100, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
 };
-static const mso_CustomShape msoBlockArc = 
+static const mso_CustomShape msoBlockArc =
 {
     (SvxMSDffVertPair*)mso_sptBlockArcVert, sizeof( mso_sptBlockArcVert ) / sizeof( SvxMSDffVertPair ),
     (sal_uInt16*)mso_sptBlockArcSegm, sizeof( mso_sptBlockArcSegm ) >> 1,
@@ -2961,7 +2974,7 @@ static const mso_CustomShape msoBlockArc =
     (SvxMSDffHandle*)mso_sptBlockArcHandle, sizeof( mso_sptBlockArcHandle ) / sizeof( SvxMSDffHandle )		// handles
 };
 
-// aware : control points are always part of the bounding box 
+// aware : control points are always part of the bounding box
 static const SvxMSDffVertPair mso_sptHeartVert[] =
 {
     { 10800, 21599 }, { 321, 6886 }, { 70, 6036 },		// ppp
@@ -3010,13 +3023,13 @@ static const SvxMSDffTextRectangles mso_sptHeartTextRect[] =
 };
 static const SvxMSDffVertPair mso_sptHeartGluePoints[] =
 {
-    { 10800, 2180 }, { 3090, 10800 }, { 10800, 21600 }, { 18490, 10800 } 
+    { 10800, 2180 }, { 3090, 10800 }, { 10800, 21600 }, { 18490, 10800 }
 };
 static const sal_Int32 mso_sptHeartBoundRect[] =
 {
     -9, 0, 21606, 21602
 };
-static const mso_CustomShape msoHeart = 
+static const mso_CustomShape msoHeart =
 {
     (SvxMSDffVertPair*)mso_sptHeartVert, sizeof( mso_sptHeartVert ) / sizeof( SvxMSDffVertPair ),
     (sal_uInt16*)mso_sptHeartSegm, sizeof( mso_sptHeartSegm ) >> 1,
@@ -3044,7 +3057,7 @@ static const SvxMSDffVertPair mso_sptLightningBoldGluePoints[] =
     { 8458, 0 }, { 0, 3923 }, { 4993, 9720 }, { 9987, 14934 }, { 21600, 21600 },
     { 16558, 12016 }, { 12831, 6120 }
 };
-static const mso_CustomShape msoLightningBold = 
+static const mso_CustomShape msoLightningBold =
 {
     (SvxMSDffVertPair*)mso_sptLightningBoldVert, sizeof( mso_sptLightningBoldVert ) / sizeof( SvxMSDffVertPair ),
     NULL, 0,
@@ -3150,7 +3163,7 @@ static const SvxMSDffHandle mso_sptSunHandle[] =
     {	MSDFF_HANDLE_FLAGS_RANGE,
         0x100, 10800, 10800, 10800, 2700, 10125, 0x80000000, 0x7fffffff }
 };
-static const mso_CustomShape msoSun = 
+static const mso_CustomShape msoSun =
 {
     (SvxMSDffVertPair*)mso_sptSunVert, sizeof( mso_sptSunVert ) / sizeof( SvxMSDffVertPair ),
     (sal_uInt16*)mso_sptSunSegm, sizeof( mso_sptSunSegm ) >> 1,
@@ -3184,7 +3197,7 @@ static const SvxMSDffCalculationData mso_sptMoonCalc[] =
     { 0x2001, DFF_Prop_adjustValue, 1794, 10000 },
     { 0x8000, 21600, 0, 0x0404 },
     { 0x2001, DFF_Prop_adjustValue, 400, 18900 },
-    { 0x8081, 0, 10800, 0x406 },		
+    { 0x8081, 0, 10800, 0x406 },
     { 0x8082, 0, 10800, 0x406 },
     { 0x6000, 0x407, 0x407, 0 },
     { 0x8000, 21600, 0, 0x408 }
@@ -3202,7 +3215,7 @@ static const SvxMSDffHandle mso_sptMoonHandle[] =
     {	MSDFF_HANDLE_FLAGS_RANGE,
         0x100, 10800, 10800, 10800, 0, 18900, 0x80000000, 0x7fffffff }
 };
-static const mso_CustomShape msoMoon = 
+static const mso_CustomShape msoMoon =
 {
     (SvxMSDffVertPair*)mso_sptMoonVert, sizeof( mso_sptMoonVert ) / sizeof( SvxMSDffVertPair ),
     (sal_uInt16*)mso_sptMoonSegm, sizeof( mso_sptMoonSegm ) >> 1,
@@ -3255,7 +3268,7 @@ static const SvxMSDffHandle mso_sptBracketPairHandle[] =
     {	MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_SWITCHED,
         0x100, 0, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
 };
-static const mso_CustomShape msoBracketPair = 
+static const mso_CustomShape msoBracketPair =
 {
     (SvxMSDffVertPair*)mso_sptBracketPairVert, sizeof( mso_sptBracketPairVert ) / sizeof( SvxMSDffVertPair ),
     (sal_uInt16*)mso_sptBracketPairSegm, sizeof( mso_sptBracketPairSegm ) >> 1,
@@ -3281,7 +3294,7 @@ static const SvxMSDffHandle mso_sptPlaqueHandle[] =
     {	MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_SWITCHED,
         0x100, 0, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
 };
-static const mso_CustomShape msoPlaque = 
+static const mso_CustomShape msoPlaque =
 {
     (SvxMSDffVertPair*)mso_sptBracketPairVert, sizeof( mso_sptBracketPairVert ) / sizeof( SvxMSDffVertPair ),
     (sal_uInt16*)mso_sptPlaqueSegm, sizeof( mso_sptPlaqueSegm ) >> 1,
@@ -3316,7 +3329,7 @@ static const SvxMSDffCalculationData mso_sptBracePairCalc[] =
     { 0x2001, DFF_Prop_adjustValue, 2, 1 },						//  5
     { 0x8000, 10800, 0, DFF_Prop_adjustValue },					//  6
     { 0x8000, 21600, 0, 0x406 },								//  7
-    { 0xa000, DFF_Prop_geoRight, 0, 0x405 },					//  8 
+    { 0xa000, DFF_Prop_geoRight, 0, 0x405 },					//  8
     { 0x2001, DFF_Prop_adjustValue, 1, 3 },						//  9
     { 0x6000, 0x409, DFF_Prop_adjustValue, 0 },					// xa
     { 0x6000, DFF_Prop_geoLeft, 0x40a, 0 },						// xb
@@ -3334,7 +3347,7 @@ static const SvxMSDffHandle mso_sptBracePairHandle[] =
     {	MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_SWITCHED,
         0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 5400 }
 };
-static const mso_CustomShape msoBracePair = 
+static const mso_CustomShape msoBracePair =
 {
     (SvxMSDffVertPair*)mso_sptBracePairVert, sizeof( mso_sptBracePairVert ) / sizeof( SvxMSDffVertPair ),
     (sal_uInt16*)mso_sptBracePairSegm, sizeof( mso_sptBracePairSegm ) >> 1,
@@ -3428,7 +3441,7 @@ static const SvxMSDffCalculationData mso_sptBraceCalc[] =
     { 0xa000, 0x404, 0, 0x400 },
     { 0x2000, DFF_Prop_adjust2Value, 0, 0 },
     { 0x6000, 0x404, 0x400, 0 },
-    { 0x6000, 0x404, DFF_Prop_adjustValue, 0 },	
+    { 0x6000, 0x404, DFF_Prop_adjustValue, 0 },
     { 0x8000, 21600, 0, DFF_Prop_adjustValue },
     { 0x8000, 21600, 0, 0x400 },
     { 0x2001, DFF_Prop_adjustValue, 10000, 31953 },
@@ -3529,7 +3542,7 @@ static const SvxMSDffVertPair mso_sptIrregularSeal1GluePoints[] =
 static const mso_CustomShape msoIrregularSeal1 =
 {
     (SvxMSDffVertPair*)mso_sptIrregularSeal1Vert, sizeof( mso_sptIrregularSeal1Vert ) / sizeof( SvxMSDffVertPair ),
-    NULL, 0, 
+    NULL, 0,
     NULL, 0,
     NULL,
     (SvxMSDffTextRectangles*)mso_sptIrregularSeal1TextRect, sizeof( mso_sptIrregularSeal1TextRect ) / sizeof( SvxMSDffTextRectangles ),
@@ -3561,7 +3574,7 @@ static const SvxMSDffVertPair mso_sptIrregularSeal2GluePoints[] =
 static const mso_CustomShape msoIrregularSeal2 =
 {
     (SvxMSDffVertPair*)mso_sptIrregularSeal2Vert, sizeof( mso_sptIrregularSeal2Vert ) / sizeof( SvxMSDffVertPair ),
-    NULL, 0, 
+    NULL, 0,
     NULL, 0,
     NULL,
     (SvxMSDffTextRectangles*)mso_sptIrregularSeal2TextRect, sizeof( mso_sptIrregularSeal2TextRect ) / sizeof( SvxMSDffTextRectangles ),
@@ -3620,7 +3633,7 @@ static const SvxMSDffTextRectangles mso_sptStarTextRect[] =
 static const mso_CustomShape msoStar =
 {
     (SvxMSDffVertPair*)mso_sptStarVert, sizeof( mso_sptStarVert ) / sizeof( SvxMSDffVertPair ),
-    NULL, 0, 
+    NULL, 0,
     NULL, 0,
     NULL,
     (SvxMSDffTextRectangles*)mso_sptStarTextRect, sizeof( mso_sptStarTextRect ) / sizeof( SvxMSDffTextRectangles ),
@@ -3746,7 +3759,7 @@ static const SvxMSDffTextRectangles mso_sptSealTextRect[] =
 {
     { { 1 MSO_I, 2 MSO_I }, { 3 MSO_I, 4 MSO_I } }
 };
-static const mso_CustomShape msoSeal8 = 
+static const mso_CustomShape msoSeal8 =
 {
     (SvxMSDffVertPair*)mso_sptSeal8Vert, sizeof( mso_sptSeal8Vert ) / sizeof( SvxMSDffVertPair ),
     NULL, 0,
@@ -3842,7 +3855,7 @@ static const SvxMSDffCalculationData mso_sptSeal16Calc[] =
     { 0x2081, 0x400, 10800, 348 },
     { 0x2082, 0x400, 10800, 348 }
 };
-static const mso_CustomShape msoSeal16 = 
+static const mso_CustomShape msoSeal16 =
 {
     (SvxMSDffVertPair*)mso_sptSeal16Vert, sizeof( mso_sptSeal16Vert ) / sizeof( SvxMSDffVertPair ),
     NULL, 0,
@@ -3870,7 +3883,7 @@ static const SvxMSDffVertPair mso_sptSeal24Vert[] =
     { 0x5d MSO_I, 0x5e MSO_I }, { 0x5f MSO_I, 0x60 MSO_I }, { 0x61 MSO_I, 0x62 MSO_I }, { 0x63 MSO_I, 0x64 MSO_I },
     { 0x05 MSO_I, 0x06 MSO_I }
 };
-static const mso_CustomShape msoSeal24 = 
+static const mso_CustomShape msoSeal24 =
 {
     (SvxMSDffVertPair*)mso_sptSeal24Vert, sizeof( mso_sptSeal24Vert ) / sizeof( SvxMSDffVertPair ),
     NULL, 0,
@@ -4038,7 +4051,7 @@ static const SvxMSDffVertPair mso_sptSeal32Vert[] =
     { 0x7d MSO_I, 0x7e MSO_I }, { 0x7f MSO_I, 0x80 MSO_I }, { 0x81 MSO_I, 0x82 MSO_I }, { 0x83 MSO_I, 0x84 MSO_I },
     { 0x05 MSO_I, 0x06 MSO_I }
 };
-static const mso_CustomShape msoSeal32 = 
+static const mso_CustomShape msoSeal32 =
 {
     (SvxMSDffVertPair*)mso_sptSeal32Vert, sizeof( mso_sptSeal32Vert ) / sizeof( SvxMSDffVertPair ),
     NULL, 0,
@@ -4297,7 +4310,7 @@ static const SvxMSDffCalculationData mso_sptFlowChartAlternateProcessCalc[] =
     { 0x2000, DFF_Prop_geoTop, 800, 0 },
     { 0x2000, DFF_Prop_geoBottom,0, 800 }
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartAlternateProcessTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartAlternateProcessTextRect[] =
 {
     { { 4 MSO_I, 6 MSO_I }, { 5 MSO_I, 7 MSO_I } }
 };
@@ -4318,7 +4331,7 @@ static const SvxMSDffVertPair mso_sptFlowChartDecisionVert[] =
 {
     { 0, 10800 }, { 10800, 0 }, { 21600, 10800 }, { 10800, 21600 }, { 0, 10800 }
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartDecisionTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartDecisionTextRect[] =
 {
     { { 5400, 5400 }, { 16200, 16200 } }
 };
@@ -4339,7 +4352,7 @@ static const SvxMSDffVertPair mso_sptFlowChartInputOutputVert[] =
 {
     { 4230, 0 }, { 21600, 0 }, { 17370, 21600 }, { 0, 21600 }, { 4230, 0 }
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartInputOutputTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartInputOutputTextRect[] =
 {
     { { 4230, 0 }, { 17370, 21600 } }
 };
@@ -4374,7 +4387,7 @@ static const sal_uInt16 mso_sptFlowChartPredefinedProcessSegm[] =
     0x4000, 0x0001, 0x8000,
     0x4000, 0x0001, 0x8000
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartPredefinedProcessTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartPredefinedProcessTextRect[] =
 {
     { { 2540, 0 }, { 21600 - 2540, 21600 } }
 };
@@ -4405,7 +4418,7 @@ static const sal_uInt16 mso_sptFlowChartInternalStorageSegm[] =
     0x4000, 0x0001, 0x8000,
     0x4000, 0x0001, 0x8000
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartInternalStorageTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartInternalStorageTextRect[] =
 {
     { { 4230, 4230 }, { 21600, 21600 } }
 };
@@ -4432,7 +4445,7 @@ static const sal_uInt16 mso_sptFlowChartDocumentSegm[] =
 {
     0x4000, 0x0002, 0x2002, 0x6000, 0x8000
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartDocumentTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartDocumentTextRect[] =
 {
     { { 0, 0 }, { 21600, 17360 } }
 };
@@ -4468,10 +4481,10 @@ static const SvxMSDffVertPair mso_sptFlowChartMultidocumentVert[] =
 static const sal_uInt16 mso_sptFlowChartMultidocumentSegm[] =
 {
     0x4000, 0x000a, 0x2002, 0x6000, 0x8000,
-    0x4000, 0x0002, 0x8000,
-    0x4000, 0x0002, 0x8000
+    0x4000, 0xaa00, 0x0002, 0x8000,			// NO FILL
+    0x4000, 0xaa00, 0x0002, 0x8000			// NO FILL
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartMultidocumentTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartMultidocumentTextRect[] =
 {
     { { 0, 3600 }, { 21600 - 3000, 14409 + 3600 } }
 };
@@ -4501,7 +4514,7 @@ static const sal_uInt16 mso_sptFlowChartTerminatorSegm[] =
 {
     0x4000, 0xa702, 0x0001, 0xa702, 0x6000, 0x8000
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartTerminatorTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartTerminatorTextRect[] =
 {
     { { 1060, 3180 }, { 20540, 18420 } }
 };
@@ -4523,7 +4536,7 @@ static const SvxMSDffVertPair mso_sptFlowChartPreparationVert[] =
     { 4350, 0 }, { 17250, 0 }, { 21600, 10800 }, { 17250, 21600 },
     { 4350, 21600 }, { 0, 10800 }, { 4350, 0 }
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartPreparationTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartPreparationTextRect[] =
 {
     { { 4350, 0 }, { 17250, 21600 } }
 };
@@ -4544,7 +4557,7 @@ static const SvxMSDffVertPair mso_sptFlowChartManualInputVert[] =
 {
     { 0, 4300 }, { 21600, 0 }, { 21600, 21600 }, { 0, 21600 }, { 0, 4300 }
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartManualInputTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartManualInputTextRect[] =
 {
     { { 0, 4300 }, { 21600, 21600 } }
 };
@@ -4569,7 +4582,7 @@ static const SvxMSDffVertPair mso_sptFlowChartManualOperationVert[] =
 {
     { 0, 0 }, { 21600, 0 }, { 17250, 21600 }, { 4350, 21600 }, { 0, 0 }
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartManualOperationTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartManualOperationTextRect[] =
 {
     { { 4350, 0 }, { 17250, 21600 } }
 };
@@ -4598,7 +4611,7 @@ static const sal_uInt16 mso_sptFlowChartConnectorSegm[] =
 {
     0xa203, 0x6000, 0x8000
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartConnectorTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartConnectorTextRect[] =
 {
     { { 3180, 3180 }, { 18420, 18420 } }
 };
@@ -4620,7 +4633,7 @@ static const SvxMSDffVertPair mso_sptFlowChartOffpageConnectorVert[] =
     { 0, 0 }, { 21600, 0 }, { 21600, 17150 }, { 10800, 21600 },
     { 0, 17150 }, { 0, 0 }
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartOffpageConnectorTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartOffpageConnectorTextRect[] =
 {
     { { 0, 0 }, { 21600, 17150 } }
 };
@@ -4642,7 +4655,7 @@ static const SvxMSDffVertPair mso_sptFlowChartPunchedCardVert[] =
     { 4300, 0 }, { 21600, 0 }, { 21600, 21600 }, { 0, 21600 },
     { 0, 4300 }, { 4300, 0 }
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartPunchedCardTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartPunchedCardTextRect[] =
 {
     { { 0, 4300 }, { 21600, 21600 } }
 };
@@ -4676,7 +4689,7 @@ static const sal_uInt16 mso_sptFlowChartPunchedTapeSegm[] =
 {
     0x4000, 0x2004, 0x0001, 0x2004, 0x6000, 0x8000
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartPunchedTapeTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartPunchedTapeTextRect[] =
 {
     { { 0, 4360 }, { 21600, 17240 } }
 };
@@ -4713,7 +4726,7 @@ static const sal_uInt16 mso_sptFlowChartSummingJunctionSegm[] =
     0x4000, 0x0001, 0x8000,
     0x4000, 0x0001, 0x8000
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartSummingJunctionTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartSummingJunctionTextRect[] =
 {
     { { 3100, 3100 }, { 18500, 18500 } }
 };
@@ -4744,7 +4757,7 @@ static const sal_uInt16 mso_sptFlowChartOrSegm[] =
     0x4000, 0x0001, 0x8000,
     0x4000, 0x0001, 0x8000
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartOrTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartOrTextRect[] =
 {
     { { 3100, 3100 }, { 18500, 18500 } }
 };
@@ -4765,7 +4778,7 @@ static const SvxMSDffVertPair mso_sptFlowChartCollateVert[] =
 {
     { 0, 0 }, { 21600, 21600 }, { 0, 21600 }, { 21600, 0 }, { 0, 0 }
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartCollateTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartCollateTextRect[] =
 {
     { { 5400, 5400 }, { 16200, 16200 } }
 };
@@ -4797,7 +4810,7 @@ static const sal_uInt16 mso_sptFlowChartSortSegm[] =
     0x4000, 0x0003, 0x6000, 0x8000,
     0x4000, 0x0001, 0x8000
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartSortTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartSortTextRect[] =
 {
     { { 5400, 5400 }, { 16200, 16200 } }
 };
@@ -4818,7 +4831,7 @@ static const SvxMSDffVertPair mso_sptFlowChartExtractVert[] =
 {
     { 10800, 0 }, { 21600, 21600 }, { 0, 21600 }, { 10800, 0 }
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartExtractTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartExtractTextRect[] =
 {
     { { 5400, 10800 }, { 16200, 21600 } }
 };
@@ -4843,7 +4856,7 @@ static const SvxMSDffVertPair mso_sptFlowChartMergeVert[] =
 {
     { 0, 0 }, { 21600, 0 }, { 10800, 21600 }, { 0, 0 }
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartMergeTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartMergeTextRect[] =
 {
     { { 5400, 0 }, { 16200, 10800 } }
 };
@@ -4869,7 +4882,7 @@ static const sal_uInt16 mso_sptFlowChartOnlineStorageSegm[] =
 {
     0x4000, 0xa702, 0x0001, 0xa702, 0x6000, 0x8000
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartOnlineStorageTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartOnlineStorageTextRect[] =
 {
     { { 3600, 0 }, { 18000, 21600 } }
 };
@@ -4899,7 +4912,7 @@ static const sal_uInt16 mso_sptFlowChartDelaySegm[] =
 {
     0x4000, 0xa702, 0x0002, 0x6000, 0x8000
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartDelayTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartDelayTextRect[] =
 {
     { { 0, 3100 }, { 18500, 18500 } }
 };
@@ -4928,7 +4941,7 @@ static const sal_uInt16 mso_sptFlowChartMagneticTapeSegm[] =
 {
     0x4000, 0x0002, 0x2004, 0x6000, 0x8000
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartMagneticTapeTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartMagneticTapeTextRect[] =
 {
     { { 3100, 3100 }, { 18500, 18500 } }
 };
@@ -4957,7 +4970,7 @@ static const sal_uInt16 mso_sptFlowChartMagneticDiskSegm[] =
     0x4000, 0xa802, 0x0001, 0xa802, 0x6000, 0x8000,
     0x4000, 0xa802, 0x8000
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartMagneticDiskTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartMagneticDiskTextRect[] =
 {
     { { 0, 6800 }, { 21600, 18200 } }
 };
@@ -4990,7 +5003,7 @@ static const sal_uInt16 mso_sptFlowChartMagneticDrumSegm[] =
     0x4000, 0xa702, 0x0001, 0xa702, 0x6000, 0x8000,
     0x4000, 0xa702, 0x8000
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartMagneticDrumTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartMagneticDrumTextRect[] =
 {
     { { 3400, 0 }, { 14800, 21600 } }
 };
@@ -5020,7 +5033,7 @@ static const sal_uInt16 mso_sptFlowChartDisplaySegm[] =
 {
     0x4000, 0x0001, 0xa702, 0x0002, 0x6000, 0x8000
 };
-static const SvxMSDffTextRectangles mso_sptFlowChartDisplayTextRect[] = 
+static const SvxMSDffTextRectangles mso_sptFlowChartDisplayTextRect[] =
 {
     { { 3600, 0 }, { 17800, 21600 } }
 };
@@ -5092,7 +5105,7 @@ static const SvxMSDffCalculationData mso_sptWedgeRectCalloutCalc[] =
     { 0x6006, 0x41f, 0x423, -1 },					//0x422
     { 0xa006, 0x401, -1, 0x416 },
     { 0xa006, DFF_Prop_adjust2Value, -1, 0x425 },	//0x424
-    { 0x6006, 0x400, 0x41c, -1 },	
+    { 0x6006, 0x400, 0x41c, -1 },
     { 0xa006, DFF_Prop_adjust2Value, -1, 0x427 },	//0x426
     { 0xa006, 0x400, -1, 0x41c },
     { 0x2000, DFF_Prop_adjustValue, 0, 0 },			//0x428
@@ -5112,7 +5125,7 @@ static const SvxMSDffVertPair mso_sptWedgeRectCalloutGluePoints[] =
 };
 static const SvxMSDffHandle mso_sptCalloutHandle[] =
 {
-    {	
+    {
         0,
         0x100, 0x101, 10800, 10800, 0x80000000, 0x7fffffff, 0x80000000, 0x7fffffff
     }
@@ -5138,7 +5151,7 @@ static const SvxMSDffVertPair mso_sptWedgeRRectCalloutVert[] =
     { 3590, 21600 },
     { 6 MSO_I, 7 MSO_I }, { 8970, 21600 },
     { 12630, 21600 }, { 8 MSO_I, 9 MSO_I },	{ 18010, 21600 },
-    { 21600, 18010 },	
+    { 21600, 18010 },
     { 10 MSO_I, 11 MSO_I }, { 21600, 12630 },
     { 21600, 8970 }, { 12 MSO_I, 13 MSO_I }, { 21600, 3590 },
     { 18010, 0 },
@@ -5184,7 +5197,7 @@ static const SvxMSDffCalculationData mso_sptWedgeEllipseCalloutCalc[] =
     { 0x200d, 0x404, 0, 0 },						// 05
     { 0x2000, 0x405, 0, 10800 },					// 06 > 0 ? spur needs to be drawn : 10800
     { 0x6008, 0x400, 0x401, 0 },					// 07 atan2 -> angle
-    { 0x2000, 0x407, 0, 10 },						// 08 
+    { 0x2000, 0x407, 0, 10 },						// 08
     { 0x2000, 0x407, 10, 0 },						// 09
     { 0x400a, 10800, 0x407, 0 },					// 0a
     { 0x4009, 10800, 0x407, 0 },					// 0b
@@ -5297,7 +5310,7 @@ static const SvxMSDffCalculationData mso_sptCloudCalloutCalc[] =
     { 0x2000, 0x404, 10800, 0 },					// 6
     { 0xa000, DFF_Prop_adjustValue, 0, 0x405 },		// 7
     { 0xa000, DFF_Prop_adjust2Value,0, 0x406 },		// 8
-    { 0x2001, 0x407, 1, 3 },						// 9	
+    { 0x2001, 0x407, 1, 3 },						// 9
     { 0x2001, 0x408, 1, 3 },						// 0xa
     { 0x2001, 0x407, 2, 3 },						// 0xb
     { 0x2001, 0x408, 2, 3 },						// 0xc
@@ -5369,7 +5382,7 @@ static const SvxMSDffCalculationData mso_sptWaveCalc[] =
     { 0x6000, 0x401, 0x408, 0 },			//41a
 
     { 0x8000, 21600, 0, 0x410 },			//41b c
-    { 0xa000, 0x401, 0, 0x408 },			//41c 
+    { 0xa000, 0x401, 0, 0x408 },			//41c
 
     { 0x8000, 21600, 0, 0x40c } 			//41d p3
 };
@@ -5388,7 +5401,7 @@ static const SvxMSDffHandle mso_sptWaveHandle[] =
     {	MSDFF_HANDLE_FLAGS_RANGE,
         0x101, 21600, 10800, 10800, 8640, 12960, 0x80000000, 0x7fffffff }
 };
-static const sal_Int32 mso_sptWaveDefault[] = 
+static const sal_Int32 mso_sptWaveDefault[] =
 {
     2, 1400, 10800
 };
@@ -5447,7 +5460,7 @@ static const SvxMSDffCalculationData mso_sptDoubleWaveCalc[] =
     { 0x6000, 0x401, 0x408, 0 },			//41a
 
     { 0x8000, 21600, 0, 0x410 },			//41b c
-    { 0xa000, 0x401, 0, 0x408 },			//41c 
+    { 0xa000, 0x401, 0, 0x408 },			//41c
 
     { 0x8000, 21600, 0, 0x40c }, 			//41d p3
     { 0xa000, 0x412, 0, 0x40e },			//41e
@@ -5470,7 +5483,7 @@ static const SvxMSDffHandle mso_sptDoubleWaveHandle[] =
     {	MSDFF_HANDLE_FLAGS_RANGE,
         0x101, 21600, 10800, 10800, 8640, 12960, 0x80000000, 0x7fffffff }
 };
-static const sal_Int32 mso_sptDoubleWaveDefault[] = 
+static const sal_Int32 mso_sptDoubleWaveDefault[] =
 {
     2, 1400, 10800
 };
@@ -5526,15 +5539,15 @@ const sal_Int16 GetCustomShapeConnectionTypeDefault( MSO_SPT eSpType )
 }
 
 // for each shapetype a bit of 1 is indicating that the shape is NOT stroked by default
-// #i28269# 
+// #i28269#
 static const sal_uInt16 mso_DefaultStrokingTable[] =
 {
-    0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000,
     0x0800, 0x0000, 0x0000, 0x0000, // #i28269# Added shape 75 (mso_sptPictureFrame)
-    0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000
 };
-// #i28269# 
+// #i28269#
 const sal_Bool IsCustomShapeStrokedByDefault( MSO_SPT eSpType )
 {
     sal_Bool bIsStrokedByDefault = sal_True;
@@ -5636,7 +5649,7 @@ static const sal_uInt16 mso_sptTextStopSegm[] =
     0x4000, 0x0003, 0x8000,
     0x4000, 0x0003, 0x8000
 };
-static const sal_Int32 mso_sptTextStopDefault[] = 
+static const sal_Int32 mso_sptTextStopDefault[] =
 {
     1, 2700
 };
@@ -5932,7 +5945,7 @@ static const SvxMSDffVertPair mso_sptTextSlantDownVert[] =
     { 0, 0 }, { 21600, 1 MSO_I }, { 0, 0 MSO_I }, { 21600, 21600 }
 };
 static const SvxMSDffHandle mso_sptTextSlantDownHandle[] =
-{											
+{
     {	MSDFF_HANDLE_FLAGS_RANGE,
         0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 6200, 21600 }
 };
@@ -5960,7 +5973,7 @@ static const SvxMSDffCalculationData mso_sptTextCascadeCalc[] =
     { 0x2001, 0x401, 1, 4 }
 };
 static const SvxMSDffHandle mso_sptTextCascadeUpHandle[] =
-{											
+{
     {	MSDFF_HANDLE_FLAGS_RANGE,
         21600, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 6200, 21600 }
 };
@@ -5982,7 +5995,7 @@ static const SvxMSDffVertPair mso_sptTextCascadeDownVert[] =
     { 0, 0 }, { 21600, 2 MSO_I }, { 0, 0 MSO_I }, { 21600, 21600 }
 };
 static const SvxMSDffHandle mso_sptTextCascadeDownHandle[] =
-{											
+{
     {	MSDFF_HANDLE_FLAGS_RANGE,
         0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 6200, 21600 }
 };
@@ -6979,7 +6992,7 @@ static const SvxMSDffVertPair mso_sptCallout3Verta[] =
 };
 static const SvxMSDffVertPair mso_sptCallout3Vertb[] =
 {
-    { 0, 0 }, { 21600, 0 }, { 21600, 21600 }, { 0, 21600 }, { 6 MSO_I, 7 MSO_I }, { 4 MSO_I, 5 MSO_I }, { 2 MSO_I, 3 MSO_I }, { 0 MSO_I, 1 MSO_I }, { 6 MSO_I, 0 }, { 6 MSO_I, 21600 } 
+    { 0, 0 }, { 21600, 0 }, { 21600, 21600 }, { 0, 21600 }, { 6 MSO_I, 7 MSO_I }, { 4 MSO_I, 5 MSO_I }, { 2 MSO_I, 3 MSO_I }, { 0 MSO_I, 1 MSO_I }, { 6 MSO_I, 0 }, { 6 MSO_I, 21600 }
 };
 static const SvxMSDffHandle mso_sptCalloutHandle3[] =
 {
@@ -7027,7 +7040,7 @@ static const SvxMSDffCalculationData mso_sptCalloutCalc[] =
     { 0x2000, DFF_Prop_adjust8Value, 0, 0 }
 };
 
-static const mso_CustomShape msoCallout90 = 
+static const mso_CustomShape msoCallout90 =
 {
     (SvxMSDffVertPair*)mso_sptCalloutVert1, sizeof( mso_sptCalloutVert1 ) / sizeof( SvxMSDffVertPair ),
     (sal_uInt16*)mso_sptCalloutSegm1b, sizeof( mso_sptCalloutSegm1b ) >> 1,
@@ -7039,7 +7052,7 @@ static const mso_CustomShape msoCallout90 =
     NULL, 0,
     (SvxMSDffHandle*)mso_sptCalloutHandle1, sizeof( mso_sptCalloutHandle1 ) / sizeof( SvxMSDffHandle )
 };
-static const mso_CustomShape msoCallout1 = 
+static const mso_CustomShape msoCallout1 =
 {
     (SvxMSDffVertPair*)mso_sptCalloutVert1, sizeof( mso_sptCalloutVert1 ) / sizeof( SvxMSDffVertPair ),
     (sal_uInt16*)mso_sptCalloutSegm1b, sizeof( mso_sptCalloutSegm1b ) >> 1,
@@ -7051,7 +7064,7 @@ static const mso_CustomShape msoCallout1 =
     NULL, 0,
     (SvxMSDffHandle*)mso_sptCalloutHandle1, sizeof( mso_sptCalloutHandle1 ) / sizeof( SvxMSDffHandle )
 };
-static const mso_CustomShape msoCallout2 = 
+static const mso_CustomShape msoCallout2 =
 {
     (SvxMSDffVertPair*)mso_sptCallout2Verta, sizeof( mso_sptCallout2Verta ) / sizeof( SvxMSDffVertPair ),
     (sal_uInt16*)mso_sptCallout2Segm1b, sizeof( mso_sptCallout2Segm1b ) >> 1,
@@ -7063,7 +7076,7 @@ static const mso_CustomShape msoCallout2 =
     NULL, 0,
     (SvxMSDffHandle*)mso_sptCalloutHandle2, sizeof( mso_sptCalloutHandle2 ) / sizeof( SvxMSDffHandle )
 };
-static const mso_CustomShape msoCallout3 = 
+static const mso_CustomShape msoCallout3 =
 {
     (SvxMSDffVertPair*)mso_sptCallout3Verta, sizeof( mso_sptCallout3Verta ) / sizeof( SvxMSDffVertPair ),
     (sal_uInt16*)mso_sptCallout3Segm1b, sizeof( mso_sptCallout3Segm1b ) >> 1,
@@ -7075,7 +7088,7 @@ static const mso_CustomShape msoCallout3 =
     NULL, 0,
     (SvxMSDffHandle*)mso_sptCalloutHandle3, sizeof( mso_sptCalloutHandle3 ) / sizeof( SvxMSDffHandle )
 };
-static const mso_CustomShape msoAccentCallout90 = 
+static const mso_CustomShape msoAccentCallout90 =
 {
     (SvxMSDffVertPair*)mso_sptCalloutVert1, sizeof( mso_sptCalloutVert1 ) / sizeof( SvxMSDffVertPair ),
     (sal_uInt16*)mso_sptCalloutSegm1b, sizeof( mso_sptCalloutSegm1b ) >> 1,
@@ -7087,8 +7100,8 @@ static const mso_CustomShape msoAccentCallout90 =
     NULL, 0,
     (SvxMSDffHandle*)mso_sptCalloutHandle1, sizeof( mso_sptCalloutHandle1 ) / sizeof( SvxMSDffHandle )
 };
-static const mso_CustomShape msoAccentCallout1 = 
-{	
+static const mso_CustomShape msoAccentCallout1 =
+{
     (SvxMSDffVertPair*)mso_sptCallout1Vert, sizeof( mso_sptCallout1Vert ) / sizeof( SvxMSDffVertPair ),
     (sal_uInt16*)mso_sptCallout1Segm1b, sizeof( mso_sptCallout1Segm1b ) >> 1,
     (SvxMSDffCalculationData*)mso_sptCalloutCalc, sizeof( mso_sptCalloutCalc ) / sizeof( SvxMSDffCalculationData ),
@@ -7099,7 +7112,7 @@ static const mso_CustomShape msoAccentCallout1 =
     NULL, 0,
     (SvxMSDffHandle*)mso_sptCalloutHandle1, sizeof( mso_sptCalloutHandle1 ) / sizeof( SvxMSDffHandle )
 };
-static const mso_CustomShape msoAccentCallout2 = 
+static const mso_CustomShape msoAccentCallout2 =
 {
     (SvxMSDffVertPair*)mso_sptCallout2Vertb, sizeof( mso_sptCallout2Vertb ) / sizeof( SvxMSDffVertPair ),
     (sal_uInt16*)mso_sptCallout2Segm1d, sizeof( mso_sptCallout2Segm1d ) >> 1,
@@ -7111,7 +7124,7 @@ static const mso_CustomShape msoAccentCallout2 =
     NULL, 0,
     (SvxMSDffHandle*)mso_sptCalloutHandle2, sizeof( mso_sptCalloutHandle2 ) / sizeof( SvxMSDffHandle )
 };
-static const mso_CustomShape msoAccentCallout3 = 
+static const mso_CustomShape msoAccentCallout3 =
 {
     (SvxMSDffVertPair*)mso_sptCallout3Vertb, sizeof( mso_sptCallout3Vertb ) / sizeof( SvxMSDffVertPair ),
     (sal_uInt16*)mso_sptCallout3Segm1d, sizeof( mso_sptCallout3Segm1d ) >> 1,
@@ -7123,7 +7136,7 @@ static const mso_CustomShape msoAccentCallout3 =
     NULL, 0,
     (SvxMSDffHandle*)mso_sptCalloutHandle3, sizeof( mso_sptCalloutHandle3 ) / sizeof( SvxMSDffHandle )
 };
-static const mso_CustomShape msoBorderCallout90 = 
+static const mso_CustomShape msoBorderCallout90 =
 {
     (SvxMSDffVertPair*)mso_sptCalloutVert1, sizeof( mso_sptCalloutVert1 ) / sizeof( SvxMSDffVertPair ),
     (sal_uInt16*)mso_sptCalloutSegm1a, sizeof( mso_sptCalloutSegm1a ) >> 1,
@@ -7135,7 +7148,7 @@ static const mso_CustomShape msoBorderCallout90 =
     NULL, 0,
     (SvxMSDffHandle*)mso_sptCalloutHandle1, sizeof( mso_sptCalloutHandle1 ) / sizeof( SvxMSDffHandle )
 };
-static const mso_CustomShape msoBorderCallout1 = 
+static const mso_CustomShape msoBorderCallout1 =
 {
     (SvxMSDffVertPair*)mso_sptCalloutVert1, sizeof( mso_sptCalloutVert1 ) / sizeof( SvxMSDffVertPair ),
     (sal_uInt16*)mso_sptCalloutSegm1a, sizeof( mso_sptCalloutSegm1a ) >> 1,
@@ -7147,7 +7160,7 @@ static const mso_CustomShape msoBorderCallout1 =
     NULL, 0,
     (SvxMSDffHandle*)mso_sptCalloutHandle1, sizeof( mso_sptCalloutHandle1 ) / sizeof( SvxMSDffHandle )
 };
-static const mso_CustomShape msoBorderCallout2 = 
+static const mso_CustomShape msoBorderCallout2 =
 {
     (SvxMSDffVertPair*)mso_sptCallout2Verta, sizeof( mso_sptCallout2Verta ) / sizeof( SvxMSDffVertPair ),
     (sal_uInt16*)mso_sptCallout2Segm1a, sizeof( mso_sptCallout2Segm1a ) >> 1,
@@ -7159,7 +7172,7 @@ static const mso_CustomShape msoBorderCallout2 =
     NULL, 0,
     (SvxMSDffHandle*)mso_sptCalloutHandle2, sizeof( mso_sptCalloutHandle2 ) / sizeof( SvxMSDffHandle )
 };
-static const mso_CustomShape msoBorderCallout3 = 
+static const mso_CustomShape msoBorderCallout3 =
 {
     (SvxMSDffVertPair*)mso_sptCallout3Verta, sizeof( mso_sptCallout3Verta ) / sizeof( SvxMSDffVertPair ),
     (sal_uInt16*)mso_sptCallout3Segm1a, sizeof( mso_sptCallout3Segm1a ) >> 1,
@@ -7171,7 +7184,7 @@ static const mso_CustomShape msoBorderCallout3 =
     NULL, 0,
     (SvxMSDffHandle*)mso_sptCalloutHandle3, sizeof( mso_sptCalloutHandle3 ) / sizeof( SvxMSDffHandle )
 };
-static const mso_CustomShape msoAccentBorderCallout90 = 
+static const mso_CustomShape msoAccentBorderCallout90 =
 {
     (SvxMSDffVertPair*)mso_sptCalloutVert1, sizeof( mso_sptCalloutVert1 ) / sizeof( SvxMSDffVertPair ),
     (sal_uInt16*)mso_sptCalloutSegm1a, sizeof( mso_sptCalloutSegm1a ) >> 1,
@@ -7183,7 +7196,7 @@ static const mso_CustomShape msoAccentBorderCallout90 =
     NULL, 0,
     (SvxMSDffHandle*)mso_sptCalloutHandle1, sizeof( mso_sptCalloutHandle1 ) / sizeof( SvxMSDffHandle )
 };
-static const mso_CustomShape msoAccentBorderCallout1 = 
+static const mso_CustomShape msoAccentBorderCallout1 =
 {
     (SvxMSDffVertPair*)mso_sptCallout1Vert, sizeof( mso_sptCallout1Vert ) / sizeof( SvxMSDffVertPair ),
     (sal_uInt16*)mso_sptCallout1Segm1a, sizeof( mso_sptCallout1Segm1a ) >> 1,
@@ -7195,7 +7208,7 @@ static const mso_CustomShape msoAccentBorderCallout1 =
     NULL, 0,
     (SvxMSDffHandle*)mso_sptCalloutHandle1, sizeof( mso_sptCalloutHandle1 ) / sizeof( SvxMSDffHandle )
 };
-static const mso_CustomShape msoAccentBorderCallout2 = 
+static const mso_CustomShape msoAccentBorderCallout2 =
 {
     (SvxMSDffVertPair*)mso_sptCallout2Vertb, sizeof( mso_sptCallout2Vertb ) / sizeof( SvxMSDffVertPair ),
     (sal_uInt16*)mso_sptCallout2Segm1c, sizeof( mso_sptCallout2Segm1c ) >> 1,
@@ -7207,7 +7220,7 @@ static const mso_CustomShape msoAccentBorderCallout2 =
     NULL, 0,
     (SvxMSDffHandle*)mso_sptCalloutHandle2, sizeof( mso_sptCalloutHandle2 ) / sizeof( SvxMSDffHandle )
 };
-static const mso_CustomShape msoAccentBorderCallout3 = 
+static const mso_CustomShape msoAccentBorderCallout3 =
 {
     (SvxMSDffVertPair*)mso_sptCallout3Vertb, sizeof( mso_sptCallout3Vertb ) / sizeof( SvxMSDffVertPair ),
     (sal_uInt16*)mso_sptCallout3Segm1c, sizeof( mso_sptCallout3Segm1c ) >> 1,
@@ -7228,7 +7241,7 @@ const mso_CustomShape* GetCustomShapeContent( MSO_SPT eSpType )
         case mso_sptArc :						pCustomShape = &msoArc; break;
         case mso_sptRectangle :					pCustomShape = &msoRectangle; break;
         case mso_sptParallelogram :				pCustomShape = &msoParallelogram; break;
-        case mso_sptTrapezoid :					pCustomShape = &msoTrapezoid; break;		
+        case mso_sptTrapezoid :					pCustomShape = &msoTrapezoid; break;
         case mso_sptDiamond :					pCustomShape = &msoDiamond; break;
         case mso_sptRoundRectangle :			pCustomShape = &msoRoundRectangle; break;
         case mso_sptOctagon :					pCustomShape = &msoOctagon; break;