[Libreoffice-commits] .: 2 commits - oox/source
Radek DoulÃk
rodo at kemper.freedesktop.org
Mon Jan 9 06:11:00 PST 2012
oox/source/drawingml/customshapegeometry.cxx | 6
oox/source/drawingml/customshapepresets1.cxx | 366 ++++++++++++---------
oox/source/drawingml/customshapepresets2.cxx | 430 +++++++++++++++---------
oox/source/drawingml/customshapepresets3.cxx | 468 ++++++++++++++++-----------
oox/source/drawingml/customshapepresets4.cxx | 464 ++++++++++++++++----------
oox/source/drawingml/customshapepresets5.cxx | 428 +++++++++++++++---------
oox/source/drawingml/customshapepresets6.cxx | 118 ++++--
7 files changed, 1401 insertions(+), 879 deletions(-)
New commits:
commit 534e87c5d5edb84f7ee98e1db6c18446afd5cbcb
Author: Radek Doulik <rodo at novell.com>
Date: Mon Jan 9 15:09:19 2012 +0100
regenerated custom shape presets
diff --git a/oox/source/drawingml/customshapepresets1.cxx b/oox/source/drawingml/customshapepresets1.cxx
index beebc82..d0b5c42 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 (27);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (29);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -688,129 +688,141 @@ void CustomShapeProperties::initializePresetsMap1()
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
+ aSegment.Command = 7;
aSegment.Count = 0;
aSegmentSeq [6] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 5;
+ aSegment.Count = 0;
+ aSegmentSeq [7] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [7] = aSegment;
+ aSegmentSeq [8] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 5;
- aSegmentSeq [8] = aSegment;
+ aSegmentSeq [9] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [9] = aSegment;
+ aSegmentSeq [10] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 7;
+ aSegment.Count = 0;
+ aSegmentSeq [11] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [10] = aSegment;
+ aSegmentSeq [12] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [11] = aSegment;
+ aSegmentSeq [13] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 5;
- aSegmentSeq [12] = aSegment;
+ aSegmentSeq [14] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [13] = aSegment;
+ aSegmentSeq [15] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [14] = aSegment;
+ aSegmentSeq [16] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [15] = aSegment;
+ aSegmentSeq [17] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [16] = aSegment;
+ aSegmentSeq [18] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- 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 = 1;
- aSegmentSeq [19] = aSegment;
+ aSegmentSeq [21] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [20] = aSegment;
+ aSegmentSeq [22] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [21] = aSegment;
+ aSegmentSeq [23] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [22] = aSegment;
+ aSegmentSeq [24] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 3;
- aSegmentSeq [23] = aSegment;
+ aSegmentSeq [25] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [24] = aSegment;
+ aSegmentSeq [26] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [25] = aSegment;
+ aSegmentSeq [27] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [26] = aSegment;
+ aSegmentSeq [28] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
@@ -2546,7 +2558,7 @@ void CustomShapeProperties::initializePresetsMap1()
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (22);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (24);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -2579,61 +2591,61 @@ void CustomShapeProperties::initializePresetsMap1()
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
+ aSegment.Command = 7;
aSegment.Count = 0;
aSegmentSeq [5] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 1;
- aSegment.Count = 1;
+ aSegment.Command = 5;
+ aSegment.Count = 0;
aSegmentSeq [6] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 17;
+ aSegment.Command = 1;
aSegment.Count = 1;
aSegmentSeq [7] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 2;
+ aSegment.Command = 17;
aSegment.Count = 1;
aSegmentSeq [8] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 17;
+ aSegment.Command = 2;
aSegment.Count = 1;
aSegmentSeq [9] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 4;
- aSegment.Count = 0;
+ aSegment.Command = 17;
+ aSegment.Count = 1;
aSegmentSeq [10] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
+ aSegment.Command = 4;
aSegment.Count = 0;
aSegmentSeq [11] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 1;
- aSegment.Count = 1;
+ aSegment.Command = 7;
+ aSegment.Count = 0;
aSegmentSeq [12] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 17;
- aSegment.Count = 1;
+ aSegment.Command = 5;
+ aSegment.Count = 0;
aSegmentSeq [13] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 2;
+ aSegment.Command = 1;
aSegment.Count = 1;
aSegmentSeq [14] = aSegment;
}
@@ -2658,7 +2670,7 @@ void CustomShapeProperties::initializePresetsMap1()
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
- aSegment.Count = 4;
+ aSegment.Count = 1;
aSegmentSeq [18] = aSegment;
}
{
@@ -2669,15 +2681,27 @@ void CustomShapeProperties::initializePresetsMap1()
}
{
EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 2;
+ aSegment.Count = 4;
+ aSegmentSeq [20] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 17;
+ aSegment.Count = 1;
+ aSegmentSeq [21] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [20] = aSegment;
+ aSegmentSeq [22] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [21] = aSegment;
+ aSegmentSeq [23] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
@@ -4142,7 +4166,7 @@ void CustomShapeProperties::initializePresetsMap1()
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (26);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (28);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -4187,117 +4211,129 @@ void CustomShapeProperties::initializePresetsMap1()
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
+ aSegment.Command = 7;
aSegment.Count = 0;
aSegmentSeq [7] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 5;
+ aSegment.Count = 0;
+ aSegmentSeq [8] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [8] = aSegment;
+ aSegmentSeq [9] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 17;
aSegment.Count = 2;
- aSegmentSeq [9] = aSegment;
+ aSegmentSeq [10] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [10] = aSegment;
+ aSegmentSeq [11] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [11] = aSegment;
+ aSegmentSeq [12] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 7;
+ aSegment.Count = 0;
+ aSegmentSeq [13] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [12] = aSegment;
+ aSegmentSeq [14] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [13] = aSegment;
+ aSegmentSeq [15] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 3;
- aSegmentSeq [14] = aSegment;
+ aSegmentSeq [16] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 17;
aSegment.Count = 2;
- aSegmentSeq [15] = aSegment;
+ aSegmentSeq [17] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 6;
- aSegmentSeq [16] = aSegment;
+ aSegmentSeq [18] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 17;
aSegment.Count = 1;
- aSegmentSeq [17] = aSegment;
+ aSegmentSeq [19] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 3;
- aSegmentSeq [18] = aSegment;
+ aSegmentSeq [20] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- 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 = 1;
aSegment.Count = 1;
- aSegmentSeq [22] = aSegment;
+ aSegmentSeq [24] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [23] = aSegment;
+ aSegmentSeq [25] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [24] = aSegment;
+ aSegmentSeq [26] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [25] = aSegment;
+ aSegmentSeq [27] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
@@ -5437,7 +5473,7 @@ void CustomShapeProperties::initializePresetsMap1()
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (37);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (40);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -5476,189 +5512,207 @@ void CustomShapeProperties::initializePresetsMap1()
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
+ aSegment.Command = 7;
aSegment.Count = 0;
aSegmentSeq [6] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 5;
+ aSegment.Count = 0;
+ aSegmentSeq [7] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [7] = aSegment;
+ aSegmentSeq [8] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 17;
aSegment.Count = 1;
- aSegmentSeq [8] = aSegment;
+ aSegmentSeq [9] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [9] = aSegment;
+ aSegmentSeq [10] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [10] = aSegment;
+ aSegmentSeq [11] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 17;
aSegment.Count = 1;
- aSegmentSeq [11] = aSegment;
+ aSegmentSeq [12] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [12] = aSegment;
+ aSegmentSeq [13] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 9;
- aSegmentSeq [13] = aSegment;
+ aSegmentSeq [14] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [14] = aSegment;
+ aSegmentSeq [15] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 7;
+ aSegment.Count = 0;
+ aSegmentSeq [16] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [15] = aSegment;
+ aSegmentSeq [17] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [16] = aSegment;
+ aSegmentSeq [18] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 17;
aSegment.Count = 1;
- 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 = 9;
- aSegmentSeq [19] = aSegment;
+ aSegmentSeq [21] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [20] = aSegment;
+ aSegmentSeq [22] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 7;
+ aSegment.Count = 0;
+ aSegmentSeq [23] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [21] = aSegment;
+ aSegmentSeq [24] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [22] = aSegment;
+ aSegmentSeq [25] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 17;
aSegment.Count = 1;
- aSegmentSeq [23] = aSegment;
+ aSegmentSeq [26] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [24] = aSegment;
+ aSegmentSeq [27] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [25] = aSegment;
+ aSegmentSeq [28] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 17;
aSegment.Count = 1;
- aSegmentSeq [26] = aSegment;
+ aSegmentSeq [29] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [27] = aSegment;
+ aSegmentSeq [30] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 9;
- aSegmentSeq [28] = aSegment;
+ aSegmentSeq [31] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [29] = aSegment;
+ aSegmentSeq [32] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [30] = aSegment;
+ aSegmentSeq [33] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [31] = aSegment;
+ aSegmentSeq [34] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [32] = aSegment;
+ aSegmentSeq [35] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 3;
- aSegmentSeq [33] = aSegment;
+ aSegmentSeq [36] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [34] = aSegment;
+ aSegmentSeq [37] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [35] = aSegment;
+ aSegmentSeq [38] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [36] = aSegment;
+ aSegmentSeq [39] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
@@ -12047,7 +12101,7 @@ void CustomShapeProperties::initializePresetsMap1()
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (12);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (13);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -12116,10 +12170,16 @@ void CustomShapeProperties::initializePresetsMap1()
}
{
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;
+ }
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
aPropertyMap [PROP_Path] <<= aPropSequence;
@@ -13291,7 +13351,7 @@ void CustomShapeProperties::initializePresetsMap1()
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (12);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (13);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -13324,45 +13384,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
+ aSegment.Command = 7;
aSegment.Count = 0;
aSegmentSeq [5] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 5;
+ aSegment.Count = 0;
+ aSegmentSeq [6] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [6] = aSegment;
+ aSegmentSeq [7] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 17;
aSegment.Count = 1;
- aSegmentSeq [7] = aSegment;
+ aSegmentSeq [8] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [8] = aSegment;
+ aSegmentSeq [9] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 17;
aSegment.Count = 1;
- aSegmentSeq [9] = aSegment;
+ aSegmentSeq [10] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [10] = aSegment;
+ aSegmentSeq [11] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [11] = aSegment;
+ aSegmentSeq [12] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
@@ -15630,7 +15696,7 @@ void CustomShapeProperties::initializePresetsMap1()
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (36);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (38);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -15699,153 +15765,165 @@ void CustomShapeProperties::initializePresetsMap1()
}
{
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 = 3;
- aSegmentSeq [13] = aSegment;
+ aSegmentSeq [14] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 3;
- aSegmentSeq [14] = aSegment;
+ aSegmentSeq [15] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 17;
aSegment.Count = 3;
- aSegmentSeq [15] = aSegment;
+ aSegmentSeq [16] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [16] = aSegment;
+ aSegmentSeq [17] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [17] = aSegment;
+ aSegmentSeq [18] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 17;
aSegment.Count = 1;
- aSegmentSeq [18] = aSegment;
+ aSegmentSeq [19] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [19] = aSegment;
+ aSegmentSeq [20] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 7;
+ aSegment.Count = 0;
+ aSegmentSeq [21] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
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 = 17;
aSegment.Count = 3;
- aSegmentSeq [22] = aSegment;
+ aSegmentSeq [24] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 3;
- aSegmentSeq [23] = aSegment;
+ aSegmentSeq [25] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 17;
aSegment.Count = 3;
- aSegmentSeq [24] = aSegment;
+ aSegmentSeq [26] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [25] = aSegment;
+ aSegmentSeq [27] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [26] = aSegment;
+ aSegmentSeq [28] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 17;
aSegment.Count = 1;
- aSegmentSeq [27] = aSegment;
+ aSegmentSeq [29] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [28] = aSegment;
+ aSegmentSeq [30] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [29] = aSegment;
+ aSegmentSeq [31] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- 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 = 4;
aSegment.Count = 0;
- aSegmentSeq [33] = aSegment;
+ aSegmentSeq [35] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [34] = aSegment;
+ aSegmentSeq [36] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [35] = aSegment;
+ aSegmentSeq [37] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
@@ -18384,7 +18462,7 @@ void CustomShapeProperties::initializePresetsMap1()
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (15);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (16);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -18405,75 +18483,81 @@ void CustomShapeProperties::initializePresetsMap1()
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
+ aSegment.Command = 7;
aSegment.Count = 0;
aSegmentSeq [3] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 5;
+ aSegment.Count = 0;
+ aSegmentSeq [4] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [4] = aSegment;
+ aSegmentSeq [5] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [5] = aSegment;
+ aSegmentSeq [6] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [6] = aSegment;
+ aSegmentSeq [7] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [7] = aSegment;
+ aSegmentSeq [8] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [8] = aSegment;
+ aSegmentSeq [9] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [9] = aSegment;
+ aSegmentSeq [10] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [10] = aSegment;
+ aSegmentSeq [11] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 17;
aSegment.Count = 4;
- aSegmentSeq [11] = aSegment;
+ aSegmentSeq [12] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [12] = aSegment;
+ aSegmentSeq [13] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [13] = aSegment;
+ aSegmentSeq [14] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [14] = aSegment;
+ aSegmentSeq [15] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
diff --git a/oox/source/drawingml/customshapepresets2.cxx b/oox/source/drawingml/customshapepresets2.cxx
index 36d79b5..9cccf75 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 (21);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (23);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -2028,93 +2028,105 @@ void CustomShapeProperties::initializePresetsMap2()
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
+ aSegment.Command = 7;
aSegment.Count = 0;
aSegmentSeq [6] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 5;
+ aSegment.Count = 0;
+ aSegmentSeq [7] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [7] = aSegment;
+ aSegmentSeq [8] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 2;
- aSegmentSeq [8] = aSegment;
+ aSegmentSeq [9] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [9] = aSegment;
+ aSegmentSeq [10] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 7;
+ aSegment.Count = 0;
+ aSegmentSeq [11] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [10] = aSegment;
+ aSegmentSeq [12] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [11] = aSegment;
+ aSegmentSeq [13] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 2;
- aSegmentSeq [12] = aSegment;
+ aSegmentSeq [14] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [13] = aSegment;
+ aSegmentSeq [15] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [14] = aSegment;
+ aSegmentSeq [16] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [15] = aSegment;
+ aSegmentSeq [17] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [16] = aSegment;
+ aSegmentSeq [18] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 3;
- aSegmentSeq [17] = aSegment;
+ aSegmentSeq [19] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [18] = aSegment;
+ aSegmentSeq [20] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [19] = aSegment;
+ aSegmentSeq [21] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [20] = aSegment;
+ aSegmentSeq [22] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
@@ -2640,7 +2652,7 @@ void CustomShapeProperties::initializePresetsMap2()
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (17);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (19);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -2673,75 +2685,87 @@ void CustomShapeProperties::initializePresetsMap2()
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
+ aSegment.Command = 7;
aSegment.Count = 0;
aSegmentSeq [5] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 5;
+ aSegment.Count = 0;
+ aSegmentSeq [6] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [6] = aSegment;
+ aSegmentSeq [7] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 17;
aSegment.Count = 2;
- aSegmentSeq [7] = aSegment;
+ aSegmentSeq [8] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [8] = aSegment;
+ aSegmentSeq [9] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 7;
+ aSegment.Count = 0;
+ aSegmentSeq [10] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [9] = aSegment;
+ aSegmentSeq [11] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [10] = aSegment;
+ aSegmentSeq [12] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 17;
aSegment.Count = 2;
- aSegmentSeq [11] = aSegment;
+ aSegmentSeq [13] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [12] = aSegment;
+ aSegmentSeq [14] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 17;
aSegment.Count = 1;
- aSegmentSeq [13] = aSegment;
+ aSegmentSeq [15] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [14] = aSegment;
+ aSegmentSeq [16] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [15] = aSegment;
+ aSegmentSeq [17] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [16] = aSegment;
+ aSegmentSeq [18] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
@@ -3182,7 +3206,7 @@ void CustomShapeProperties::initializePresetsMap2()
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (12);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (14);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -3203,57 +3227,69 @@ void CustomShapeProperties::initializePresetsMap2()
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
+ aSegment.Command = 7;
aSegment.Count = 0;
aSegmentSeq [3] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 5;
+ aSegment.Count = 0;
+ aSegmentSeq [4] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [4] = aSegment;
+ aSegmentSeq [5] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 2;
- aSegmentSeq [5] = aSegment;
+ aSegmentSeq [6] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [6] = aSegment;
+ aSegmentSeq [7] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 7;
+ aSegment.Count = 0;
+ aSegmentSeq [8] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [7] = aSegment;
+ aSegmentSeq [9] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [8] = aSegment;
+ aSegmentSeq [10] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 7;
- aSegmentSeq [9] = aSegment;
+ aSegmentSeq [11] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [10] = aSegment;
+ aSegmentSeq [12] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [11] = aSegment;
+ aSegmentSeq [13] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
@@ -4991,7 +5027,7 @@ void CustomShapeProperties::initializePresetsMap2()
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (15);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (16);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -5012,75 +5048,81 @@ void CustomShapeProperties::initializePresetsMap2()
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
+ aSegment.Command = 7;
aSegment.Count = 0;
aSegmentSeq [3] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 5;
+ aSegment.Count = 0;
+ aSegmentSeq [4] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [4] = aSegment;
+ aSegmentSeq [5] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [5] = aSegment;
+ aSegmentSeq [6] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [6] = aSegment;
+ aSegmentSeq [7] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [7] = aSegment;
+ aSegmentSeq [8] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [8] = aSegment;
+ aSegmentSeq [9] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [9] = aSegment;
+ 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 = 6;
aSegment.Count = 0;
- aSegmentSeq [13] = aSegment;
+ aSegmentSeq [14] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [14] = aSegment;
+ aSegmentSeq [15] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
@@ -11947,7 +11989,7 @@ void CustomShapeProperties::initializePresetsMap2()
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (30);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (32);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -12004,129 +12046,141 @@ void CustomShapeProperties::initializePresetsMap2()
}
{
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 = 2;
- aSegmentSeq [11] = aSegment;
+ aSegmentSeq [12] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [12] = aSegment;
+ aSegmentSeq [13] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [13] = aSegment;
+ aSegmentSeq [14] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 3;
- aSegmentSeq [14] = aSegment;
+ aSegmentSeq [15] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [15] = aSegment;
+ aSegmentSeq [16] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 7;
+ aSegment.Count = 0;
+ aSegmentSeq [17] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [16] = aSegment;
+ aSegmentSeq [18] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [17] = aSegment;
+ aSegmentSeq [19] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 2;
- aSegmentSeq [18] = aSegment;
+ aSegmentSeq [20] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- 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 = 3;
- aSegmentSeq [21] = aSegment;
+ aSegmentSeq [23] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- 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);
}
@@ -13054,7 +13108,7 @@ void CustomShapeProperties::initializePresetsMap2()
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (30);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (32);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -13111,129 +13165,141 @@ void CustomShapeProperties::initializePresetsMap2()
}
{
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 = 2;
- aSegmentSeq [11] = aSegment;
+ aSegmentSeq [12] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [12] = aSegment;
+ aSegmentSeq [13] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [13] = aSegment;
+ aSegmentSeq [14] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 3;
- aSegmentSeq [14] = aSegment;
+ aSegmentSeq [15] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [15] = aSegment;
+ aSegmentSeq [16] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 7;
+ aSegment.Count = 0;
+ aSegmentSeq [17] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [16] = aSegment;
+ aSegmentSeq [18] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [17] = aSegment;
+ aSegmentSeq [19] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 2;
- aSegmentSeq [18] = aSegment;
+ aSegmentSeq [20] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- 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 = 3;
- aSegmentSeq [21] = aSegment;
+ aSegmentSeq [23] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- 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);
}
@@ -13556,7 +13622,7 @@ void CustomShapeProperties::initializePresetsMap2()
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (9);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (10);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -13583,33 +13649,39 @@ void CustomShapeProperties::initializePresetsMap2()
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
+ aSegment.Command = 7;
aSegment.Count = 0;
aSegmentSeq [4] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 5;
+ aSegment.Count = 0;
+ aSegmentSeq [5] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [5] = aSegment;
+ aSegmentSeq [6] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 17;
aSegment.Count = 1;
- aSegmentSeq [6] = aSegment;
+ aSegmentSeq [7] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [7] = aSegment;
+ aSegmentSeq [8] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [8] = aSegment;
+ aSegmentSeq [9] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
@@ -15465,7 +15537,7 @@ void CustomShapeProperties::initializePresetsMap2()
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (36);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (41);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -15486,201 +15558,231 @@ void CustomShapeProperties::initializePresetsMap2()
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
+ aSegment.Command = 7;
aSegment.Count = 0;
aSegmentSeq [3] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 5;
+ aSegment.Count = 0;
+ aSegmentSeq [4] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [4] = aSegment;
+ aSegmentSeq [5] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 3;
- aSegmentSeq [5] = aSegment;
+ aSegmentSeq [6] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [6] = aSegment;
+ aSegmentSeq [7] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 7;
+ aSegment.Count = 0;
+ aSegmentSeq [8] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [7] = aSegment;
+ aSegmentSeq [9] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [8] = aSegment;
+ aSegmentSeq [10] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 3;
- aSegmentSeq [9] = aSegment;
+ aSegmentSeq [11] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [10] = aSegment;
+ aSegmentSeq [12] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 7;
+ aSegment.Count = 0;
+ aSegmentSeq [13] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [11] = aSegment;
+ aSegmentSeq [14] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [12] = aSegment;
+ aSegmentSeq [15] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 3;
- aSegmentSeq [13] = aSegment;
+ aSegmentSeq [16] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [14] = aSegment;
+ aSegmentSeq [17] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 7;
+ aSegment.Count = 0;
+ aSegmentSeq [18] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [15] = aSegment;
+ aSegmentSeq [19] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [16] = aSegment;
+ aSegmentSeq [20] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 3;
- aSegmentSeq [17] = aSegment;
+ aSegmentSeq [21] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [18] = aSegment;
+ aSegmentSeq [22] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 7;
+ aSegment.Count = 0;
+ aSegmentSeq [23] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [19] = aSegment;
+ aSegmentSeq [24] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [20] = aSegment;
+ aSegmentSeq [25] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 3;
- aSegmentSeq [21] = aSegment;
+ aSegmentSeq [26] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [22] = aSegment;
+ aSegmentSeq [27] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [23] = aSegment;
+ aSegmentSeq [28] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 3;
- aSegmentSeq [24] = aSegment;
+ aSegmentSeq [29] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [25] = aSegment;
+ aSegmentSeq [30] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [26] = aSegment;
+ aSegmentSeq [31] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [27] = aSegment;
+ aSegmentSeq [32] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [28] = aSegment;
+ aSegmentSeq [33] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [29] = aSegment;
+ aSegmentSeq [34] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [30] = aSegment;
+ aSegmentSeq [35] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [31] = aSegment;
+ aSegmentSeq [36] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [32] = aSegment;
+ aSegmentSeq [37] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [33] = aSegment;
+ aSegmentSeq [38] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [34] = aSegment;
+ aSegmentSeq [39] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [35] = aSegment;
+ aSegmentSeq [40] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
@@ -16507,7 +16609,7 @@ void CustomShapeProperties::initializePresetsMap2()
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (13);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (14);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -16528,63 +16630,69 @@ void CustomShapeProperties::initializePresetsMap2()
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
+ aSegment.Command = 7;
aSegment.Count = 0;
aSegmentSeq [3] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 5;
+ aSegment.Count = 0;
+ aSegmentSeq [4] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [4] = aSegment;
+ aSegmentSeq [5] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [5] = aSegment;
+ aSegmentSeq [6] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [6] = aSegment;
+ aSegmentSeq [7] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [7] = aSegment;
+ aSegmentSeq [8] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [8] = aSegment;
+ aSegmentSeq [9] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [9] = aSegment;
+ aSegmentSeq [10] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [10] = aSegment;
+ aSegmentSeq [11] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [11] = aSegment;
+ aSegmentSeq [12] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [12] = aSegment;
+ aSegmentSeq [13] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
@@ -16865,7 +16973,7 @@ void CustomShapeProperties::initializePresetsMap2()
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (13);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (14);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -16886,63 +16994,69 @@ void CustomShapeProperties::initializePresetsMap2()
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
+ aSegment.Command = 7;
aSegment.Count = 0;
aSegmentSeq [3] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 5;
+ aSegment.Count = 0;
+ aSegmentSeq [4] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [4] = aSegment;
+ aSegmentSeq [5] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [5] = aSegment;
+ aSegmentSeq [6] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [6] = aSegment;
+ aSegmentSeq [7] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [7] = aSegment;
+ aSegmentSeq [8] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [8] = aSegment;
+ aSegmentSeq [9] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 3;
- aSegmentSeq [9] = aSegment;
+ aSegmentSeq [10] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 4;
aSegment.Count = 0;
- aSegmentSeq [10] = aSegment;
+ aSegmentSeq [11] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [11] = aSegment;
+ aSegmentSeq [12] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [12] = aSegment;
+ aSegmentSeq [13] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
diff --git a/oox/source/drawingml/customshapepresets3.cxx b/oox/source/drawingml/customshapepresets3.cxx
index 854aa45..fddebab 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 (46);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (48);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -2367,67 +2367,67 @@ void CustomShapeProperties::initializePresetsMap3()
}
{
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 = 2;
- aSegmentSeq [16] = aSegment;
+ aSegmentSeq [17] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 16;
aSegment.Count = 1;
- aSegmentSeq [17] = aSegment;
+ aSegmentSeq [18] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 2;
- aSegmentSeq [18] = aSegment;
+ aSegmentSeq [19] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 16;
aSegment.Count = 1;
- aSegmentSeq [19] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 4;
- aSegment.Count = 0;
aSegmentSeq [20] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
+ aSegment.Command = 4;
aSegment.Count = 0;
aSegmentSeq [21] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 1;
- aSegment.Count = 1;
+ aSegment.Command = 7;
+ aSegment.Count = 0;
aSegmentSeq [22] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 16;
- aSegment.Count = 1;
+ aSegment.Command = 5;
+ aSegment.Count = 0;
aSegmentSeq [23] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 2;
+ aSegment.Command = 1;
aSegment.Count = 1;
aSegmentSeq [24] = aSegment;
}
@@ -2452,7 +2452,7 @@ void CustomShapeProperties::initializePresetsMap3()
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
- aSegment.Count = 2;
+ aSegment.Count = 1;
aSegmentSeq [28] = aSegment;
}
{
@@ -2464,7 +2464,7 @@ void CustomShapeProperties::initializePresetsMap3()
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
- aSegment.Count = 1;
+ aSegment.Count = 2;
aSegmentSeq [30] = aSegment;
}
{
@@ -2493,20 +2493,20 @@ void CustomShapeProperties::initializePresetsMap3()
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 4;
- aSegment.Count = 0;
+ aSegment.Command = 16;
+ aSegment.Count = 1;
aSegmentSeq [35] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 1;
+ aSegment.Command = 2;
aSegment.Count = 1;
aSegmentSeq [36] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 2;
- aSegment.Count = 1;
+ aSegment.Command = 4;
+ aSegment.Count = 0;
aSegmentSeq [37] = aSegment;
}
{
@@ -2547,15 +2547,27 @@ void CustomShapeProperties::initializePresetsMap3()
}
{
EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 1;
+ aSegment.Count = 1;
+ aSegmentSeq [44] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 2;
+ aSegment.Count = 1;
+ aSegmentSeq [45] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [44] = aSegment;
+ aSegmentSeq [46] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [45] = aSegment;
+ aSegmentSeq [47] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
@@ -3003,7 +3015,7 @@ void CustomShapeProperties::initializePresetsMap3()
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (8);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (9);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -3024,33 +3036,39 @@ void CustomShapeProperties::initializePresetsMap3()
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
+ aSegment.Command = 7;
aSegment.Count = 0;
aSegmentSeq [3] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 5;
+ aSegment.Count = 0;
+ aSegmentSeq [4] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [4] = aSegment;
+ aSegmentSeq [5] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 2;
- aSegmentSeq [5] = aSegment;
+ aSegmentSeq [6] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [6] = aSegment;
+ aSegmentSeq [7] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [7] = aSegment;
+ aSegmentSeq [8] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
@@ -3968,7 +3986,7 @@ void CustomShapeProperties::initializePresetsMap3()
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (15);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (16);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -3989,75 +4007,81 @@ void CustomShapeProperties::initializePresetsMap3()
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
+ aSegment.Command = 7;
aSegment.Count = 0;
aSegmentSeq [3] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
+ aSegment.Command = 5;
+ aSegment.Count = 0;
+ aSegmentSeq [4] = aSegment;
+ }
+ {
+ EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [4] = aSegment;
+ aSegmentSeq [5] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [5] = aSegment;
+ aSegmentSeq [6] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [6] = aSegment;
+ aSegmentSeq [7] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [7] = aSegment;
+ aSegmentSeq [8] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [8] = aSegment;
+ aSegmentSeq [9] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [9] = aSegment;
+ 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 = 6;
aSegment.Count = 0;
- aSegmentSeq [13] = aSegment;
+ aSegmentSeq [14] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [14] = aSegment;
+ aSegmentSeq [15] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
@@ -6199,7 +6223,7 @@ void CustomShapeProperties::initializePresetsMap3()
}
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list