[Libreoffice-commits] .: 5 commits - oox/inc oox/source
Michael Meeks
michael at kemper.freedesktop.org
Fri Mar 2 14:15:48 PST 2012
oox/inc/oox/drawingml/customshapeproperties.hxx | 11
oox/source/drawingml/customshapepresets1.cxx |21780 ++++++------------------
oox/source/drawingml/customshapepresets2.cxx |20305 +++++-----------------
oox/source/drawingml/customshapepresets3.cxx |21565 +++++------------------
oox/source/drawingml/customshapepresets4.cxx |19057 +++++---------------
oox/source/drawingml/customshapepresets5.cxx |20858 +++++-----------------
oox/source/drawingml/customshapepresets6.cxx | 7407 +-------
oox/source/drawingml/customshapeproperties.cxx | 42
oox/source/helper/propertymap.cxx | 220
9 files changed, 27874 insertions(+), 83371 deletions(-)
New commits:
commit 5d49bf62bfa37e78bc711b9c8e4448c58c7d7b85
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri Mar 2 22:13:48 2012 +0000
customshapes: re-generate smaller, faster to compile data.
diff --git a/oox/source/drawingml/customshapepresets1.cxx b/oox/source/drawingml/customshapepresets1.cxx
index 838a0bc..d4708d8 100644
--- a/oox/source/drawingml/customshapepresets1.cxx
+++ b/oox/source/drawingml/customshapepresets1.cxx
@@ -27,40 +27,39 @@ class ShapeCactionButtonSound : public CustomShapeProvider
PropertyMap aPropertyMap;
{
- Sequence< OUString > aStringSequence (0);
- aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
- }
- {
- Sequence< OUString > aStringSequence (24);
- aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)");
- aStringSequence[1] = CREATE_OUSTRING ("?0 *3/8");
- aStringSequence[2] = CREATE_OUSTRING ("logheight/2");
- aStringSequence[3] = CREATE_OUSTRING ("?2 +0-?1 ");
- aStringSequence[4] = CREATE_OUSTRING ("?2 +?1 -0");
- aStringSequence[5] = CREATE_OUSTRING ("logwidth/2");
- aStringSequence[6] = CREATE_OUSTRING ("?5 +0-?1 ");
- aStringSequence[7] = CREATE_OUSTRING ("?5 +?1 -0");
- aStringSequence[8] = CREATE_OUSTRING ("?0 *3/4");
- aStringSequence[9] = CREATE_OUSTRING ("?8 *1/8");
- aStringSequence[10] = CREATE_OUSTRING ("?8 *5/16");
- aStringSequence[11] = CREATE_OUSTRING ("?8 *5/8");
- aStringSequence[12] = CREATE_OUSTRING ("?8 *11/16");
- aStringSequence[13] = CREATE_OUSTRING ("?8 *3/4");
- aStringSequence[14] = CREATE_OUSTRING ("?8 *7/8");
- aStringSequence[15] = CREATE_OUSTRING ("?3 +?9 -0");
- aStringSequence[16] = CREATE_OUSTRING ("?3 +?10 -0");
- aStringSequence[17] = CREATE_OUSTRING ("?3 +?12 -0");
- aStringSequence[18] = CREATE_OUSTRING ("?3 +?14 -0");
- aStringSequence[19] = CREATE_OUSTRING ("?6 +?10 -0");
- aStringSequence[20] = CREATE_OUSTRING ("?6 +?11 -0");
- aStringSequence[21] = CREATE_OUSTRING ("?6 +?13 -0");
- aStringSequence[22] = CREATE_OUSTRING ("logwidth");
- aStringSequence[23] = CREATE_OUSTRING ("logheight");
- aPropertyMap [PROP_Equations] <<= aStringSequence;
- }
- {
- Sequence< OUString > aStringSequence (0);
- aPropertyMap [PROP_Handles] <<= aStringSequence;
+ aPropertyMap [PROP_AdjustmentValues] <<= Sequence< OUString >(0);
+ }
+ {
+ static const char *aStrings[] = {
+ "min(logwidth,logheight)",
+ "?0 *3/8",
+ "logheight/2",
+ "?2 +0-?1 ",
+ "?2 +?1 -0",
+ "logwidth/2",
+ "?5 +0-?1 ",
+ "?5 +?1 -0",
+ "?0 *3/4",
+ "?8 *1/8",
+ "?8 *5/16",
+ "?8 *5/8",
+ "?8 *11/16",
+ "?8 *3/4",
+ "?8 *7/8",
+ "?3 +?9 -0",
+ "?3 +?10 -0",
+ "?3 +?12 -0",
+ "?3 +?14 -0",
+ "?6 +?10 -0",
+ "?6 +?11 -0",
+ "?6 +?13 -0",
+ "logwidth",
+ "logheight"
+ };
+ aPropertyMap [PROP_Equations] <<= createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings );
+ }
+ {
+ aPropertyMap [PROP_Handles] <<= Sequence< OUString >(0);
}
{
aPropertyMap [PROP_MirroredX] <<= Any ((sal_Bool) sal_False);
@@ -72,769 +71,206 @@ class ShapeCactionButtonSound : public CustomShapeProvider
Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
- Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (32);
- {
- 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;
- }
- aParameterPairSeq [0] = 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) 0);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [1] = 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;
- }
- aParameterPairSeq [2] = aParameterPair;
- }
- {
- 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) 23);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [3] = 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) 16);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [4] = 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) 17);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [5] = 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) 17);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [6] = 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) 4);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [7] = 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) 3);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [8] = 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) 16);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [9] = 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) 16);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [10] = 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) 17);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [11] = 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) 17);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [12] = 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) 4);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [13] = 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) 3);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [14] = 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) 16);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [15] = 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) 16);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [16] = 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) 16);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [17] = 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) 3);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [18] = 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) 4);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [19] = 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) 17);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [20] = 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) 17);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [21] = 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) 16);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [22] = 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) 15);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [23] = 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) 2);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [24] = 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) 2);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [25] = 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) 17);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [26] = 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;
- }
- aParameterPairSeq [27] = aParameterPair;
- }
- {
- 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;
- }
- aParameterPairSeq [28] = 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) 0);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [29] = 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;
- }
- aParameterPairSeq [30] = aParameterPair;
- }
- {
- 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) 23);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [31] = aParameterPair;
- }
- aPropSequence [0].Value = makeAny (aParameterPairSeq);
+ static const CustomShapeProvider::ParameterPairData aData[] = {
+ {
+ EnhancedCustomShapeParameterType::NORMAL,
+ EnhancedCustomShapeParameterType::NORMAL,
+ 0, 0
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::NORMAL,
+ 22, 0
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 22, 23
+ },
+ {
+ EnhancedCustomShapeParameterType::NORMAL,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 0, 23
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 6, 16
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 6, 17
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 19, 17
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 20, 4
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 20, 3
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 19, 16
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 6, 16
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 6, 17
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 19, 17
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 20, 4
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 20, 3
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 19, 16
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 6, 16
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 19, 16
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 20, 3
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 20, 4
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 19, 17
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 6, 17
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 21, 16
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 7, 15
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 21, 2
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 7, 2
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 21, 17
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 7, 18
+ },
+ {
+ EnhancedCustomShapeParameterType::NORMAL,
+ EnhancedCustomShapeParameterType::NORMAL,
+ 0, 0
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::NORMAL,
+ 22, 0
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 22, 23
+ },
+ {
+ EnhancedCustomShapeParameterType::NORMAL,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 0, 23
+ }
+ };
+ aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (30);
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 1;
- aSegment.Count = 1;
- aSegmentSeq [0] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 2;
- aSegment.Count = 3;
- aSegmentSeq [1] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 4;
- aSegment.Count = 0;
- aSegmentSeq [2] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 1;
- aSegment.Count = 1;
- aSegmentSeq [3] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 2;
- aSegment.Count = 5;
- aSegmentSeq [4] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 4;
- aSegment.Count = 0;
- aSegmentSeq [5] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 7;
- aSegment.Count = 0;
- aSegmentSeq [6] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
- aSegment.Count = 0;
- aSegmentSeq [7] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 1;
- aSegment.Count = 1;
- aSegmentSeq [8] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 2;
- aSegment.Count = 5;
- aSegmentSeq [9] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 4;
- aSegment.Count = 0;
- aSegmentSeq [10] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 18;
- aSegment.Count = 0;
- aSegmentSeq [11] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 7;
- aSegment.Count = 0;
- aSegmentSeq [12] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
- aSegment.Count = 0;
- aSegmentSeq [13] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 1;
- aSegment.Count = 1;
- aSegmentSeq [14] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 2;
- aSegment.Count = 5;
- aSegmentSeq [15] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 4;
- aSegment.Count = 0;
- aSegmentSeq [16] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 1;
- aSegment.Count = 1;
- aSegmentSeq [17] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 2;
- aSegment.Count = 1;
- aSegmentSeq [18] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 1;
- aSegment.Count = 1;
- aSegmentSeq [19] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 2;
- aSegment.Count = 1;
- aSegmentSeq [20] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 1;
- aSegment.Count = 1;
- aSegmentSeq [21] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 2;
- aSegment.Count = 1;
- aSegmentSeq [22] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 6;
- aSegment.Count = 0;
- aSegmentSeq [23] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
- aSegment.Count = 0;
- aSegmentSeq [24] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 1;
- aSegment.Count = 1;
- aSegmentSeq [25] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 2;
- aSegment.Count = 3;
- aSegmentSeq [26] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 4;
- aSegment.Count = 0;
- aSegmentSeq [27] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 6;
- aSegment.Count = 0;
- aSegmentSeq [28] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
- aSegment.Count = 0;
- aSegmentSeq [29] = aSegment;
- }
- aPropSequence [1].Value = makeAny (aSegmentSeq);
+ static const sal_uInt16 nValues[] = {
+ // Command, Count
+ 1,1,
+ 2,3,
+ 4,0,
+ 1,1,
+ 2,5,
+ 4,0,
+ 7,0,
+ 5,0,
+ 1,1,
+ 2,5,
+ 4,0,
+ 18,0,
+ 7,0,
+ 5,0,
+ 1,1,
+ 2,5,
+ 4,0,
+ 1,1,
+ 2,1,
+ 1,1,
+ 2,1,
+ 1,1,
+ 2,1,
+ 6,0,
+ 5,0,
+ 1,1,
+ 2,3,
+ 4,0,
+ 6,0,
+ 5,0
+ };
+ aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
}
{
aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
@@ -842,40 +278,22 @@ class ShapeCactionButtonSound : public CustomShapeProvider
{
EnhancedCustomShapeTextFrame aTextFrame;
{
- EnhancedCustomShapeParameterPair aParameterPair;
- {
- EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 0);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
- aParameterPair.First = aParameter;
- }
+ static const CustomShapeProvider::ParameterPairData aData =
{
- EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 0);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
- aParameterPair.Second = aParameter;
- }
- aTextFrame.TopLeft = aParameterPair;
+ EnhancedCustomShapeParameterType::NORMAL,
+ EnhancedCustomShapeParameterType::NORMAL,
+ 0, 0
+ };
+ aTextFrame.TopLeft = createParameterPair(&aData);
}
{
- EnhancedCustomShapeParameterPair aParameterPair;
+ static const CustomShapeProvider::ParameterPairData aData =
{
- 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;
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 22, 23
+ };
+ aTextFrame.BottomRight = createParameterPair(&aData);
}
aTextFrameSeq [0] = aTextFrame;
}
@@ -923,16 +341,17 @@ class ShapeCborderCallout1 : public CustomShapeProvider
aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence;
}
{
- Sequence< OUString > aStringSequence (8);
- aStringSequence[0] = CREATE_OUSTRING ("logheight*$0 /100000");
- aStringSequence[1] = CREATE_OUSTRING ("logwidth*$1 /100000");
- aStringSequence[2] = CREATE_OUSTRING ("logheight*$2 /100000");
- aStringSequence[3] = CREATE_OUSTRING ("logwidth*$3 /100000");
- aStringSequence[4] = CREATE_OUSTRING ("logwidth");
- aStringSequence[5] = CREATE_OUSTRING ("logheight/2");
- aStringSequence[6] = CREATE_OUSTRING ("logwidth/2");
- aStringSequence[7] = CREATE_OUSTRING ("logheight");
- aPropertyMap [PROP_Equations] <<= aStringSequence;
+ static const char *aStrings[] = {
+ "logheight*$0 /100000",
+ "logwidth*$1 /100000",
+ "logheight*$2 /100000",
+ "logwidth*$3 /100000",
+ "logwidth",
+ "logheight/2",
+ "logwidth/2",
+ "logheight"
+ };
+ aPropertyMap [PROP_Equations] <<= createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings );
}
{
Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
@@ -940,22 +359,13 @@ class ShapeCborderCallout1 : public CustomShapeProvider
Sequence< PropertyValue > aPropSequence (7);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Position");
- EnhancedCustomShapeParameterPair aParameterPair;
- {
- EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 1);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.First = aParameter;
- }
+ static const CustomShapeProvider::ParameterPairData aData =
{
- EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 0);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aPropSequence [0].Value = makeAny (aParameterPair);
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 1, 0
+ };
+ aPropSequence [0].Value = makeAny (createParameterPair(&aData));
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum");
@@ -1005,22 +415,13 @@ class ShapeCborderCallout1 : public CustomShapeProvider
Sequence< PropertyValue > aPropSequence (7);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Position");
- EnhancedCustomShapeParameterPair aParameterPair;
+ static const CustomShapeProvider::ParameterPairData aData =
{
- 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;
- }
- aPropSequence [0].Value = makeAny (aParameterPair);
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 3, 2
+ };
+ aPropSequence [0].Value = makeAny (createParameterPair(&aData));
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum");
@@ -1078,169 +479,54 @@ class ShapeCborderCallout1 : public CustomShapeProvider
Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
- Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (6);
- {
- 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;
- }
- aParameterPairSeq [0] = 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::NORMAL;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [1] = aParameterPair;
- }
- {
- EnhancedCustomShapeParameterPair aParameterPair;
- {
- EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 4);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.First = aParameter;
- }
+ static const CustomShapeProvider::ParameterPairData aData[] = {
{
- EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 7);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [2] = aParameterPair;
- }
- {
- EnhancedCustomShapeParameterPair aParameterPair;
+ EnhancedCustomShapeParameterType::NORMAL,
+ EnhancedCustomShapeParameterType::NORMAL,
+ 0, 0
+ },
{
- 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;
- }
- aParameterPairSeq [3] = aParameterPair;
- }
- {
- EnhancedCustomShapeParameterPair aParameterPair;
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::NORMAL,
+ 4, 0
+ },
{
- EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 1);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.First = aParameter;
- }
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 4, 7
+ },
{
- EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 0);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [4] = aParameterPair;
- }
- {
- EnhancedCustomShapeParameterPair aParameterPair;
+ EnhancedCustomShapeParameterType::NORMAL,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 0, 7
+ },
{
- EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 3);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.First = aParameter;
- }
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 1, 0
+ },
{
- EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 2);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 3, 2
}
- aParameterPairSeq [5] = aParameterPair;
- }
- aPropSequence [0].Value = makeAny (aParameterPairSeq);
+ };
+ aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (8);
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 1;
- aSegment.Count = 1;
- aSegmentSeq [0] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 2;
- aSegment.Count = 3;
- aSegmentSeq [1] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 4;
- aSegment.Count = 0;
- aSegmentSeq [2] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
- aSegment.Count = 0;
- aSegmentSeq [3] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 1;
- aSegment.Count = 1;
- aSegmentSeq [4] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 2;
- aSegment.Count = 1;
- aSegmentSeq [5] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 6;
- aSegment.Count = 0;
- aSegmentSeq [6] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
- aSegment.Count = 0;
- aSegmentSeq [7] = aSegment;
- }
- aPropSequence [1].Value = makeAny (aSegmentSeq);
+ static const sal_uInt16 nValues[] = {
+ // Command, Count
+ 1,1,
+ 2,3,
+ 4,0,
+ 5,0,
+ 1,1,
+ 2,1,
+ 6,0,
+ 5,0
+ };
+ aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
}
{
aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
@@ -1248,40 +534,22 @@ class ShapeCborderCallout1 : public CustomShapeProvider
{
EnhancedCustomShapeTextFrame aTextFrame;
{
- EnhancedCustomShapeParameterPair aParameterPair;
+ static const CustomShapeProvider::ParameterPairData aData =
{
- 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;
+ EnhancedCustomShapeParameterType::NORMAL,
+ EnhancedCustomShapeParameterType::NORMAL,
+ 0, 0
+ };
+ aTextFrame.TopLeft = createParameterPair(&aData);
}
{
- EnhancedCustomShapeParameterPair aParameterPair;
- {
- EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 4);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.First = aParameter;
- }
+ static const CustomShapeProvider::ParameterPairData aData =
{
- EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 7);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aTextFrame.BottomRight = aParameterPair;
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 4, 7
+ };
+ aTextFrame.BottomRight = createParameterPair(&aData);
}
aTextFrameSeq [0] = aTextFrame;
}
@@ -1309,30 +577,29 @@ class ShapeCplaqueTabs : public CustomShapeProvider
PropertyMap aPropertyMap;
{
- Sequence< OUString > aStringSequence (0);
- aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
+ aPropertyMap [PROP_AdjustmentValues] <<= Sequence< OUString >(0);
}
{
- Sequence< OUString > aStringSequence (14);
- aStringSequence[0] = CREATE_OUSTRING ("sqrt(logwidth*logwidth+logheight*logheight+0*0)");
- aStringSequence[1] = CREATE_OUSTRING ("1*?0 /20");
- aStringSequence[2] = CREATE_OUSTRING ("0+logheight-?1 ");
- aStringSequence[3] = CREATE_OUSTRING ("0+logwidth-?1 ");
- aStringSequence[4] = CREATE_OUSTRING ("logheight");
- aStringSequence[5] = CREATE_OUSTRING ("logwidth");
- aStringSequence[6] = CREATE_OUSTRING ("(0)/60000.0");
- aStringSequence[7] = CREATE_OUSTRING ("(5400000)/60000.0");
- aStringSequence[8] = CREATE_OUSTRING ("(16200000)/60000.0");
- aStringSequence[9] = CREATE_OUSTRING ("(5400000)/60000.0");
- aStringSequence[10] = CREATE_OUSTRING ("(5400000)/60000.0");
- aStringSequence[11] = CREATE_OUSTRING ("(5400000)/60000.0");
- aStringSequence[12] = CREATE_OUSTRING ("(10800000)/60000.0");
- aStringSequence[13] = CREATE_OUSTRING ("(5400000)/60000.0");
- aPropertyMap [PROP_Equations] <<= aStringSequence;
+ static const char *aStrings[] = {
+ "sqrt(logwidth*logwidth+logheight*logheight+0*0)",
+ "1*?0 /20",
+ "0+logheight-?1 ",
+ "0+logwidth-?1 ",
+ "logheight",
+ "logwidth",
+ "(0)/60000.0",
+ "(5400000)/60000.0",
+ "(16200000)/60000.0",
+ "(5400000)/60000.0",
+ "(5400000)/60000.0",
+ "(5400000)/60000.0",
+ "(10800000)/60000.0",
+ "(5400000)/60000.0"
+ };
+ aPropertyMap [PROP_Equations] <<= createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings );
}
{
- Sequence< OUString > aStringSequence (0);
- aPropertyMap [PROP_Handles] <<= aStringSequence;
+ aPropertyMap [PROP_Handles] <<= Sequence< OUString >(0);
}
{
aPropertyMap [PROP_MirroredX] <<= Any ((sal_Bool) sal_False);
@@ -1344,421 +611,116 @@ class ShapeCplaqueTabs : public CustomShapeProvider
Sequence< PropertyValue > aPropSequence (3);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates");
- Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (16);
- {
- 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;
- }
- aParameterPairSeq [0] = 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) 0);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [1] = 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) 1);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [2] = 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;
- }
- aParameterPairSeq [3] = aParameterPair;
- }
- {
- 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;
- }
- aParameterPairSeq [4] = 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) 1);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [5] = 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;
- }
- aParameterPairSeq [6] = aParameterPair;
- }
- {
- 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;
- }
- aParameterPairSeq [7] = 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::NORMAL;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [8] = 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;
- }
- aParameterPairSeq [9] = 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) 1);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [10] = 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;
- }
- aParameterPairSeq [11] = 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;
- }
- aParameterPairSeq [12] = 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) 1);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [13] = 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;
- }
- aParameterPairSeq [14] = 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) 4);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aParameterPairSeq [15] = aParameterPair;
- }
- aPropSequence [0].Value = makeAny (aParameterPairSeq);
+ static const CustomShapeProvider::ParameterPairData aData[] = {
+ {
+ EnhancedCustomShapeParameterType::NORMAL,
+ EnhancedCustomShapeParameterType::NORMAL,
+ 0, 0
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::NORMAL,
+ 1, 0
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 1, 1
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 6, 7
+ },
+ {
+ EnhancedCustomShapeParameterType::NORMAL,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 0, 2
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 1, 1
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 8, 9
+ },
+ {
+ EnhancedCustomShapeParameterType::NORMAL,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 0, 4
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::NORMAL,
+ 5, 0
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 5, 1
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 1, 1
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 10, 11
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 3, 4
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 1, 1
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 12, 13
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 5, 4
+ }
+ };
+ aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("Segments");
- Sequence< EnhancedCustomShapeSegment > aSegmentSeq (20);
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 1;
- aSegment.Count = 1;
- aSegmentSeq [0] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 2;
- aSegment.Count = 1;
- aSegmentSeq [1] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 17;
- aSegment.Count = 1;
- aSegmentSeq [2] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 4;
- aSegment.Count = 0;
- aSegmentSeq [3] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
- aSegment.Count = 0;
- aSegmentSeq [4] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 1;
- aSegment.Count = 1;
- aSegmentSeq [5] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 17;
- aSegment.Count = 1;
- aSegmentSeq [6] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 2;
- aSegment.Count = 1;
- aSegmentSeq [7] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 4;
- aSegment.Count = 0;
- aSegmentSeq [8] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
- aSegment.Count = 0;
- aSegmentSeq [9] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 1;
- aSegment.Count = 1;
- aSegmentSeq [10] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 2;
- aSegment.Count = 1;
- aSegmentSeq [11] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 17;
- aSegment.Count = 1;
- aSegmentSeq [12] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 4;
- aSegment.Count = 0;
- aSegmentSeq [13] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
- aSegment.Count = 0;
- aSegmentSeq [14] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 1;
- aSegment.Count = 1;
- aSegmentSeq [15] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 17;
- aSegment.Count = 1;
- aSegmentSeq [16] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 2;
- aSegment.Count = 1;
- aSegmentSeq [17] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 4;
- aSegment.Count = 0;
- aSegmentSeq [18] = aSegment;
- }
- {
- EnhancedCustomShapeSegment aSegment;
- aSegment.Command = 5;
- aSegment.Count = 0;
- aSegmentSeq [19] = aSegment;
- }
- aPropSequence [1].Value = makeAny (aSegmentSeq);
+ static const sal_uInt16 nValues[] = {
+ // Command, Count
+ 1,1,
+ 2,1,
+ 17,1,
+ 4,0,
+ 5,0,
+ 1,1,
+ 17,1,
+ 2,1,
+ 4,0,
+ 5,0,
+ 1,1,
+ 2,1,
+ 17,1,
+ 4,0,
+ 5,0,
+ 1,1,
+ 17,1,
+ 2,1,
+ 4,0,
+ 5,0
+ };
+ aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
}
{
aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames");
@@ -1766,40 +728,22 @@ class ShapeCplaqueTabs : public CustomShapeProvider
{
EnhancedCustomShapeTextFrame aTextFrame;
{
- EnhancedCustomShapeParameterPair aParameterPair;
- {
- EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 1);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.First = aParameter;
- }
+ static const CustomShapeProvider::ParameterPairData aData =
{
- EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 1);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aTextFrame.TopLeft = aParameterPair;
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 1, 1
+ };
+ aTextFrame.TopLeft = createParameterPair(&aData);
}
{
- EnhancedCustomShapeParameterPair aParameterPair;
+ static const CustomShapeProvider::ParameterPairData aData =
{
- 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;
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 3, 2
+ };
+ aTextFrame.BottomRight = createParameterPair(&aData);
}
aTextFrameSeq [0] = aTextFrame;
}
@@ -1843,69 +787,70 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider
aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence;
}
{
- Sequence< OUString > aStringSequence (61);
- aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)");
- aStringSequence[1] = CREATE_OUSTRING ("50000*logheight/?0 ");
- aStringSequence[2] = CREATE_OUSTRING ("if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))");
- aStringSequence[3] = CREATE_OUSTRING ("if(0-$0 ,0,if(?2 -$0 ,$0 ,?2 ))");
- aStringSequence[4] = CREATE_OUSTRING ("?0 *?3 /100000");
- aStringSequence[5] = CREATE_OUSTRING ("?0 *?2 /100000");
- aStringSequence[6] = CREATE_OUSTRING ("(?4 +?5 )/4");
- aStringSequence[7] = CREATE_OUSTRING ("logheight/2");
- aStringSequence[8] = CREATE_OUSTRING ("?7 +0-?6 ");
- aStringSequence[9] = CREATE_OUSTRING ("?8 *2/1");
- aStringSequence[10] = CREATE_OUSTRING ("?9 *?9 /1");
- aStringSequence[11] = CREATE_OUSTRING ("?4 *?4 /1");
- aStringSequence[12] = CREATE_OUSTRING ("?10 +0-?11 ");
- aStringSequence[13] = CREATE_OUSTRING ("sqrt(?12 )");
- aStringSequence[14] = CREATE_OUSTRING ("?13 *logwidth/?9 ");
- aStringSequence[15] = CREATE_OUSTRING ("100000*?14 /?0 ");
- aStringSequence[16] = CREATE_OUSTRING ("if(0-$2 ,0,if(?15 -$2 ,$2 ,?15 ))");
- aStringSequence[17] = CREATE_OUSTRING ("?0 *?16 /100000");
- aStringSequence[18] = CREATE_OUSTRING ("?8 +?4 -0");
- aStringSequence[19] = CREATE_OUSTRING ("logwidth*logwidth/1");
- aStringSequence[20] = CREATE_OUSTRING ("?17 *?17 /1");
- aStringSequence[21] = CREATE_OUSTRING ("?19 +0-?20 ");
- aStringSequence[22] = CREATE_OUSTRING ("sqrt(?21 )");
- aStringSequence[23] = CREATE_OUSTRING ("?22 *?8 /logwidth");
- aStringSequence[24] = CREATE_OUSTRING ("?8 +?23 -0");
- aStringSequence[25] = CREATE_OUSTRING ("?18 +?23 -0");
- aStringSequence[26] = CREATE_OUSTRING ("?5 +0-?4 ");
- aStringSequence[27] = CREATE_OUSTRING ("?26 *1/2");
- aStringSequence[28] = CREATE_OUSTRING ("?24 +0-?27 ");
- aStringSequence[29] = CREATE_OUSTRING ("?25 +?27 -0");
- aStringSequence[30] = CREATE_OUSTRING ("?5 *1/2");
- aStringSequence[31] = CREATE_OUSTRING ("logheight+0-?30 ");
- aStringSequence[32] = CREATE_OUSTRING ("0+?17 -0");
- aStringSequence[33] = CREATE_OUSTRING ("(10800000*atan2(?23 ,?17 ))/pi");
- aStringSequence[34] = CREATE_OUSTRING ("0+0-?33 ");
- aStringSequence[35] = CREATE_OUSTRING ("0+?14 -0");
- aStringSequence[36] = CREATE_OUSTRING ("(?8 +?18 )/2");
- aStringSequence[37] = CREATE_OUSTRING ("?4 *1/2");
- aStringSequence[38] = CREATE_OUSTRING ("(10800000*atan2(?37 ,?14 ))/pi");
- aStringSequence[39] = CREATE_OUSTRING ("?38 +0-?33 ");
- aStringSequence[40] = CREATE_OUSTRING ("?33 +?38 -0");
- aStringSequence[41] = CREATE_OUSTRING ("0+0-?38 ");
- aStringSequence[42] = CREATE_OUSTRING ("logwidth");
- aStringSequence[43] = CREATE_OUSTRING ("logheight");
- aStringSequence[44] = CREATE_OUSTRING ("logwidth");
- aStringSequence[45] = CREATE_OUSTRING ("(?33 )/60000.0");
- aStringSequence[46] = CREATE_OUSTRING ("(?39 )/60000.0");
- aStringSequence[47] = CREATE_OUSTRING ("(?41 )/60000.0");
- aStringSequence[48] = CREATE_OUSTRING ("(?40 )/60000.0");
- aStringSequence[49] = CREATE_OUSTRING ("(0)/60000.0");
- aStringSequence[50] = CREATE_OUSTRING ("(-5400000)/60000.0");
- aStringSequence[51] = CREATE_OUSTRING ("(16200000)/60000.0");
- aStringSequence[52] = CREATE_OUSTRING ("(5400000)/60000.0");
- aStringSequence[53] = CREATE_OUSTRING ("(0)/60000.0");
- aStringSequence[54] = CREATE_OUSTRING ("(-5400000)/60000.0");
- aStringSequence[55] = CREATE_OUSTRING ("(16200000)/60000.0");
- aStringSequence[56] = CREATE_OUSTRING ("(5400000)/60000.0");
- aStringSequence[57] = CREATE_OUSTRING ("(0)/60000.0");
- aStringSequence[58] = CREATE_OUSTRING ("(?33 )/60000.0");
- aStringSequence[59] = CREATE_OUSTRING ("(?33 )/60000.0");
- aStringSequence[60] = CREATE_OUSTRING ("(?39 )/60000.0");
- aPropertyMap [PROP_Equations] <<= aStringSequence;
+ static const char *aStrings[] = {
+ "min(logwidth,logheight)",
+ "50000*logheight/?0 ",
+ "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
+ "if(0-$0 ,0,if(?2 -$0 ,$0 ,?2 ))",
+ "?0 *?3 /100000",
+ "?0 *?2 /100000",
+ "(?4 +?5 )/4",
+ "logheight/2",
+ "?7 +0-?6 ",
+ "?8 *2/1",
+ "?9 *?9 /1",
+ "?4 *?4 /1",
+ "?10 +0-?11 ",
+ "sqrt(?12 )",
+ "?13 *logwidth/?9 ",
+ "100000*?14 /?0 ",
+ "if(0-$2 ,0,if(?15 -$2 ,$2 ,?15 ))",
+ "?0 *?16 /100000",
+ "?8 +?4 -0",
+ "logwidth*logwidth/1",
+ "?17 *?17 /1",
+ "?19 +0-?20 ",
+ "sqrt(?21 )",
+ "?22 *?8 /logwidth",
+ "?8 +?23 -0",
+ "?18 +?23 -0",
+ "?5 +0-?4 ",
+ "?26 *1/2",
+ "?24 +0-?27 ",
+ "?25 +?27 -0",
+ "?5 *1/2",
+ "logheight+0-?30 ",
+ "0+?17 -0",
+ "(10800000*atan2(?23 ,?17 ))/pi",
+ "0+0-?33 ",
+ "0+?14 -0",
+ "(?8 +?18 )/2",
+ "?4 *1/2",
+ "(10800000*atan2(?37 ,?14 ))/pi",
+ "?38 +0-?33 ",
+ "?33 +?38 -0",
+ "0+0-?38 ",
+ "logwidth",
+ "logheight",
+ "logwidth",
+ "(?33 )/60000.0",
+ "(?39 )/60000.0",
+ "(?41 )/60000.0",
+ "(?40 )/60000.0",
+ "(0)/60000.0",
+ "(-5400000)/60000.0",
+ "(16200000)/60000.0",
+ "(5400000)/60000.0",
+ "(0)/60000.0",
+ "(-5400000)/60000.0",
+ "(16200000)/60000.0",
+ "(5400000)/60000.0",
+ "(0)/60000.0",
+ "(?33 )/60000.0",
+ "(?33 )/60000.0",
+ "(?39 )/60000.0"
+ };
+ aPropertyMap [PROP_Equations] <<= createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings );
}
{
Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
@@ -1913,22 +858,13 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider
Sequence< PropertyValue > aPropSequence (4);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Position");
- EnhancedCustomShapeParameterPair aParameterPair;
- {
- EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 32);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.First = aParameter;
- }
+ static const CustomShapeProvider::ParameterPairData aData =
{
- EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 24);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aPropSequence [0].Value = makeAny (aParameterPair);
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 32, 24
+ };
+ aPropSequence [0].Value = makeAny (createParameterPair(&aData));
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum");
@@ -1957,22 +893,13 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider
Sequence< PropertyValue > aPropSequence (4);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Position");
- EnhancedCustomShapeParameterPair aParameterPair;
+ static const CustomShapeProvider::ParameterPairData aData =
{
- EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 42);
- 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;
- }
- aPropSequence [0].Value = makeAny (aParameterPair);
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 42, 28
+ };
+ aPropSequence [0].Value = makeAny (createParameterPair(&aData));
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum");
@@ -2001,22 +928,13 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider
Sequence< PropertyValue > aPropSequence (4);
{
aPropSequence [0].Name = CREATE_OUSTRING ("Position");
- EnhancedCustomShapeParameterPair aParameterPair;
- {
- EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 32);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.First = aParameter;
- }
+ static const CustomShapeProvider::ParameterPairData aData =
{
- EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 43);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
- aParameterPair.Second = aParameter;
- }
- aPropSequence [0].Value = makeAny (aParameterPair);
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 32, 43
+ };
+ aPropSequence [0].Value = makeAny (createParameterPair(&aData));
}
{
aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum");
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list