diff options
author | Radek Doulik <rodo@novell.com> | 2012-01-11 16:02:19 +0100 |
---|---|---|
committer | Radek Doulik <rodo@novell.com> | 2012-01-11 16:03:26 +0100 |
commit | f7aca07bf75f4a50e831e1d745ba83234620ce0b (patch) | |
tree | 115fda9dbed461b58fda51afb62049345f74ef40 /oox | |
parent | pptx: support fill=[darken|darkenLess|lighten|lightenLess] in path element (diff) | |
download | core-f7aca07bf75f4a50e831e1d745ba83234620ce0b.tar.gz core-f7aca07bf75f4a50e831e1d745ba83234620ce0b.zip |
pptx: regenerated custom shape presets after last path element changes
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/drawingml/customshapepresets1.cxx | 218 | ||||
-rw-r--r-- | oox/source/drawingml/customshapepresets2.cxx | 246 | ||||
-rw-r--r-- | oox/source/drawingml/customshapepresets3.cxx | 218 | ||||
-rw-r--r-- | oox/source/drawingml/customshapepresets4.cxx | 264 | ||||
-rw-r--r-- | oox/source/drawingml/customshapepresets5.cxx | 212 | ||||
-rw-r--r-- | oox/source/drawingml/customshapepresets6.cxx | 62 |
6 files changed, 712 insertions, 508 deletions
diff --git a/oox/source/drawingml/customshapepresets1.cxx b/oox/source/drawingml/customshapepresets1.cxx index 401355748512..6aa00d54e6f4 100644 --- a/oox/source/drawingml/customshapepresets1.cxx +++ b/oox/source/drawingml/customshapepresets1.cxx @@ -649,7 +649,7 @@ void CustomShapeProperties::initializePresetsMap1() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (29); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (30); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -718,111 +718,117 @@ void CustomShapeProperties::initializePresetsMap1() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 18; aSegment.Count = 0; aSegmentSeq [11] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [12] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [13] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [13] = aSegment; + aSegmentSeq [14] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 5; - aSegmentSeq [14] = aSegment; + aSegmentSeq [15] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [15] = aSegment; + aSegmentSeq [16] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [16] = aSegment; + aSegmentSeq [17] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [17] = aSegment; + aSegmentSeq [18] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [18] = aSegment; + aSegmentSeq [19] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [19] = aSegment; + aSegmentSeq [20] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [20] = aSegment; + aSegmentSeq [21] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [21] = aSegment; + aSegmentSeq [22] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [22] = aSegment; + aSegmentSeq [23] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [23] = aSegment; + aSegmentSeq [24] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [24] = aSegment; + aSegmentSeq [25] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [25] = aSegment; + aSegmentSeq [26] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [26] = aSegment; + aSegmentSeq [27] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [27] = aSegment; + aSegmentSeq [28] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [28] = aSegment; + aSegmentSeq [29] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } @@ -2558,7 +2564,7 @@ void CustomShapeProperties::initializePresetsMap1() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (24); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (25); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -2633,75 +2639,81 @@ void CustomShapeProperties::initializePresetsMap1() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 19; aSegment.Count = 0; aSegmentSeq [12] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [13] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [14] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [14] = aSegment; + aSegmentSeq [15] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [15] = aSegment; + aSegmentSeq [16] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [16] = aSegment; + aSegmentSeq [17] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [17] = aSegment; + aSegmentSeq [18] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [18] = aSegment; + aSegmentSeq [19] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [19] = aSegment; + aSegmentSeq [20] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 4; - aSegmentSeq [20] = aSegment; + aSegmentSeq [21] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [21] = aSegment; + aSegmentSeq [22] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [22] = aSegment; + aSegmentSeq [23] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [23] = aSegment; + aSegmentSeq [24] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } @@ -4166,7 +4178,7 @@ void CustomShapeProperties::initializePresetsMap1() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (28); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (29); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -4247,93 +4259,99 @@ void CustomShapeProperties::initializePresetsMap1() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 19; aSegment.Count = 0; aSegmentSeq [13] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [14] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [15] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [15] = aSegment; + aSegmentSeq [16] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [16] = aSegment; + aSegmentSeq [17] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 2; - aSegmentSeq [17] = aSegment; + aSegmentSeq [18] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 6; - aSegmentSeq [18] = aSegment; + aSegmentSeq [19] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [19] = aSegment; + aSegmentSeq [20] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [20] = aSegment; + aSegmentSeq [21] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [21] = aSegment; + aSegmentSeq [22] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [22] = aSegment; + aSegmentSeq [23] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [23] = aSegment; + aSegmentSeq [24] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [24] = aSegment; + aSegmentSeq [25] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [25] = aSegment; + aSegmentSeq [26] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [26] = aSegment; + aSegmentSeq [27] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [27] = aSegment; + aSegmentSeq [28] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } @@ -5473,7 +5491,7 @@ void CustomShapeProperties::initializePresetsMap1() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (40); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (42); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -5572,147 +5590,159 @@ void CustomShapeProperties::initializePresetsMap1() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 18; aSegment.Count = 0; aSegmentSeq [16] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [17] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [18] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [18] = aSegment; + aSegmentSeq [19] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [19] = aSegment; + aSegmentSeq [20] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [20] = aSegment; + aSegmentSeq [21] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 9; - aSegmentSeq [21] = aSegment; + aSegmentSeq [22] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [22] = aSegment; + aSegmentSeq [23] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; + aSegment.Command = 20; + aSegment.Count = 0; + aSegmentSeq [24] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 7; aSegment.Count = 0; - aSegmentSeq [23] = aSegment; + aSegmentSeq [25] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [24] = aSegment; + aSegmentSeq [26] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [25] = aSegment; + aSegmentSeq [27] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [26] = aSegment; + aSegmentSeq [28] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [27] = aSegment; + aSegmentSeq [29] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [28] = aSegment; + aSegmentSeq [30] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [29] = aSegment; + aSegmentSeq [31] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [30] = aSegment; + aSegmentSeq [32] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 9; - aSegmentSeq [31] = aSegment; + aSegmentSeq [33] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [32] = aSegment; + aSegmentSeq [34] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [33] = aSegment; + aSegmentSeq [35] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [34] = aSegment; + aSegmentSeq [36] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [35] = aSegment; + aSegmentSeq [37] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [36] = aSegment; + aSegmentSeq [38] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [37] = aSegment; + aSegmentSeq [39] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [38] = aSegment; + aSegmentSeq [40] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [39] = aSegment; + aSegmentSeq [41] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } @@ -15690,7 +15720,7 @@ void CustomShapeProperties::initializePresetsMap1() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (38); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (39); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -15819,105 +15849,111 @@ void CustomShapeProperties::initializePresetsMap1() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 18; aSegment.Count = 0; aSegmentSeq [21] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [22] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [23] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [23] = aSegment; + aSegmentSeq [24] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 3; - aSegmentSeq [24] = aSegment; + aSegmentSeq [25] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [25] = aSegment; + aSegmentSeq [26] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 3; - aSegmentSeq [26] = aSegment; + aSegmentSeq [27] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [27] = aSegment; + aSegmentSeq [28] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [28] = aSegment; + aSegmentSeq [29] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [29] = aSegment; + aSegmentSeq [30] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [30] = aSegment; + aSegmentSeq [31] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [31] = aSegment; + aSegmentSeq [32] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [32] = aSegment; + aSegmentSeq [33] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [33] = aSegment; + aSegmentSeq [34] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [34] = aSegment; + aSegmentSeq [35] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [35] = aSegment; + aSegmentSeq [36] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [36] = aSegment; + aSegmentSeq [37] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [37] = aSegment; + aSegmentSeq [38] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } diff --git a/oox/source/drawingml/customshapepresets2.cxx b/oox/source/drawingml/customshapepresets2.cxx index 8f6a98badbe8..accc83071bc5 100644 --- a/oox/source/drawingml/customshapepresets2.cxx +++ b/oox/source/drawingml/customshapepresets2.cxx @@ -1989,7 +1989,7 @@ void CustomShapeProperties::initializePresetsMap2() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (23); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (24); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -2058,75 +2058,81 @@ void CustomShapeProperties::initializePresetsMap2() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 18; aSegment.Count = 0; aSegmentSeq [11] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [12] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [13] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [13] = aSegment; + aSegmentSeq [14] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 2; - aSegmentSeq [14] = aSegment; + aSegmentSeq [15] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [15] = aSegment; + aSegmentSeq [16] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [16] = aSegment; + aSegmentSeq [17] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [17] = aSegment; + aSegmentSeq [18] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [18] = aSegment; + aSegmentSeq [19] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [19] = aSegment; + aSegmentSeq [20] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [20] = aSegment; + aSegmentSeq [21] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [21] = aSegment; + aSegmentSeq [22] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [22] = aSegment; + aSegmentSeq [23] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } @@ -2652,7 +2658,7 @@ void CustomShapeProperties::initializePresetsMap2() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (19); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (20); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -2715,57 +2721,63 @@ void CustomShapeProperties::initializePresetsMap2() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 20; aSegment.Count = 0; aSegmentSeq [10] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [11] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [12] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [12] = aSegment; + aSegmentSeq [13] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 2; - aSegmentSeq [13] = aSegment; + aSegmentSeq [14] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [14] = aSegment; + aSegmentSeq [15] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [15] = aSegment; + aSegmentSeq [16] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [16] = aSegment; + aSegmentSeq [17] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [17] = aSegment; + aSegmentSeq [18] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [18] = aSegment; + aSegmentSeq [19] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } @@ -3206,7 +3218,7 @@ void CustomShapeProperties::initializePresetsMap2() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (14); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (15); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -3257,39 +3269,45 @@ void CustomShapeProperties::initializePresetsMap2() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 19; aSegment.Count = 0; aSegmentSeq [8] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [9] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [10] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [10] = aSegment; + aSegmentSeq [11] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 7; - aSegmentSeq [11] = aSegment; + aSegmentSeq [12] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [12] = aSegment; + aSegmentSeq [13] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [13] = aSegment; + aSegmentSeq [14] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } @@ -11989,7 +12007,7 @@ void CustomShapeProperties::initializePresetsMap2() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (32); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (33); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -12094,93 +12112,99 @@ void CustomShapeProperties::initializePresetsMap2() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 18; aSegment.Count = 0; aSegmentSeq [17] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [18] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [19] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [19] = aSegment; + aSegmentSeq [20] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 2; - aSegmentSeq [20] = aSegment; + aSegmentSeq [21] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [21] = aSegment; + aSegmentSeq [22] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [22] = aSegment; + aSegmentSeq [23] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [23] = aSegment; + aSegmentSeq [24] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [24] = aSegment; + aSegmentSeq [25] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [25] = aSegment; + aSegmentSeq [26] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [26] = aSegment; + aSegmentSeq [27] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [27] = aSegment; + aSegmentSeq [28] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [28] = aSegment; + aSegmentSeq [29] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [29] = aSegment; + aSegmentSeq [30] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [30] = aSegment; + aSegmentSeq [31] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [31] = aSegment; + aSegmentSeq [32] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } @@ -13108,7 +13132,7 @@ void CustomShapeProperties::initializePresetsMap2() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (32); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (33); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -13213,93 +13237,99 @@ void CustomShapeProperties::initializePresetsMap2() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 18; aSegment.Count = 0; aSegmentSeq [17] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [18] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [19] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [19] = aSegment; + aSegmentSeq [20] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 2; - aSegmentSeq [20] = aSegment; + aSegmentSeq [21] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [21] = aSegment; + aSegmentSeq [22] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [22] = aSegment; + aSegmentSeq [23] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [23] = aSegment; + aSegmentSeq [24] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [24] = aSegment; + aSegmentSeq [25] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [25] = aSegment; + aSegmentSeq [26] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [26] = aSegment; + aSegmentSeq [27] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [27] = aSegment; + aSegmentSeq [28] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [28] = aSegment; + aSegmentSeq [29] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [29] = aSegment; + aSegmentSeq [30] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [30] = aSegment; + aSegmentSeq [31] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [31] = aSegment; + aSegmentSeq [32] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } @@ -15537,7 +15567,7 @@ void CustomShapeProperties::initializePresetsMap2() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (41); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (45); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -15588,201 +15618,225 @@ void CustomShapeProperties::initializePresetsMap2() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 21; aSegment.Count = 0; aSegmentSeq [8] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [9] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [10] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [10] = aSegment; + aSegmentSeq [11] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [11] = aSegment; + aSegmentSeq [12] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [12] = aSegment; + aSegmentSeq [13] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; + aSegment.Command = 19; + aSegment.Count = 0; + aSegmentSeq [14] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 7; aSegment.Count = 0; - aSegmentSeq [13] = aSegment; + aSegmentSeq [15] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [14] = aSegment; + aSegmentSeq [16] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [15] = aSegment; + aSegmentSeq [17] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [16] = aSegment; + aSegmentSeq [18] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [17] = aSegment; + aSegmentSeq [19] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; + aSegment.Command = 20; + aSegment.Count = 0; + aSegmentSeq [20] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 7; aSegment.Count = 0; - aSegmentSeq [18] = aSegment; + aSegmentSeq [21] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [19] = aSegment; + aSegmentSeq [22] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [20] = aSegment; + aSegmentSeq [23] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [21] = aSegment; + aSegmentSeq [24] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [22] = aSegment; + aSegmentSeq [25] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; + aSegment.Command = 18; + aSegment.Count = 0; + aSegmentSeq [26] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 7; aSegment.Count = 0; - aSegmentSeq [23] = aSegment; + aSegmentSeq [27] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [24] = aSegment; + aSegmentSeq [28] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [25] = aSegment; + aSegmentSeq [29] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [26] = aSegment; + aSegmentSeq [30] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [27] = aSegment; + aSegmentSeq [31] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [28] = aSegment; + aSegmentSeq [32] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [29] = aSegment; + aSegmentSeq [33] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [30] = aSegment; + aSegmentSeq [34] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [31] = aSegment; + aSegmentSeq [35] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [32] = aSegment; + aSegmentSeq [36] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [33] = aSegment; + aSegmentSeq [37] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [34] = aSegment; + aSegmentSeq [38] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [35] = aSegment; + aSegmentSeq [39] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [36] = aSegment; + aSegmentSeq [40] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [37] = aSegment; + aSegmentSeq [41] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [38] = aSegment; + aSegmentSeq [42] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [39] = aSegment; + aSegmentSeq [43] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [40] = aSegment; + aSegmentSeq [44] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } diff --git a/oox/source/drawingml/customshapepresets3.cxx b/oox/source/drawingml/customshapepresets3.cxx index c6f6af8538ca..ca859635ea6e 100644 --- a/oox/source/drawingml/customshapepresets3.cxx +++ b/oox/source/drawingml/customshapepresets3.cxx @@ -2280,7 +2280,7 @@ void CustomShapeProperties::initializePresetsMap3() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (48); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (49); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -2415,159 +2415,165 @@ void CustomShapeProperties::initializePresetsMap3() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 19; aSegment.Count = 0; aSegmentSeq [22] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [23] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [24] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [24] = aSegment; + aSegmentSeq [25] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 16; aSegment.Count = 1; - aSegmentSeq [25] = aSegment; + aSegmentSeq [26] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [26] = aSegment; + aSegmentSeq [27] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 16; aSegment.Count = 1; - aSegmentSeq [27] = aSegment; + aSegmentSeq [28] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [28] = aSegment; + aSegmentSeq [29] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 16; aSegment.Count = 1; - aSegmentSeq [29] = aSegment; + aSegmentSeq [30] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 2; - aSegmentSeq [30] = aSegment; + aSegmentSeq [31] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 16; aSegment.Count = 1; - aSegmentSeq [31] = aSegment; + aSegmentSeq [32] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [32] = aSegment; + aSegmentSeq [33] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 16; aSegment.Count = 1; - aSegmentSeq [33] = aSegment; + aSegmentSeq [34] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [34] = aSegment; + aSegmentSeq [35] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 16; aSegment.Count = 1; - aSegmentSeq [35] = aSegment; + aSegmentSeq [36] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [36] = aSegment; + aSegmentSeq [37] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [37] = aSegment; + aSegmentSeq [38] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [38] = aSegment; + aSegmentSeq [39] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [39] = aSegment; + aSegmentSeq [40] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [40] = aSegment; + aSegmentSeq [41] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [41] = aSegment; + aSegmentSeq [42] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [42] = aSegment; + aSegmentSeq [43] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [43] = aSegment; + aSegmentSeq [44] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [44] = aSegment; + aSegmentSeq [45] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [45] = aSegment; + aSegmentSeq [46] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [46] = aSegment; + aSegmentSeq [47] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [47] = aSegment; + aSegmentSeq [48] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } @@ -8183,7 +8189,7 @@ void CustomShapeProperties::initializePresetsMap3() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (55); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (56); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -8360,159 +8366,165 @@ void CustomShapeProperties::initializePresetsMap3() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 19; aSegment.Count = 0; aSegmentSeq [29] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [30] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [31] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [31] = aSegment; + aSegmentSeq [32] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 4; - aSegmentSeq [32] = aSegment; + aSegmentSeq [33] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [33] = aSegment; + aSegmentSeq [34] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [34] = aSegment; + aSegmentSeq [35] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [35] = aSegment; + aSegmentSeq [36] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 6; - aSegmentSeq [36] = aSegment; + aSegmentSeq [37] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [37] = aSegment; + aSegmentSeq [38] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [38] = aSegment; + aSegmentSeq [39] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [39] = aSegment; + aSegmentSeq [40] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [40] = aSegment; + aSegmentSeq [41] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [41] = aSegment; + aSegmentSeq [42] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [42] = aSegment; + aSegmentSeq [43] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [43] = aSegment; + aSegmentSeq [44] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [44] = aSegment; + aSegmentSeq [45] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [45] = aSegment; + aSegmentSeq [46] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [46] = aSegment; + aSegmentSeq [47] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [47] = aSegment; + aSegmentSeq [48] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [48] = aSegment; + aSegmentSeq [49] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [49] = aSegment; + aSegmentSeq [50] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [50] = aSegment; + aSegmentSeq [51] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [51] = aSegment; + aSegmentSeq [52] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [52] = aSegment; + aSegmentSeq [53] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [53] = aSegment; + aSegmentSeq [54] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [54] = aSegment; + aSegmentSeq [55] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } @@ -10992,7 +11004,7 @@ void CustomShapeProperties::initializePresetsMap3() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (40); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (42); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -11079,159 +11091,171 @@ void CustomShapeProperties::initializePresetsMap3() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 19; aSegment.Count = 0; aSegmentSeq [14] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [15] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [16] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [16] = aSegment; + aSegmentSeq [17] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 2; - aSegmentSeq [17] = aSegment; + aSegmentSeq [18] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [18] = aSegment; + aSegmentSeq [19] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [19] = aSegment; + aSegmentSeq [20] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [20] = aSegment; + aSegmentSeq [21] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [21] = aSegment; + aSegmentSeq [22] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; + aSegment.Command = 18; + aSegment.Count = 0; + aSegmentSeq [23] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 7; aSegment.Count = 0; - aSegmentSeq [22] = aSegment; + aSegmentSeq [24] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [23] = aSegment; + aSegmentSeq [25] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [24] = aSegment; + aSegmentSeq [26] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 10; - aSegmentSeq [25] = aSegment; + aSegmentSeq [27] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [26] = aSegment; + aSegmentSeq [28] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [27] = aSegment; + aSegmentSeq [29] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [28] = aSegment; + aSegmentSeq [30] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [29] = aSegment; + aSegmentSeq [31] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [30] = aSegment; + aSegmentSeq [32] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [31] = aSegment; + aSegmentSeq [33] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [32] = aSegment; + aSegmentSeq [34] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [33] = aSegment; + aSegmentSeq [35] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [34] = aSegment; + aSegmentSeq [36] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [35] = aSegment; + aSegmentSeq [37] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [36] = aSegment; + aSegmentSeq [38] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [37] = aSegment; + aSegmentSeq [39] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [38] = aSegment; + aSegmentSeq [40] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [39] = aSegment; + aSegmentSeq [41] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } @@ -17372,7 +17396,7 @@ void CustomShapeProperties::initializePresetsMap3() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (23); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (24); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -17441,75 +17465,81 @@ void CustomShapeProperties::initializePresetsMap3() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 18; aSegment.Count = 0; aSegmentSeq [11] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [12] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [13] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [13] = aSegment; + aSegmentSeq [14] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 18; - aSegmentSeq [14] = aSegment; + aSegmentSeq [15] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [15] = aSegment; + aSegmentSeq [16] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [16] = aSegment; + aSegmentSeq [17] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [17] = aSegment; + aSegmentSeq [18] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [18] = aSegment; + aSegmentSeq [19] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [19] = aSegment; + aSegmentSeq [20] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [20] = aSegment; + aSegmentSeq [21] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [21] = aSegment; + aSegmentSeq [22] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [22] = aSegment; + aSegmentSeq [23] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } diff --git a/oox/source/drawingml/customshapepresets4.cxx b/oox/source/drawingml/customshapepresets4.cxx index df89e76aa982..c62b4928da5e 100644 --- a/oox/source/drawingml/customshapepresets4.cxx +++ b/oox/source/drawingml/customshapepresets4.cxx @@ -3767,7 +3767,7 @@ void CustomShapeProperties::initializePresetsMap4() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (26); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (27); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -3854,75 +3854,81 @@ void CustomShapeProperties::initializePresetsMap4() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 19; aSegment.Count = 0; aSegmentSeq [14] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [15] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [16] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [16] = aSegment; + aSegmentSeq [17] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [17] = aSegment; + aSegmentSeq [18] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [18] = aSegment; + aSegmentSeq [19] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [19] = aSegment; + aSegmentSeq [20] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [20] = aSegment; + aSegmentSeq [21] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [21] = aSegment; + aSegmentSeq [22] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 4; - aSegmentSeq [22] = aSegment; + aSegmentSeq [23] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [23] = aSegment; + aSegmentSeq [24] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [24] = aSegment; + aSegmentSeq [25] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [25] = aSegment; + aSegmentSeq [26] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } @@ -5234,7 +5240,7 @@ void CustomShapeProperties::initializePresetsMap4() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (47); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (48); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -5399,123 +5405,129 @@ void CustomShapeProperties::initializePresetsMap4() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 18; aSegment.Count = 0; aSegmentSeq [27] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [28] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [29] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [29] = aSegment; + aSegmentSeq [30] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 2; - aSegmentSeq [30] = aSegment; + aSegmentSeq [31] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [31] = aSegment; + aSegmentSeq [32] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [32] = aSegment; + aSegmentSeq [33] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [33] = aSegment; + aSegmentSeq [34] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [34] = aSegment; + aSegmentSeq [35] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [35] = aSegment; + aSegmentSeq [36] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [36] = aSegment; + aSegmentSeq [37] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [37] = aSegment; + aSegmentSeq [38] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [38] = aSegment; + aSegmentSeq [39] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [39] = aSegment; + aSegmentSeq [40] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [40] = aSegment; + aSegmentSeq [41] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [41] = aSegment; + aSegmentSeq [42] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [42] = aSegment; + aSegmentSeq [43] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [43] = aSegment; + aSegmentSeq [44] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [44] = aSegment; + aSegmentSeq [45] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [45] = aSegment; + aSegmentSeq [46] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [46] = aSegment; + aSegmentSeq [47] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } @@ -6883,7 +6895,7 @@ void CustomShapeProperties::initializePresetsMap4() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (19); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (20); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -6940,63 +6952,69 @@ void CustomShapeProperties::initializePresetsMap4() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 19; aSegment.Count = 0; aSegmentSeq [9] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [10] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [10] = aSegment; + aSegmentSeq [11] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 16; aSegment.Count = 1; - aSegmentSeq [11] = aSegment; + aSegmentSeq [12] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [12] = aSegment; + aSegmentSeq [13] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [13] = aSegment; + aSegmentSeq [14] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [14] = aSegment; + aSegmentSeq [15] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [15] = aSegment; + aSegmentSeq [16] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [16] = aSegment; + aSegmentSeq [17] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [17] = aSegment; + aSegmentSeq [18] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [18] = aSegment; + aSegmentSeq [19] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } @@ -9602,7 +9620,7 @@ void CustomShapeProperties::initializePresetsMap4() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (23); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (24); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -9671,75 +9689,81 @@ void CustomShapeProperties::initializePresetsMap4() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 18; aSegment.Count = 0; aSegmentSeq [11] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [12] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [13] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [13] = aSegment; + aSegmentSeq [14] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 2; - aSegmentSeq [14] = aSegment; + aSegmentSeq [15] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [15] = aSegment; + aSegmentSeq [16] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [16] = aSegment; + aSegmentSeq [17] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [17] = aSegment; + aSegmentSeq [18] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [18] = aSegment; + aSegmentSeq [19] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [19] = aSegment; + aSegmentSeq [20] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [20] = aSegment; + aSegmentSeq [21] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [21] = aSegment; + aSegmentSeq [22] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [22] = aSegment; + aSegmentSeq [23] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } @@ -11414,7 +11438,7 @@ void CustomShapeProperties::initializePresetsMap4() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (22); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (23); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -11477,75 +11501,81 @@ void CustomShapeProperties::initializePresetsMap4() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 19; aSegment.Count = 0; aSegmentSeq [10] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [11] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [12] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [12] = aSegment; + aSegmentSeq [13] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [13] = aSegment; + aSegmentSeq [14] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 4; - aSegmentSeq [14] = aSegment; + aSegmentSeq [15] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [15] = aSegment; + aSegmentSeq [16] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [16] = aSegment; + aSegmentSeq [17] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [17] = aSegment; + aSegmentSeq [18] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [18] = aSegment; + aSegmentSeq [19] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [19] = aSegment; + aSegmentSeq [20] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [20] = aSegment; + aSegmentSeq [21] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [21] = aSegment; + aSegmentSeq [22] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } @@ -15197,7 +15227,7 @@ void CustomShapeProperties::initializePresetsMap4() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (24); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (25); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -15272,75 +15302,81 @@ void CustomShapeProperties::initializePresetsMap4() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 19; aSegment.Count = 0; aSegmentSeq [12] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [13] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [14] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [14] = aSegment; + aSegmentSeq [15] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [15] = aSegment; + aSegmentSeq [16] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 4; - aSegmentSeq [16] = aSegment; + aSegmentSeq [17] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [17] = aSegment; + aSegmentSeq [18] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [18] = aSegment; + aSegmentSeq [19] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [19] = aSegment; + aSegmentSeq [20] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [20] = aSegment; + aSegmentSeq [21] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [21] = aSegment; + aSegmentSeq [22] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [22] = aSegment; + aSegmentSeq [23] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [23] = aSegment; + aSegmentSeq [24] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } @@ -16942,7 +16978,7 @@ void CustomShapeProperties::initializePresetsMap4() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (48); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (49); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -17077,159 +17113,165 @@ void CustomShapeProperties::initializePresetsMap4() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 19; aSegment.Count = 0; aSegmentSeq [22] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [23] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [24] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [24] = aSegment; + aSegmentSeq [25] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 2; - aSegmentSeq [25] = aSegment; + aSegmentSeq [26] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 16; aSegment.Count = 1; - aSegmentSeq [26] = aSegment; + aSegmentSeq [27] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [27] = aSegment; + aSegmentSeq [28] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 16; aSegment.Count = 1; - aSegmentSeq [28] = aSegment; + aSegmentSeq [29] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [29] = aSegment; + aSegmentSeq [30] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 16; aSegment.Count = 1; - aSegmentSeq [30] = aSegment; + aSegmentSeq [31] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 2; - aSegmentSeq [31] = aSegment; + aSegmentSeq [32] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 16; aSegment.Count = 1; - aSegmentSeq [32] = aSegment; + aSegmentSeq [33] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [33] = aSegment; + aSegmentSeq [34] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 16; aSegment.Count = 1; - aSegmentSeq [34] = aSegment; + aSegmentSeq [35] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [35] = aSegment; + aSegmentSeq [36] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 16; aSegment.Count = 1; - aSegmentSeq [36] = aSegment; + aSegmentSeq [37] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [37] = aSegment; + aSegmentSeq [38] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [38] = aSegment; + aSegmentSeq [39] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [39] = aSegment; + aSegmentSeq [40] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [40] = aSegment; + aSegmentSeq [41] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [41] = aSegment; + aSegmentSeq [42] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [42] = aSegment; + aSegmentSeq [43] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [43] = aSegment; + aSegmentSeq [44] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [44] = aSegment; + aSegmentSeq [45] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [45] = aSegment; + aSegmentSeq [46] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [46] = aSegment; + aSegmentSeq [47] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [47] = aSegment; + aSegmentSeq [48] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } diff --git a/oox/source/drawingml/customshapepresets5.cxx b/oox/source/drawingml/customshapepresets5.cxx index 87452839b3de..015cc6f54a05 100644 --- a/oox/source/drawingml/customshapepresets5.cxx +++ b/oox/source/drawingml/customshapepresets5.cxx @@ -3530,7 +3530,7 @@ void CustomShapeProperties::initializePresetsMap5() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (47); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (48); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -3665,153 +3665,159 @@ void CustomShapeProperties::initializePresetsMap5() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 19; aSegment.Count = 0; aSegmentSeq [22] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [23] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [24] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [24] = aSegment; + aSegmentSeq [25] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [25] = aSegment; + aSegmentSeq [26] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [26] = aSegment; + aSegmentSeq [27] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [27] = aSegment; + aSegmentSeq [28] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [28] = aSegment; + aSegmentSeq [29] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 2; - aSegmentSeq [29] = aSegment; + aSegmentSeq [30] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [30] = aSegment; + aSegmentSeq [31] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [31] = aSegment; + aSegmentSeq [32] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [32] = aSegment; + aSegmentSeq [33] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [33] = aSegment; + aSegmentSeq [34] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [34] = aSegment; + aSegmentSeq [35] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 2; - aSegmentSeq [35] = aSegment; + aSegmentSeq [36] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [36] = aSegment; + aSegmentSeq [37] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [37] = aSegment; + aSegmentSeq [38] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [38] = aSegment; + aSegmentSeq [39] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [39] = aSegment; + aSegmentSeq [40] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [40] = aSegment; + aSegmentSeq [41] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [41] = aSegment; + aSegmentSeq [42] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [42] = aSegment; + aSegmentSeq [43] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [43] = aSegment; + aSegmentSeq [44] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [44] = aSegment; + aSegmentSeq [45] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [45] = aSegment; + aSegmentSeq [46] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [46] = aSegment; + aSegmentSeq [47] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } @@ -6422,7 +6428,7 @@ void CustomShapeProperties::initializePresetsMap5() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (24); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (26); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -6473,99 +6479,111 @@ void CustomShapeProperties::initializePresetsMap5() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 19; aSegment.Count = 0; aSegmentSeq [8] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [9] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [10] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [10] = aSegment; + aSegmentSeq [11] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [11] = aSegment; + aSegmentSeq [12] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [12] = aSegment; + aSegmentSeq [13] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; + aSegment.Command = 21; + aSegment.Count = 0; + aSegmentSeq [14] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 7; aSegment.Count = 0; - aSegmentSeq [13] = aSegment; + aSegmentSeq [15] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [14] = aSegment; + aSegmentSeq [16] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [15] = aSegment; + aSegmentSeq [17] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 5; - aSegmentSeq [16] = aSegment; + aSegmentSeq [18] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [17] = aSegment; + aSegmentSeq [19] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [18] = aSegment; + aSegmentSeq [20] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 2; - aSegmentSeq [19] = aSegment; + aSegmentSeq [21] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [20] = aSegment; + aSegmentSeq [22] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [21] = aSegment; + aSegmentSeq [23] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [22] = aSegment; + aSegmentSeq [24] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [23] = aSegment; + aSegmentSeq [25] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } @@ -9139,7 +9157,7 @@ void CustomShapeProperties::initializePresetsMap5() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (30); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (32); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -9208,117 +9226,129 @@ void CustomShapeProperties::initializePresetsMap5() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 19; aSegment.Count = 0; aSegmentSeq [11] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [12] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [13] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [13] = aSegment; + aSegmentSeq [14] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 2; - aSegmentSeq [14] = aSegment; + aSegmentSeq [15] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [15] = aSegment; + aSegmentSeq [16] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; + aSegment.Command = 18; + aSegment.Count = 0; + aSegmentSeq [17] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 7; aSegment.Count = 0; - aSegmentSeq [16] = aSegment; + aSegmentSeq [18] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [17] = aSegment; + aSegmentSeq [19] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [18] = aSegment; + aSegmentSeq [20] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 4; - aSegmentSeq [19] = aSegment; + aSegmentSeq [21] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [20] = aSegment; + aSegmentSeq [22] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [21] = aSegment; + aSegmentSeq [23] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 2; - aSegmentSeq [22] = aSegment; + aSegmentSeq [24] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [23] = aSegment; + aSegmentSeq [25] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [24] = aSegment; + aSegmentSeq [26] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [25] = aSegment; + aSegmentSeq [27] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [26] = aSegment; + aSegmentSeq [28] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [27] = aSegment; + aSegmentSeq [29] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [28] = aSegment; + aSegmentSeq [30] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [29] = aSegment; + aSegmentSeq [31] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } @@ -11641,7 +11671,7 @@ void CustomShapeProperties::initializePresetsMap5() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (46); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (47); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -11776,147 +11806,153 @@ void CustomShapeProperties::initializePresetsMap5() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 19; aSegment.Count = 0; aSegmentSeq [22] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [23] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [24] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [24] = aSegment; + aSegmentSeq [25] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [25] = aSegment; + aSegmentSeq [26] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 2; - aSegmentSeq [26] = aSegment; + aSegmentSeq [27] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [27] = aSegment; + aSegmentSeq [28] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [28] = aSegment; + aSegmentSeq [29] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [29] = aSegment; + aSegmentSeq [30] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 2; - aSegmentSeq [30] = aSegment; + aSegmentSeq [31] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [31] = aSegment; + aSegmentSeq [32] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [32] = aSegment; + aSegmentSeq [33] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [33] = aSegment; + aSegmentSeq [34] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [34] = aSegment; + aSegmentSeq [35] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [35] = aSegment; + aSegmentSeq [36] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [36] = aSegment; + aSegmentSeq [37] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [37] = aSegment; + aSegmentSeq [38] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [38] = aSegment; + aSegmentSeq [39] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [39] = aSegment; + aSegmentSeq [40] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [40] = aSegment; + aSegmentSeq [41] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 2; - aSegmentSeq [41] = aSegment; + aSegmentSeq [42] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [42] = aSegment; + aSegmentSeq [43] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [43] = aSegment; + aSegmentSeq [44] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [44] = aSegment; + aSegmentSeq [45] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [45] = aSegment; + aSegmentSeq [46] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } diff --git a/oox/source/drawingml/customshapepresets6.cxx b/oox/source/drawingml/customshapepresets6.cxx index 17a2613c531f..1696ccde8bb1 100644 --- a/oox/source/drawingml/customshapepresets6.cxx +++ b/oox/source/drawingml/customshapepresets6.cxx @@ -6595,7 +6595,7 @@ void CustomShapeProperties::initializePresetsMap6() } { aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); - Sequence< EnhancedCustomShapeSegment > aSegmentSeq (56); + Sequence< EnhancedCustomShapeSegment > aSegmentSeq (57); { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; @@ -6772,165 +6772,171 @@ void CustomShapeProperties::initializePresetsMap6() } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 7; + aSegment.Command = 19; aSegment.Count = 0; aSegmentSeq [29] = aSegment; } { EnhancedCustomShapeSegment aSegment; - aSegment.Command = 5; + aSegment.Command = 7; aSegment.Count = 0; aSegmentSeq [30] = aSegment; } { EnhancedCustomShapeSegment aSegment; + aSegment.Command = 5; + aSegment.Count = 0; + aSegmentSeq [31] = aSegment; + } + { + EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [31] = aSegment; + aSegmentSeq [32] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [32] = aSegment; + aSegmentSeq [33] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [33] = aSegment; + aSegmentSeq [34] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [34] = aSegment; + aSegmentSeq [35] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [35] = aSegment; + aSegmentSeq [36] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [36] = aSegment; + aSegmentSeq [37] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [37] = aSegment; + aSegmentSeq [38] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [38] = aSegment; + aSegmentSeq [39] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [39] = aSegment; + aSegmentSeq [40] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 5; - aSegmentSeq [40] = aSegment; + aSegmentSeq [41] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [41] = aSegment; + aSegmentSeq [42] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [42] = aSegment; + aSegmentSeq [43] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 17; aSegment.Count = 1; - aSegmentSeq [43] = aSegment; + aSegmentSeq [44] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 3; - aSegmentSeq [44] = aSegment; + aSegmentSeq [45] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 4; aSegment.Count = 0; - aSegmentSeq [45] = aSegment; + aSegmentSeq [46] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [46] = aSegment; + aSegmentSeq [47] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [47] = aSegment; + aSegmentSeq [48] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [48] = aSegment; + aSegmentSeq [49] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [49] = aSegment; + aSegmentSeq [50] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [50] = aSegment; + aSegmentSeq [51] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [51] = aSegment; + aSegmentSeq [52] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 1; aSegment.Count = 1; - aSegmentSeq [52] = aSegment; + aSegmentSeq [53] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 2; aSegment.Count = 1; - aSegmentSeq [53] = aSegment; + aSegmentSeq [54] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 6; aSegment.Count = 0; - aSegmentSeq [54] = aSegment; + aSegmentSeq [55] = aSegment; } { EnhancedCustomShapeSegment aSegment; aSegment.Command = 5; aSegment.Count = 0; - aSegmentSeq [55] = aSegment; + aSegmentSeq [56] = aSegment; } aPropSequence [1].Value = makeAny (aSegmentSeq); } |