summaryrefslogtreecommitdiff
path: root/oox/source
diff options
context:
space:
mode:
authorRadek Doulik <rodo@novell.com>2011-11-08 12:59:51 +0100
committerRadek Doulik <rodo@novell.com>2011-11-08 13:01:42 +0100
commit8ca3ca455abe84672311e08ff6999d7a27010e1d (patch)
treec533ba57faf000ee9292c5a8ae05a568f15cc16d /oox/source
parent7d63b777eb7b9b02ba3810c572be6382b7636d61 (diff)
use text frame part of customshapes on import
Diffstat (limited to 'oox/source')
-rw-r--r--oox/source/drawingml/customshapepresets1.cxx1614
-rw-r--r--oox/source/drawingml/customshapepresets2.cxx1661
-rw-r--r--oox/source/drawingml/customshapepresets3.cxx1673
-rw-r--r--oox/source/drawingml/customshapepresets4.cxx1579
-rw-r--r--oox/source/drawingml/customshapepresets5.cxx1630
-rw-r--r--oox/source/drawingml/customshapepresets6.cxx474
-rw-r--r--oox/source/drawingml/customshapeproperties.cxx13
-rw-r--r--oox/source/helper/propertymap.cxx40
-rw-r--r--oox/source/token/properties.txt1
9 files changed, 8410 insertions, 275 deletions
diff --git a/oox/source/drawingml/customshapepresets1.cxx b/oox/source/drawingml/customshapepresets1.cxx
index cdcbf5f99d58..2075b4ee8d38 100644
--- a/oox/source/drawingml/customshapepresets1.cxx
+++ b/oox/source/drawingml/customshapepresets1.cxx
@@ -65,7 +65,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (32);
@@ -814,6 +814,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 22);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 23);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -1004,7 +1049,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (6);
@@ -1171,6 +1216,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -1221,7 +1311,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (16);
@@ -1640,6 +1730,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 1);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 1);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -1881,7 +2016,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (29);
@@ -2546,6 +2681,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 42);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 43);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -2640,7 +2820,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (8);
@@ -2819,6 +2999,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -3045,7 +3270,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (48);
@@ -4076,6 +4301,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 14);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 10);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 15);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -4151,7 +4421,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (56);
@@ -5392,6 +5662,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 25);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 26);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -5580,7 +5895,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (6);
@@ -5723,6 +6038,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -6104,7 +6464,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (9);
@@ -6313,6 +6673,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 193);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 195);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 194);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 196);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -6564,7 +6969,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (11);
@@ -6797,6 +7202,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 22);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 19);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -6890,7 +7340,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (4);
@@ -6997,6 +7447,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -7394,7 +7889,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (46);
@@ -8359,6 +8854,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 210);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 40);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 39);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 121);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -8455,7 +8995,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (6);
@@ -8610,6 +9150,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -8747,7 +9332,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (27);
@@ -9412,6 +9997,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 25);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 38);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 24);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 37);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -9516,7 +10146,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (12);
@@ -9803,6 +10433,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -9899,7 +10574,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (6);
@@ -10042,6 +10717,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 10);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -10064,15 +10784,13 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (8);
+ Sequence< OUString > aStringSequence (6);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*4/5");
aStringSequence[1] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[2] = CREATE_OUSTRING ("logheight/2");
aStringSequence[3] = CREATE_OUSTRING ("logheight");
aStringSequence[4] = CREATE_OUSTRING ("logwidth");
aStringSequence[5] = CREATE_OUSTRING ("logwidth/5");
- aStringSequence[6] = CREATE_OUSTRING ("logwidth/10");
- aStringSequence[7] = CREATE_OUSTRING ("logheight/10");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -10086,7 +10804,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (6);
@@ -10229,6 +10947,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -10324,7 +11087,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (4);
@@ -10431,6 +11194,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -10494,7 +11302,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (5);
@@ -10619,6 +11427,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 12);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 17);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 13);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 16);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -10698,7 +11551,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (9);
@@ -10925,6 +11778,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 35);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 36);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -10947,9 +11845,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (2);
- aStringSequence[0] = CREATE_OUSTRING ("logwidth/10");
- aStringSequence[1] = CREATE_OUSTRING ("logheight/10");
+ Sequence< OUString > aStringSequence (0);
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -11416,7 +12312,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (8);
@@ -11649,6 +12545,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -11796,7 +12737,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (8);
@@ -11975,6 +12916,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 12);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -12081,7 +13067,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (12);
@@ -12380,6 +13366,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -12402,14 +13433,12 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (7);
+ Sequence< OUString > aStringSequence (5);
aStringSequence[0] = CREATE_OUSTRING ("logheight*4/5");
aStringSequence[1] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[2] = CREATE_OUSTRING ("logheight/2");
aStringSequence[3] = CREATE_OUSTRING ("logheight");
aStringSequence[4] = CREATE_OUSTRING ("logwidth");
- aStringSequence[5] = CREATE_OUSTRING ("logwidth/10");
- aStringSequence[6] = CREATE_OUSTRING ("logheight/10");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -12423,7 +13452,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (5);
@@ -12548,6 +13577,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -12696,7 +13770,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (10);
@@ -12911,6 +13985,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 12);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 13);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -12969,7 +14088,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (10);
@@ -13184,6 +14303,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 14);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 15);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -13288,7 +14452,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (65);
@@ -14685,6 +15849,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 24);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 25);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -14854,7 +16063,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (48);
@@ -15753,6 +16962,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 77);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 78);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 79);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 80);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -15962,7 +17216,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (10);
@@ -16213,6 +17467,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 21);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 14);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 22);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 15);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -16357,7 +17656,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (10);
@@ -16572,6 +17871,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 10);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -16636,7 +17980,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (22);
@@ -17133,6 +18477,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -17473,7 +18862,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (8);
@@ -17676,6 +19065,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -17930,7 +19364,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (18);
@@ -18289,6 +19723,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 22);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 24);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 23);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -18311,7 +19790,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (10);
+ Sequence< OUString > aStringSequence (8);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*3/4");
aStringSequence[1] = CREATE_OUSTRING ("logheight*3/4");
aStringSequence[2] = CREATE_OUSTRING ("logwidth/2");
@@ -18320,8 +19799,6 @@ void CustomShapeProperties::initializePresetsMap1()
aStringSequence[5] = CREATE_OUSTRING ("logwidth");
aStringSequence[6] = CREATE_OUSTRING ("logwidth/4");
aStringSequence[7] = CREATE_OUSTRING ("logheight/4");
- aStringSequence[8] = CREATE_OUSTRING ("logwidth/2");
- aStringSequence[9] = CREATE_OUSTRING ("logheight/2");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -18335,7 +19812,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (4);
@@ -18442,6 +19919,51 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 1);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
diff --git a/oox/source/drawingml/customshapepresets2.cxx b/oox/source/drawingml/customshapepresets2.cxx
index fdb2894d64ee..58f62ffd7d02 100644
--- a/oox/source/drawingml/customshapepresets2.cxx
+++ b/oox/source/drawingml/customshapepresets2.cxx
@@ -259,7 +259,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (18);
@@ -618,6 +618,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 22);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 23);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 24);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -640,7 +685,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (9);
+ Sequence< OUString > aStringSequence (7);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*4/5");
aStringSequence[1] = CREATE_OUSTRING ("logwidth*9/10");
aStringSequence[2] = CREATE_OUSTRING ("logwidth/2");
@@ -648,8 +693,6 @@ void CustomShapeProperties::initializePresetsMap2()
aStringSequence[4] = CREATE_OUSTRING ("logheight/2");
aStringSequence[5] = CREATE_OUSTRING ("logheight");
aStringSequence[6] = CREATE_OUSTRING ("logwidth/5");
- aStringSequence[7] = CREATE_OUSTRING ("logwidth/5");
- aStringSequence[8] = CREATE_OUSTRING ("logheight/5");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -663,7 +706,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (4);
@@ -770,6 +813,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -916,7 +1004,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (8);
@@ -1101,6 +1189,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -1200,7 +1333,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (12);
@@ -1451,6 +1584,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 12);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 13);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -1497,7 +1675,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (17);
@@ -1940,6 +2118,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -2049,7 +2272,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (20);
@@ -2522,6 +2745,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -2618,7 +2886,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (16);
@@ -2989,6 +3257,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -3180,7 +3493,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (64);
@@ -4367,6 +4680,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 99);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 100);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 101);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 102);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -4389,15 +4747,13 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (8);
+ Sequence< OUString > aStringSequence (6);
aStringSequence[0] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[1] = CREATE_OUSTRING ("logheight/2");
aStringSequence[2] = CREATE_OUSTRING ("logheight");
aStringSequence[3] = CREATE_OUSTRING ("logwidth");
aStringSequence[4] = CREATE_OUSTRING ("logwidth/8");
aStringSequence[5] = CREATE_OUSTRING ("logheight/8");
- aStringSequence[6] = CREATE_OUSTRING ("logwidth/1");
- aStringSequence[7] = CREATE_OUSTRING ("logheight/1");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -4411,7 +4767,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (12);
@@ -4728,6 +5084,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -4877,7 +5278,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (10);
@@ -5092,6 +5493,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 12);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 13);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -5114,7 +5560,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (14);
+ Sequence< OUString > aStringSequence (12);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*9722/21600");
aStringSequence[1] = CREATE_OUSTRING ("logwidth*5372/21600");
aStringSequence[2] = CREATE_OUSTRING ("logwidth*11612/21600");
@@ -5127,8 +5573,6 @@ void CustomShapeProperties::initializePresetsMap2()
aStringSequence[9] = CREATE_OUSTRING ("logheight*15935/21600");
aStringSequence[10] = CREATE_OUSTRING ("logheight*6645/21600");
aStringSequence[11] = CREATE_OUSTRING ("logwidth");
- aStringSequence[12] = CREATE_OUSTRING ("logwidth/21600");
- aStringSequence[13] = CREATE_OUSTRING ("logheight/21600");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -5142,7 +5586,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (28);
@@ -5681,6 +6125,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 1);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -5831,7 +6320,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (8);
@@ -6028,6 +6517,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 13);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 10);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 14);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -6150,7 +6684,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (24);
@@ -6617,6 +7151,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 22);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 28);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 25);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 31);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -6936,7 +7515,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (19);
@@ -7361,6 +7940,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 34);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 33);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -7403,7 +8027,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (16);
@@ -7798,6 +8422,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 1);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 1);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -8003,7 +8672,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (17);
@@ -8344,6 +9013,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 21);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 19);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 22);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 20);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -8438,7 +9152,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (5);
@@ -8563,6 +9277,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -8609,7 +9368,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (12);
@@ -8860,6 +9619,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -9111,7 +9915,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (11);
@@ -9344,6 +10148,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 19);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 22);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 21);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -9467,7 +10316,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (3);
@@ -9556,6 +10405,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 27);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 29);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 28);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 30);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -9816,7 +10710,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (32);
@@ -10427,6 +11321,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 16);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 24);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 17);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 25);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -10478,7 +11417,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (29);
@@ -11191,6 +12130,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 13);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 14);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -11247,7 +12231,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (9);
@@ -11444,6 +12428,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -11495,7 +12524,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (29);
@@ -12208,6 +13237,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 13);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 14);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -12348,7 +13422,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (7);
@@ -12539,6 +13613,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 36);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 42);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 24);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 30);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -12681,7 +13800,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (32);
@@ -13292,6 +14411,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 51);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 52);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 53);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 54);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -13400,7 +14564,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (4);
@@ -13507,6 +14671,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 10);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 14);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 15);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 16);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -13600,7 +14809,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (36);
@@ -14475,6 +15684,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -14579,7 +15833,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (12);
@@ -14866,6 +16120,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -15056,7 +16355,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (8);
@@ -15289,6 +16588,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -15311,7 +16655,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (10);
+ Sequence< OUString > aStringSequence (8);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*3/4");
aStringSequence[1] = CREATE_OUSTRING ("logheight*3/4");
aStringSequence[2] = CREATE_OUSTRING ("logwidth/2");
@@ -15320,8 +16664,6 @@ void CustomShapeProperties::initializePresetsMap2()
aStringSequence[5] = CREATE_OUSTRING ("logwidth");
aStringSequence[6] = CREATE_OUSTRING ("logwidth/4");
aStringSequence[7] = CREATE_OUSTRING ("logheight/4");
- aStringSequence[8] = CREATE_OUSTRING ("logwidth/2");
- aStringSequence[9] = CREATE_OUSTRING ("logheight/2");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -15335,7 +16677,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (10);
@@ -15604,6 +16946,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 1);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -15716,7 +17103,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (16);
@@ -16039,6 +17426,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 17);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 21);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 20);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 24);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -16093,7 +17525,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (12);
@@ -16380,6 +17812,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -16508,7 +17985,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (5);
@@ -16633,6 +18110,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 19);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 26);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 27);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -16744,7 +18266,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (12);
@@ -16995,6 +18517,51 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 14);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 19);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 17);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 20);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
diff --git a/oox/source/drawingml/customshapepresets3.cxx b/oox/source/drawingml/customshapepresets3.cxx
index 1c7ad03c4c4b..7b58f4c5d50f 100644
--- a/oox/source/drawingml/customshapepresets3.cxx
+++ b/oox/source/drawingml/customshapepresets3.cxx
@@ -163,7 +163,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (13);
@@ -474,6 +474,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 12);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 13);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -626,7 +671,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (4);
@@ -733,6 +778,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 10);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 13);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 15);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 18);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -777,7 +867,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (4);
@@ -884,6 +974,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 1);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -1111,7 +1246,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (57);
@@ -2424,6 +2559,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 17);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 13);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 36);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -2689,7 +2869,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (7);
@@ -2874,6 +3054,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -2995,7 +3220,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (4);
@@ -3108,6 +3333,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 23);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 24);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 25);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 26);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -3208,7 +3478,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (8);
@@ -3387,6 +3657,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 12);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -3409,15 +3724,13 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (8);
+ Sequence< OUString > aStringSequence (6);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*7/8");
aStringSequence[1] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[2] = CREATE_OUSTRING ("logheight/2");
aStringSequence[3] = CREATE_OUSTRING ("logheight");
aStringSequence[4] = CREATE_OUSTRING ("logwidth");
aStringSequence[5] = CREATE_OUSTRING ("logwidth/8");
- aStringSequence[6] = CREATE_OUSTRING ("logwidth/1");
- aStringSequence[7] = CREATE_OUSTRING ("logheight/1");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -3431,7 +3744,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (12);
@@ -3748,6 +4061,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -3770,7 +4128,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (17);
+ Sequence< OUString > aStringSequence (15);
aStringSequence[0] = CREATE_OUSTRING ("logheight*9/10");
aStringSequence[1] = CREATE_OUSTRING ("logheight*4/5");
aStringSequence[2] = CREATE_OUSTRING ("logwidth/2");
@@ -3786,8 +4144,6 @@ void CustomShapeProperties::initializePresetsMap3()
aStringSequence[12] = CREATE_OUSTRING ("(-10800000)/60000.0");
aStringSequence[13] = CREATE_OUSTRING ("(0)/60000.0");
aStringSequence[14] = CREATE_OUSTRING ("(10800000)/60000.0");
- aStringSequence[15] = CREATE_OUSTRING ("logwidth/20");
- aStringSequence[16] = CREATE_OUSTRING ("logheight/20");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -3801,7 +4157,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (10);
@@ -4028,6 +4384,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 1);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -4068,7 +4469,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (4);
@@ -4175,6 +4576,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 1);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -4263,7 +4709,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (4);
@@ -4370,6 +4816,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -4412,7 +4903,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (12);
@@ -4735,6 +5226,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 1);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 1);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -4847,7 +5383,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (6);
@@ -4990,6 +5526,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 19);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 20);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 21);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 22);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -5046,7 +5627,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (9);
@@ -5243,6 +5824,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -5265,7 +5891,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (18);
+ Sequence< OUString > aStringSequence (16);
aStringSequence[0] = CREATE_OUSTRING ("logheight*5/6");
aStringSequence[1] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[2] = CREATE_OUSTRING ("logheight/3");
@@ -5282,8 +5908,6 @@ void CustomShapeProperties::initializePresetsMap3()
aStringSequence[13] = CREATE_OUSTRING ("(10800000)/60000.0");
aStringSequence[14] = CREATE_OUSTRING ("(0)/60000.0");
aStringSequence[15] = CREATE_OUSTRING ("(10800000)/60000.0");
- aStringSequence[16] = CREATE_OUSTRING ("logwidth/6");
- aStringSequence[17] = CREATE_OUSTRING ("logheight/6");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -5297,7 +5921,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (15);
@@ -5680,6 +6304,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -5730,7 +6399,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (7);
@@ -5891,6 +6560,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 12);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 10);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -6081,7 +6795,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (75);
@@ -7760,6 +8474,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 18);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -7893,7 +8652,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (44);
@@ -8864,6 +9623,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 12);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 13);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -8886,14 +9690,12 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (7);
+ Sequence< OUString > aStringSequence (5);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*3/4");
aStringSequence[1] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[2] = CREATE_OUSTRING ("logwidth/4");
aStringSequence[3] = CREATE_OUSTRING ("logheight/2");
aStringSequence[4] = CREATE_OUSTRING ("logheight");
- aStringSequence[5] = CREATE_OUSTRING ("logwidth/2");
- aStringSequence[6] = CREATE_OUSTRING ("logheight/2");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -8907,7 +9709,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (3);
@@ -8996,6 +9798,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -9063,7 +9910,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (57);
@@ -10322,6 +11169,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 29);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 30);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -10662,7 +11554,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (10);
@@ -10931,6 +11823,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -10953,14 +11890,12 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (7);
+ Sequence< OUString > aStringSequence (5);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*3/4");
aStringSequence[1] = CREATE_OUSTRING ("logheight/2");
aStringSequence[2] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[3] = CREATE_OUSTRING ("logheight");
aStringSequence[4] = CREATE_OUSTRING ("logwidth/4");
- aStringSequence[5] = CREATE_OUSTRING ("logwidth/2");
- aStringSequence[6] = CREATE_OUSTRING ("logheight/2");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -10974,7 +11909,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (8);
@@ -11207,6 +12142,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 1);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -11229,7 +12209,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (12);
+ Sequence< OUString > aStringSequence (10);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*4627/21600");
aStringSequence[1] = CREATE_OUSTRING ("logwidth*8485/21600");
aStringSequence[2] = CREATE_OUSTRING ("logwidth*16702/21600");
@@ -11240,8 +12220,6 @@ void CustomShapeProperties::initializePresetsMap3()
aStringSequence[7] = CREATE_OUSTRING ("logheight*13290/21600");
aStringSequence[8] = CREATE_OUSTRING ("logheight");
aStringSequence[9] = CREATE_OUSTRING ("logwidth");
- aStringSequence[10] = CREATE_OUSTRING ("logwidth/21600");
- aStringSequence[11] = CREATE_OUSTRING ("logheight/21600");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -11255,7 +12233,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (24);
@@ -11722,6 +12700,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -11928,7 +12951,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (24);
@@ -12395,6 +13418,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 22);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 19);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 23);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 20);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -12562,7 +13630,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (22);
@@ -13065,6 +14133,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 13);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 14);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 17);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 15);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -13171,7 +14284,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (12);
@@ -13470,6 +14583,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 10);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -13660,7 +14818,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (6);
@@ -13815,6 +14973,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 60);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 68);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 44);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 52);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -13907,7 +15110,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (7);
@@ -14068,6 +15271,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -14232,7 +15480,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (24);
@@ -14741,6 +15989,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 38);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 38);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 39);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 40);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -14823,7 +16116,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (65);
@@ -16130,6 +17423,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 44);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 45);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -16152,7 +17490,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (11);
+ Sequence< OUString > aStringSequence (9);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*5/6");
aStringSequence[1] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[2] = CREATE_OUSTRING ("logheight/2");
@@ -16162,8 +17500,6 @@ void CustomShapeProperties::initializePresetsMap3()
aStringSequence[6] = CREATE_OUSTRING ("(-10800000)/60000.0");
aStringSequence[7] = CREATE_OUSTRING ("(5400000)/60000.0");
aStringSequence[8] = CREATE_OUSTRING ("(10800000)/60000.0");
- aStringSequence[9] = CREATE_OUSTRING ("logwidth/6");
- aStringSequence[10] = CREATE_OUSTRING ("logheight/6");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -16177,7 +17513,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (7);
@@ -16356,6 +17692,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -16612,7 +17993,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (31);
@@ -17271,6 +18652,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 105);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 29);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 27);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 83);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -17424,7 +18850,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (6);
@@ -17567,6 +18993,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 19);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 20);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -17717,7 +19188,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (8);
@@ -17896,6 +19367,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 10);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 12);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 13);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -17988,7 +19504,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (3);
@@ -18077,6 +19593,51 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 1);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
diff --git a/oox/source/drawingml/customshapepresets4.cxx b/oox/source/drawingml/customshapepresets4.cxx
index 49c08398a90f..6d53c1ffe772 100644
--- a/oox/source/drawingml/customshapepresets4.cxx
+++ b/oox/source/drawingml/customshapepresets4.cxx
@@ -119,7 +119,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (11);
@@ -364,6 +364,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 18);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 20);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 19);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 21);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -386,14 +431,12 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (7);
+ Sequence< OUString > aStringSequence (5);
aStringSequence[0] = CREATE_OUSTRING ("logheight*17322/21600");
aStringSequence[1] = CREATE_OUSTRING ("logheight*20172/21600");
aStringSequence[2] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[3] = CREATE_OUSTRING ("logheight/2");
aStringSequence[4] = CREATE_OUSTRING ("logwidth");
- aStringSequence[5] = CREATE_OUSTRING ("logwidth/21600");
- aStringSequence[6] = CREATE_OUSTRING ("logheight/21600");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -407,7 +450,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (6);
@@ -556,6 +599,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -807,7 +895,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (11);
@@ -1040,6 +1128,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 19);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 22);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -1208,7 +1341,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (22);
@@ -1711,6 +1844,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 15);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 14);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 16);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -1733,9 +1911,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (2);
- aStringSequence[0] = CREATE_OUSTRING ("logwidth/10");
- aStringSequence[1] = CREATE_OUSTRING ("logheight/10");
+ Sequence< OUString > aStringSequence (0);
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -1986,15 +2162,13 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (8);
+ Sequence< OUString > aStringSequence (6);
aStringSequence[0] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[1] = CREATE_OUSTRING ("logheight/10");
aStringSequence[2] = CREATE_OUSTRING ("logheight/2");
aStringSequence[3] = CREATE_OUSTRING ("logheight");
aStringSequence[4] = CREATE_OUSTRING ("logwidth");
aStringSequence[5] = CREATE_OUSTRING ("logheight/5");
- aStringSequence[6] = CREATE_OUSTRING ("logwidth/5");
- aStringSequence[7] = CREATE_OUSTRING ("logheight/5");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -2008,7 +2182,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (4);
@@ -2115,6 +2289,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -2137,14 +2356,12 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (7);
+ Sequence< OUString > aStringSequence (5);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*3/4");
aStringSequence[1] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[2] = CREATE_OUSTRING ("logwidth/4");
aStringSequence[3] = CREATE_OUSTRING ("logheight/2");
aStringSequence[4] = CREATE_OUSTRING ("logheight");
- aStringSequence[5] = CREATE_OUSTRING ("logwidth/2");
- aStringSequence[6] = CREATE_OUSTRING ("logheight/2");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -2158,7 +2375,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (3);
@@ -2247,6 +2464,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -2497,7 +2759,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (7);
@@ -2658,6 +2920,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 12);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -2900,7 +3207,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (30);
@@ -3595,6 +3902,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 44);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 43);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -3680,7 +4032,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (65);
@@ -5131,6 +5483,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 23);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 24);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -5153,7 +5550,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (11);
+ Sequence< OUString > aStringSequence (9);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*2/5");
aStringSequence[1] = CREATE_OUSTRING ("logwidth*3/5");
aStringSequence[2] = CREATE_OUSTRING ("logwidth*4/5");
@@ -5163,8 +5560,6 @@ void CustomShapeProperties::initializePresetsMap4()
aStringSequence[6] = CREATE_OUSTRING ("logheight/2");
aStringSequence[7] = CREATE_OUSTRING ("logheight");
aStringSequence[8] = CREATE_OUSTRING ("logwidth/5");
- aStringSequence[9] = CREATE_OUSTRING ("logwidth/5");
- aStringSequence[10] = CREATE_OUSTRING ("logheight/5");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -5178,7 +5573,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (4);
@@ -5285,6 +5680,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -5397,7 +5837,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (24);
@@ -5960,6 +6400,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -6078,7 +6563,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (15);
@@ -6467,6 +6952,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 17);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 20);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 18);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 21);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -6507,7 +7037,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (4);
@@ -6614,6 +7144,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -6779,7 +7354,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (8);
@@ -6970,6 +7545,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 27);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 29);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 28);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 30);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -7134,7 +7754,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (9);
@@ -7343,6 +7963,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 31);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 30);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -7407,7 +8072,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (22);
@@ -7904,6 +8569,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -7926,7 +8636,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (18);
+ Sequence< OUString > aStringSequence (16);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*5022/21600");
aStringSequence[1] = CREATE_OUSTRING ("logwidth*8472/21600");
aStringSequence[2] = CREATE_OUSTRING ("logwidth*8757/21600");
@@ -7943,8 +8653,6 @@ void CustomShapeProperties::initializePresetsMap4()
aStringSequence[13] = CREATE_OUSTRING ("logheight*14915/21600");
aStringSequence[14] = CREATE_OUSTRING ("logwidth");
aStringSequence[15] = CREATE_OUSTRING ("logheight");
- aStringSequence[16] = CREATE_OUSTRING ("logwidth/21600");
- aStringSequence[17] = CREATE_OUSTRING ("logheight/21600");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -7958,7 +8666,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (11);
@@ -8191,6 +8899,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 12);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -8213,7 +8966,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (10);
+ Sequence< OUString > aStringSequence (8);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*5/6");
aStringSequence[1] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[2] = CREATE_OUSTRING ("logheight/2");
@@ -8222,8 +8975,6 @@ void CustomShapeProperties::initializePresetsMap4()
aStringSequence[5] = CREATE_OUSTRING ("logwidth/6");
aStringSequence[6] = CREATE_OUSTRING ("(16200000)/60000.0");
aStringSequence[7] = CREATE_OUSTRING ("(10800000)/60000.0");
- aStringSequence[8] = CREATE_OUSTRING ("logwidth/6");
- aStringSequence[9] = CREATE_OUSTRING ("logheight/6");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -8237,7 +8988,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (6);
@@ -8392,6 +9143,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -8438,7 +9234,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (17);
@@ -8881,6 +9677,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -8974,7 +9815,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (8);
@@ -9171,6 +10012,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -9215,7 +10101,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (3);
@@ -9304,6 +10190,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 1);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -9361,7 +10292,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (11);
@@ -9600,6 +10531,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -9842,7 +10818,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (29);
@@ -10495,6 +11471,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 43);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 44);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -10698,7 +11719,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (12);
@@ -10949,6 +11970,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 18);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 16);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 17);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -11094,7 +12160,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (4);
@@ -11207,6 +12273,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 28);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 30);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 29);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 31);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -11378,7 +12489,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (14);
@@ -11677,6 +12788,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 33);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 35);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 34);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 36);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -11935,7 +13091,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (13);
@@ -12228,6 +13384,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 25);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 24);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -12352,7 +13553,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (20);
@@ -12747,6 +13948,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 25);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 31);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 28);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 32);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -12894,7 +14140,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (7);
@@ -13055,6 +14301,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 12);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 13);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -13298,7 +14589,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (29);
@@ -13963,6 +15254,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 44);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 45);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -14057,7 +15393,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (5);
@@ -14182,6 +15518,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -14419,7 +15800,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (58);
@@ -15750,6 +17131,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 43);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 13);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 36);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -15848,7 +17274,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (12);
@@ -16099,6 +17525,51 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
diff --git a/oox/source/drawingml/customshapepresets5.cxx b/oox/source/drawingml/customshapepresets5.cxx
index af5b45ef5c2e..8157602aa86c 100644
--- a/oox/source/drawingml/customshapepresets5.cxx
+++ b/oox/source/drawingml/customshapepresets5.cxx
@@ -345,7 +345,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (10);
@@ -614,6 +614,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -1008,7 +1053,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (10);
@@ -1241,6 +1286,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 206);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 208);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 207);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 209);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -1388,7 +1478,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (7);
@@ -1549,6 +1639,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 12);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -1571,14 +1706,12 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (7);
+ Sequence< OUString > aStringSequence (5);
aStringSequence[0] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[1] = CREATE_OUSTRING ("logheight/2");
aStringSequence[2] = CREATE_OUSTRING ("logheight");
aStringSequence[3] = CREATE_OUSTRING ("logwidth");
aStringSequence[4] = CREATE_OUSTRING ("logheight/5");
- aStringSequence[5] = CREATE_OUSTRING ("logwidth/5");
- aStringSequence[6] = CREATE_OUSTRING ("logheight/5");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -1592,7 +1725,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (5);
@@ -1717,6 +1850,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -1867,7 +2045,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (8);
@@ -2046,6 +2224,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 12);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 13);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -2183,7 +2406,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (62);
@@ -3580,6 +3803,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -3714,7 +3982,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (14);
@@ -4001,6 +4269,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 29);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 37);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 32);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 39);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -4023,9 +4336,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (2);
- aStringSequence[0] = CREATE_OUSTRING ("logwidth/10");
- aStringSequence[1] = CREATE_OUSTRING ("logheight/10");
+ Sequence< OUString > aStringSequence (0);
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -4276,7 +4587,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (56);
+ Sequence< OUString > aStringSequence (54);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*2977/21600");
aStringSequence[1] = CREATE_OUSTRING ("logheight*3262/21600");
aStringSequence[2] = CREATE_OUSTRING ("logwidth*17087/21600");
@@ -4331,8 +4642,6 @@ void CustomShapeProperties::initializePresetsMap5()
aStringSequence[51] = CREATE_OUSTRING ("(739161)/60000.0");
aStringSequence[52] = CREATE_OUSTRING ("(9459261)/60000.0");
aStringSequence[53] = CREATE_OUSTRING ("(711490)/60000.0");
- aStringSequence[54] = CREATE_OUSTRING ("logwidth/43200");
- aStringSequence[55] = CREATE_OUSTRING ("logheight/43200");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -4346,7 +4655,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (56);
@@ -5533,6 +5842,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 1);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -5628,7 +5982,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (23);
@@ -6179,6 +6533,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -6337,7 +6736,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (13);
@@ -6648,6 +7047,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 12);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 13);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -6670,7 +7114,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (9);
+ Sequence< OUString > aStringSequence (7);
aStringSequence[0] = CREATE_OUSTRING ("logheight*3675/21600");
aStringSequence[1] = CREATE_OUSTRING ("logheight*20782/21600");
aStringSequence[2] = CREATE_OUSTRING ("logwidth*9298/21600");
@@ -6678,8 +7122,6 @@ void CustomShapeProperties::initializePresetsMap5()
aStringSequence[4] = CREATE_OUSTRING ("logwidth*18595/21600");
aStringSequence[5] = CREATE_OUSTRING ("logheight/2");
aStringSequence[6] = CREATE_OUSTRING ("logwidth");
- aStringSequence[7] = CREATE_OUSTRING ("logwidth/21600");
- aStringSequence[8] = CREATE_OUSTRING ("logheight/21600");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -6693,7 +7135,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (60);
@@ -8006,6 +8448,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 1);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -8056,7 +8543,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (30);
@@ -8769,6 +9256,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 12);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 13);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -8791,7 +9323,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (14);
+ Sequence< OUString > aStringSequence (12);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*1018/21600");
aStringSequence[1] = CREATE_OUSTRING ("logwidth*20582/21600");
aStringSequence[2] = CREATE_OUSTRING ("logheight*3163/21600");
@@ -8804,8 +9336,6 @@ void CustomShapeProperties::initializePresetsMap5()
aStringSequence[9] = CREATE_OUSTRING ("(10800000)/60000.0");
aStringSequence[10] = CREATE_OUSTRING ("(5400000)/60000.0");
aStringSequence[11] = CREATE_OUSTRING ("(10800000)/60000.0");
- aStringSequence[12] = CREATE_OUSTRING ("logwidth/21600");
- aStringSequence[13] = CREATE_OUSTRING ("logheight/21600");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -8819,7 +9349,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (7);
@@ -8998,6 +9528,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 1);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -9047,7 +9622,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (5);
@@ -9184,6 +9759,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -9380,7 +10000,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (13);
@@ -9649,6 +10269,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 14);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 15);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -9786,7 +10451,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (62);
@@ -11177,6 +11842,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -11315,7 +12025,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (5);
@@ -11440,6 +12150,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -11859,7 +12614,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (12);
@@ -12134,6 +12889,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 231);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 233);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 232);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 234);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -12281,7 +13081,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (16);
@@ -12604,6 +13404,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 37);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 36);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -12869,7 +13714,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (9);
@@ -13120,6 +13965,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -13142,7 +14032,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (18);
+ Sequence< OUString > aStringSequence (16);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*2/3");
aStringSequence[1] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[2] = CREATE_OUSTRING ("logheight/2");
@@ -13159,8 +14049,6 @@ void CustomShapeProperties::initializePresetsMap5()
aStringSequence[13] = CREATE_OUSTRING ("(10800000)/60000.0");
aStringSequence[14] = CREATE_OUSTRING ("(5400000)/60000.0");
aStringSequence[15] = CREATE_OUSTRING ("(10800000)/60000.0");
- aStringSequence[16] = CREATE_OUSTRING ("logwidth/6");
- aStringSequence[17] = CREATE_OUSTRING ("logheight/6");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -13174,7 +14062,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (17);
@@ -13605,6 +14493,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -13754,7 +14687,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (6);
@@ -13897,6 +14830,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 12);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 15);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -14162,7 +15140,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (7);
@@ -14347,6 +15325,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -14459,7 +15482,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (18);
@@ -14836,6 +15859,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 10);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 13);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 14);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -14858,7 +15926,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (9);
+ Sequence< OUString > aStringSequence (7);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*3/4");
aStringSequence[1] = CREATE_OUSTRING ("logheight*3/4");
aStringSequence[2] = CREATE_OUSTRING ("logwidth/2");
@@ -14866,8 +15934,6 @@ void CustomShapeProperties::initializePresetsMap5()
aStringSequence[4] = CREATE_OUSTRING ("logheight");
aStringSequence[5] = CREATE_OUSTRING ("logwidth/4");
aStringSequence[6] = CREATE_OUSTRING ("logheight/4");
- aStringSequence[7] = CREATE_OUSTRING ("logwidth/2");
- aStringSequence[8] = CREATE_OUSTRING ("logheight/2");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -14881,7 +15947,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (6);
@@ -15024,6 +16090,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 5);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 1);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -15242,7 +16353,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (20);
@@ -15637,6 +16748,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 14);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 10);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 15);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -15675,7 +16831,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (3);
@@ -15764,6 +16920,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 1);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -15882,7 +17083,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (12);
@@ -16133,6 +17334,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 14);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 17);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 23);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 30);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -16200,7 +17446,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (7);
@@ -16361,6 +17607,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 14);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 19);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 17);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 22);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -16401,7 +17692,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (4);
@@ -16508,6 +17799,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -16773,7 +18109,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (9);
@@ -17024,6 +18360,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -17072,7 +18453,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (4);
@@ -17185,6 +18566,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -17436,7 +18862,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (11);
@@ -17669,6 +19095,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 19);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 21);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 22);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -17691,13 +19162,11 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (6);
+ Sequence< OUString > aStringSequence (4);
aStringSequence[0] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[1] = CREATE_OUSTRING ("logheight/2");
aStringSequence[2] = CREATE_OUSTRING ("logheight");
aStringSequence[3] = CREATE_OUSTRING ("logwidth");
- aStringSequence[4] = CREATE_OUSTRING ("logwidth/1");
- aStringSequence[5] = CREATE_OUSTRING ("logheight/1");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -17711,7 +19180,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (4);
@@ -17818,6 +19287,51 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 3);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
diff --git a/oox/source/drawingml/customshapepresets6.cxx b/oox/source/drawingml/customshapepresets6.cxx
index 8aaf5ab71cb6..b100a29def1c 100644
--- a/oox/source/drawingml/customshapepresets6.cxx
+++ b/oox/source/drawingml/customshapepresets6.cxx
@@ -129,7 +129,7 @@ void CustomShapeProperties::initializePresetsMap6()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (10);
@@ -344,6 +344,51 @@ void CustomShapeProperties::initializePresetsMap6()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 24);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 28);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 27);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 30);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -485,7 +530,7 @@ void CustomShapeProperties::initializePresetsMap6()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (2);
@@ -556,6 +601,51 @@ void CustomShapeProperties::initializePresetsMap6()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 1);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -707,7 +797,7 @@ void CustomShapeProperties::initializePresetsMap6()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (15);
@@ -1048,6 +1138,51 @@ void CustomShapeProperties::initializePresetsMap6()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 9);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 13);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 10);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -1388,7 +1523,7 @@ void CustomShapeProperties::initializePresetsMap6()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (8);
@@ -1591,6 +1726,51 @@ void CustomShapeProperties::initializePresetsMap6()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -1790,7 +1970,7 @@ void CustomShapeProperties::initializePresetsMap6()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (9);
@@ -1987,6 +2167,51 @@ void CustomShapeProperties::initializePresetsMap6()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 13);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 17);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -2117,7 +2342,7 @@ void CustomShapeProperties::initializePresetsMap6()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (15);
@@ -2458,6 +2683,51 @@ void CustomShapeProperties::initializePresetsMap6()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 33);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 35);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 34);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 36);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -2558,7 +2828,7 @@ void CustomShapeProperties::initializePresetsMap6()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (4);
@@ -2665,6 +2935,51 @@ void CustomShapeProperties::initializePresetsMap6()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 8);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 10);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 11);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 14);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -2695,7 +3010,7 @@ void CustomShapeProperties::initializePresetsMap6()
aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence;
}
{
- Sequence< OUString > aStringSequence (100);
+ Sequence< OUString > aStringSequence (98);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*$0 /100000");
aStringSequence[1] = CREATE_OUSTRING ("logheight*$1 /100000");
aStringSequence[2] = CREATE_OUSTRING ("logwidth/2");
@@ -2794,8 +3109,6 @@ void CustomShapeProperties::initializePresetsMap6()
aStringSequence[95] = CREATE_OUSTRING ("(739161)/60000.0");
aStringSequence[96] = CREATE_OUSTRING ("(9459261)/60000.0");
aStringSequence[97] = CREATE_OUSTRING ("(711490)/60000.0");
- aStringSequence[98] = CREATE_OUSTRING ("logwidth/43200");
- aStringSequence[99] = CREATE_OUSTRING ("logheight/43200");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -2874,7 +3187,7 @@ void CustomShapeProperties::initializePresetsMap6()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (65);
@@ -4295,6 +4608,51 @@ void CustomShapeProperties::initializePresetsMap6()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 39);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 40);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 41);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 42);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -4485,7 +4843,7 @@ void CustomShapeProperties::initializePresetsMap6()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (6);
@@ -4652,6 +5010,51 @@ void CustomShapeProperties::initializePresetsMap6()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 4);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
@@ -4840,7 +5243,7 @@ void CustomShapeProperties::initializePresetsMap6()
aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
}
{
- Sequence< PropertyValue > aPropSequence (2);
+ Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (74);
@@ -6507,6 +6910,51 @@ void CustomShapeProperties::initializePresetsMap6()
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
+ {
+ aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 6);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 16);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.TopLeft = aParameterPair;
+ }
+ {
+ EnhancedCustomShapeParameterPair aParameterPair;
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 7);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.First = aParameter;
+ }
+ {
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 22);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameterPair.Second = aParameter;
+ }
+ aTextFrame.BottomRight = aParameterPair;
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
aPropertyMap [PROP_Path] <<= aPropSequence;
}
{
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index c2ab21a1f98c..322043d61bf3 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -37,6 +37,7 @@
#include <com/sun/star/graphic/XGraphicTransformer.hpp>
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
+#include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp>
using rtl::OUString;
using namespace ::oox::core;
@@ -114,7 +115,7 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi
aPropertyMap = maPresetsMap[ mnShapePresetType ];
#ifdef DEBUG
- aPropertyMap.dump();
+ aPropertyMap.dumpCode();
#endif
}
else
@@ -214,6 +215,16 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi
for ( i = 0; i < maSegments.size(); i++ )
aSegments[ i ] = maSegments[ i ];
aPath[ PROP_Segments ] <<= aSegments;
+
+ if ( maTextRect.has() ) {
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrames(1);
+ aTextFrames[0].TopLeft.First = maTextRect.get().l;
+ aTextFrames[0].TopLeft.Second = maTextRect.get().t;
+ aTextFrames[0].BottomRight.First = maTextRect.get().r;
+ aTextFrames[0].BottomRight.Second = maTextRect.get().b;
+ aPath[ PROP_TextFrames ] <<= aTextFrames;
+ }
+
sal_uInt32 j, k, nParameterPairs = 0;
for ( i = 0; i < maPath2DList.size(); i++ )
nParameterPairs += maPath2DList[ i ].parameter.size();
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index ec44359b43f3..b4094eb0351e 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -48,6 +48,7 @@ using ::com::sun::star::text::WritingMode;
#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
+#include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp>
#include <com/sun/star/drawing/HomogenMatrix3.hpp>
@@ -473,9 +474,11 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
Sequence< PropertyValue > propArray;
Sequence< Sequence< PropertyValue > > propArrayArray;
Sequence< EnhancedCustomShapeAdjustmentValue > adjArray;
+ Sequence< EnhancedCustomShapeTextFrame > segTextFrame;
Sequence< EnhancedCustomShapeSegment > segArray;
Sequence< EnhancedCustomShapeParameterPair > ppArray;
EnhancedCustomShapeSegment segment;
+ EnhancedCustomShapeTextFrame textFrame;
EnhancedCustomShapeParameterPair pp;
EnhancedCustomShapeParameter par;
awt::Rectangle rect;
@@ -565,6 +568,19 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
fprintf (stderr, "}\n");
}
return "aSegmentSeq";
+ } else if( value >>= segTextFrame ) {
+ printLevel (level);
+ fprintf (stderr, "Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (%"SAL_PRIdINT32");\n", segTextFrame.getLength());
+ for( int i=0; i<segTextFrame.getLength(); i++ ) {
+ printLevel (level);
+ fprintf (stderr, "{\n");
+ const char *var = lclDumpAnyValueCode (makeAny (segTextFrame[i]), level + 1);
+ printLevel (level + 1);
+ fprintf (stderr, "aTextFrameSeq [%d] = %s;\n", i, var);
+ printLevel (level);
+ fprintf (stderr, "}\n");
+ }
+ return "aTextFrameSeq";
} else if( value >>= ppArray ) {
printLevel (level);
fprintf (stderr, "Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (%"SAL_PRIdINT32");\n", ppArray.getLength());
@@ -587,6 +603,30 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
printLevel (level);
fprintf (stderr, "aSegment.Count = %d;\n", segment.Count);
return "aSegment";
+ } else if( value >>= textFrame ) {
+ printLevel (level);
+ fprintf (stderr, "EnhancedCustomShapeTextFrame aTextFrame;\n");
+ printLevel (level);
+ fprintf (stderr, "{\n");
+ {
+ const char* var = lclDumpAnyValueCode( makeAny (textFrame.TopLeft), level + 1 );
+ printLevel (level + 1);
+ fprintf (stderr, "aTextFrame.TopLeft = %s;\n", var);
+ }
+ printLevel (level);
+ fprintf (stderr, "}\n");
+
+ printLevel (level);
+ fprintf (stderr, "{\n");
+ {
+ const char* var = lclDumpAnyValueCode( makeAny (textFrame.BottomRight), level + 1 );
+ printLevel (level + 1);
+ fprintf (stderr, "aTextFrame.BottomRight = %s;\n", var);
+ }
+ printLevel (level);
+ fprintf (stderr, "}\n");
+
+ return "aTextFrame";
} else if( value >>= pp ) {
printLevel (level);
fprintf (stderr, "EnhancedCustomShapeParameterPair aParameterPair;\n");
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 28320662f23d..1469c822442e 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -452,6 +452,7 @@ TextAutoGrowHeight
TextBreak
TextColor
TextFitToSize
+TextFrames
TextHorizontalAdjust
TextLeftDistance
TextLowerDistance