summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorRadek Doulik <rodo@novell.com>2012-01-10 13:09:51 +0100
committerRadek Doulik <rodo@novell.com>2012-01-10 13:38:53 +0100
commitd0521e28a12e6fbba70d6d866ba37fb6565701f9 (patch)
treeae89e187d753a0301a331898db66aad7f7d4d249 /oox
parent15a19d71f357d1d929cd5d19af7e882e3d589341 (diff)
pptx: regenerate presets after custom shapes moveto/close fix
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/customshapepresets1.cxx22
-rw-r--r--oox/source/drawingml/customshapepresets2.cxx22
-rw-r--r--oox/source/drawingml/customshapepresets3.cxx22
-rw-r--r--oox/source/drawingml/customshapepresets5.cxx66
4 files changed, 48 insertions, 84 deletions
diff --git a/oox/source/drawingml/customshapepresets1.cxx b/oox/source/drawingml/customshapepresets1.cxx
index d0b5c4243646..401355748512 100644
--- a/oox/source/drawingml/customshapepresets1.cxx
+++ b/oox/source/drawingml/customshapepresets1.cxx
@@ -12524,7 +12524,7 @@ void CustomShapeProperties::initializePresetsMap1()
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (13);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (12);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -12557,51 +12557,45 @@ void CustomShapeProperties::initializePresetsMap1()
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 4;
- aSegment.Count = 0;
- aSegmentSeq [5] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [6] = aSegment;
+ aSegmentSeq [5] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [7] = aSegment;
+ aSegmentSeq [6] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [8] = aSegment;
+ aSegmentSeq [7] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [9] = aSegment;
+ aSegmentSeq [8] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [10] = aSegment;
+ aSegmentSeq [9] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [11] = aSegment;
+ aSegmentSeq [10] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [12] = aSegment;
+ aSegmentSeq [11] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
diff --git a/oox/source/drawingml/customshapepresets2.cxx b/oox/source/drawingml/customshapepresets2.cxx
index 9cccf75525a9..8f6a98badbe8 100644
--- a/oox/source/drawingml/customshapepresets2.cxx
+++ b/oox/source/drawingml/customshapepresets2.cxx
@@ -16609,7 +16609,7 @@ void CustomShapeProperties::initializePresetsMap2()
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (14);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (13);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -16648,51 +16648,45 @@ void CustomShapeProperties::initializePresetsMap2()
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 4;
- aSegment.Count = 0;
- aSegmentSeq [6] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [7] = aSegment;
+ aSegmentSeq [6] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [8] = aSegment;
+ aSegmentSeq [7] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [9] = aSegment;
+ aSegmentSeq [8] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [10] = aSegment;
+ aSegmentSeq [9] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [11] = aSegment;
+ aSegmentSeq [10] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [12] = aSegment;
+ aSegmentSeq [11] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [13] = aSegment;
+ aSegmentSeq [12] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
diff --git a/oox/source/drawingml/customshapepresets3.cxx b/oox/source/drawingml/customshapepresets3.cxx
index fddebabc011a..c6f6af8538ca 100644
--- a/oox/source/drawingml/customshapepresets3.cxx
+++ b/oox/source/drawingml/customshapepresets3.cxx
@@ -11808,7 +11808,7 @@ void CustomShapeProperties::initializePresetsMap3()
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (13);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (12);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -11841,51 +11841,45 @@ void CustomShapeProperties::initializePresetsMap3()
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 4;
- aSegment.Count = 0;
- aSegmentSeq [5] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [6] = aSegment;
+ aSegmentSeq [5] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [7] = aSegment;
+ aSegmentSeq [6] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [8] = aSegment;
+ aSegmentSeq [7] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [9] = aSegment;
+ aSegmentSeq [8] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 3;
- aSegmentSeq [10] = aSegment;
+ aSegmentSeq [9] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [11] = aSegment;
+ aSegmentSeq [10] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [12] = aSegment;
+ aSegmentSeq [11] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
diff --git a/oox/source/drawingml/customshapepresets5.cxx b/oox/source/drawingml/customshapepresets5.cxx
index 7442570f63bc..87452839b3de 100644
--- a/oox/source/drawingml/customshapepresets5.cxx
+++ b/oox/source/drawingml/customshapepresets5.cxx
@@ -533,7 +533,7 @@ void CustomShapeProperties::initializePresetsMap5()
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (14);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (13);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -572,51 +572,45 @@ void CustomShapeProperties::initializePresetsMap5()
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 4;
- aSegment.Count = 0;
- aSegmentSeq [6] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [7] = aSegment;
+ aSegmentSeq [6] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [8] = aSegment;
+ aSegmentSeq [7] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [9] = aSegment;
+ aSegmentSeq [8] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [10] = aSegment;
+ aSegmentSeq [9] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 3;
- aSegmentSeq [11] = aSegment;
+ aSegmentSeq [10] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [12] = aSegment;
+ aSegmentSeq [11] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [13] = aSegment;
+ aSegmentSeq [12] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
@@ -13968,7 +13962,7 @@ void CustomShapeProperties::initializePresetsMap5()
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (14);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (13);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -14007,51 +14001,45 @@ void CustomShapeProperties::initializePresetsMap5()
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 4;
- aSegment.Count = 0;
- aSegmentSeq [6] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [7] = aSegment;
+ aSegmentSeq [6] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [8] = aSegment;
+ aSegmentSeq [7] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [9] = aSegment;
+ aSegmentSeq [8] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [10] = aSegment;
+ aSegmentSeq [9] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 2;
- aSegmentSeq [11] = aSegment;
+ aSegmentSeq [10] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [12] = aSegment;
+ aSegmentSeq [11] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [13] = aSegment;
+ aSegmentSeq [12] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
@@ -18375,7 +18363,7 @@ void CustomShapeProperties::initializePresetsMap5()
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (13);
+ Sequence< EnhancedCustomShapeSegment > aSegmentSeq (12);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -18408,51 +18396,45 @@ void CustomShapeProperties::initializePresetsMap5()
}
{
EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 4;
- aSegment.Count = 0;
- aSegmentSeq [5] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
- aSegmentSeq [6] = aSegment;
+ aSegmentSeq [5] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [7] = aSegment;
+ aSegmentSeq [6] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [8] = aSegment;
+ aSegmentSeq [7] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
- aSegmentSeq [9] = aSegment;
+ aSegmentSeq [8] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 2;
- aSegmentSeq [10] = aSegment;
+ aSegmentSeq [9] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
- aSegmentSeq [11] = aSegment;
+ aSegmentSeq [10] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
- aSegmentSeq [12] = aSegment;
+ aSegmentSeq [11] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}