[Libreoffice-commits] .: 2 commits - oox/source svx/source
Radek DoulÃk
rodo at kemper.freedesktop.org
Tue Nov 8 04:02:01 PST 2011
oox/source/drawingml/customshapepresets1.cxx | 1614 ++++++++++++++++++++-
oox/source/drawingml/customshapepresets2.cxx | 1661 +++++++++++++++++++++
oox/source/drawingml/customshapepresets3.cxx | 1673 +++++++++++++++++++++-
oox/source/drawingml/customshapepresets4.cxx | 1579 ++++++++++++++++++++
oox/source/drawingml/customshapepresets5.cxx | 1630 ++++++++++++++++++++-
oox/source/drawingml/customshapepresets6.cxx | 474 ++++++
oox/source/drawingml/customshapeproperties.cxx | 13
oox/source/helper/propertymap.cxx | 40
oox/source/token/properties.txt | 1
svx/source/customshapes/EnhancedCustomShape2d.cxx | 5
10 files changed, 8413 insertions(+), 277 deletions(-)
New commits:
commit 60e35702199f19fa9aa19027d4783937ac7ee834
Author: Radek Doulik <rodo at novell.com>
Date: Tue Nov 8 13:01:02 2011 +0100
fix text frame rectangle for ooxml customshapes
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 76e523e..fa6d3fa 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1149,8 +1149,8 @@ Rectangle EnhancedCustomShape2d::GetTextRect() const
nIndex = 0;
if ( bTextFlow && ( nSize > 1 ) )
nIndex++;
- Point aTopLeft( GetPoint( seqTextFrames[ nIndex ].TopLeft, sal_True, sal_True ) );
- Point aBottomRight( GetPoint( seqTextFrames[ nIndex ].BottomRight, sal_True, sal_True ) );
+ Point aTopLeft( GetPoint( seqTextFrames[ nIndex ].TopLeft, !bOOXMLShape, sal_True ) );
+ Point aBottomRight( GetPoint( seqTextFrames[ nIndex ].BottomRight, !bOOXMLShape, sal_True ) );
if ( bFlipH )
{
aTopLeft.X() = aLogicRect.GetWidth() - aTopLeft.X();
@@ -1162,6 +1162,7 @@ Rectangle EnhancedCustomShape2d::GetTextRect() const
aBottomRight.Y() = aLogicRect.GetHeight() - aBottomRight.Y();
}
Rectangle aRect( aTopLeft, aBottomRight );
+ OSL_TRACE("EnhancedCustomShape2d::GetTextRect: %d x %d", aRect.GetWidth(), aRect.GetHeight());
aRect.Move( aLogicRect.Left(), aLogicRect.Top() );
aRect.Justify();
return aRect;
commit 8ca3ca455abe84672311e08ff6999d7a27010e1d
Author: Radek Doulik <rodo at novell.com>
Date: Tue Nov 8 12:59:51 2011 +0100
use text frame part of customshapes on import
diff --git a/oox/source/drawingml/customshapepresets1.cxx b/oox/source/drawingml/customshapepresets1.cxx
index cdcbf5f..2075b4e 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;
+ }
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list