[Libreoffice-commits] core.git: 2 commits - oox/source
Miklos Vajna
vmiklos at collabora.co.uk
Tue Apr 15 05:51:47 PDT 2014
oox/source/drawingml/customshapepresets1.cxx |12660 ++++++++--------
oox/source/drawingml/customshapepresets2.cxx | 8823 +++++------
oox/source/drawingml/customshapepresets3.cxx | 8438 +++-------
oox/source/drawingml/customshapepresets4.cxx | 8463 +++++-----
oox/source/drawingml/customshapepresets5.cxx | 9599 ++++++------
oox/source/drawingml/customshapepresets6.cxx | 3435 ++--
oox/source/drawingml/customshapes/README | 5
oox/source/drawingml/customshapes/generatePresetsCXX.pl | 6
8 files changed, 25713 insertions(+), 25716 deletions(-)
New commits:
commit 0d61650688d0ebe2f557f493d7c440b2a102fa2c
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Apr 15 14:45:13 2014 +0200
oox: update source/drawingml/customshapepresets*
Change-Id: Ic582eb63b9cf9f8f6c757f2e6ed67da5e592e3b8
diff --git a/oox/source/drawingml/customshapepresets1.cxx b/oox/source/drawingml/customshapepresets1.cxx
index 71cdedc..639b644 100644
--- a/oox/source/drawingml/customshapepresets1.cxx
+++ b/oox/source/drawingml/customshapepresets1.cxx
@@ -23,46 +23,164 @@ namespace oox { namespace drawingml {
namespace
{
-class ShapeCactionButtonSound : public CustomShapeProvider
+class ShapeCaccentBorderCallout1 : public CustomShapeProvider
{
virtual PropertyMap getProperties() SAL_OVERRIDE
{
PropertyMap aPropertyMap;
{
- aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+ Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
+ {
+ Any aAny ((sal_Int32) 18750);
+ aAdjSequence [0].Value = aAny;
+ aAdjSequence [0].Name = "adj1";
+ }
+ {
+ Any aAny ((sal_Int32) -8333);
+ aAdjSequence [1].Value = aAny;
+ aAdjSequence [1].Name = "adj2";
+ }
+ {
+ Any aAny ((sal_Int32) 112500);
+ aAdjSequence [2].Value = aAny;
+ aAdjSequence [2].Name = "adj3";
+ }
+ {
+ Any aAny ((sal_Int32) -38333);
+ aAdjSequence [3].Value = aAny;
+ aAdjSequence [3].Name = "adj4";
+ }
+ aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
}
{
static const char *aStrings[] = {
- "min(logwidth,logheight)",
- "?0 *3/8",
+ "logheight*$0 /100000",
+ "logwidth*$1 /100000",
+ "logheight*$2 /100000",
+ "logwidth*$3 /100000",
+ "logwidth",
"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.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
}
{
- aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+ Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+ {
+ Sequence< PropertyValue > aPropSequence (7);
+ {
+ aPropSequence [0].Name = "Position";
+ static const CustomShapeProvider::ParameterPairData aData =
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 1, 0
+ };
+ aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+ }
+ {
+ aPropSequence [1].Name = "RangeXMaximum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [1].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [2].Name = "RangeXMinimum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) -2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [2].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [3].Name = "RangeYMaximum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [3].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [4].Name = "RangeYMinimum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) -2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [4].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [5].Name = "RefX";
+ Any aAny ((sal_Int32) 1);
+ aPropSequence [5].Value = makeAny (aAny);
+ }
+ {
+ aPropSequence [6].Name = "RefY";
+ Any aAny ((sal_Int32) 0);
+ aPropSequence [6].Value = makeAny (aAny);
+ }
+ aPropSequenceSequence [0] = aPropSequence;
+ }
+ {
+ Sequence< PropertyValue > aPropSequence (7);
+ {
+ aPropSequence [0].Name = "Position";
+ static const CustomShapeProvider::ParameterPairData aData =
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 3, 2
+ };
+ aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+ }
+ {
+ aPropSequence [1].Name = "RangeXMaximum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [1].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [2].Name = "RangeXMinimum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) -2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [2].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [3].Name = "RangeYMaximum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [3].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [4].Name = "RangeYMinimum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) -2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [4].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [5].Name = "RefX";
+ Any aAny ((sal_Int32) 3);
+ aPropSequence [5].Value = makeAny (aAny);
+ }
+ {
+ aPropSequence [6].Name = "RefY";
+ Any aAny ((sal_Int32) 2);
+ aPropSequence [6].Value = makeAny (aAny);
+ }
+ aPropSequenceSequence [1] = aPropSequence;
+ }
+ aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
}
{
aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -83,218 +201,80 @@ class ShapeCactionButtonSound : public CustomShapeProvider
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::NORMAL,
- 22, 0
+ 4, 0
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 22, 23
+ 4, 7
},
{
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
+ 0, 7
},
{
EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 6, 16
+ EnhancedCustomShapeParameterType::NORMAL,
+ 1, 0
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 6, 17
+ 1, 7
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 19, 17
+ 1, 0
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 20, 4
- },
+ 3, 2
+ }
+ };
+ aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+ }
+ {
+ aPropSequence [1].Name = "Segments";
+ static const sal_uInt16 nValues[] = {
+ // Command, Count
+ 1,1,
+ 2,3,
+ 4,0,
+ 5,0,
+ 1,1,
+ 2,1,
+ 6,0,
+ 5,0,
+ 1,1,
+ 2,1,
+ 6,0,
+ 5,0
+ };
+ aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+ }
+ {
+ aPropSequence [2].Name = "TextFrames";
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
{
- 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 = "Segments";
- 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 = "TextFrames";
- Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
- {
- EnhancedCustomShapeTextFrame aTextFrame;
- {
- static const CustomShapeProvider::ParameterPairData aData =
- {
- EnhancedCustomShapeParameterType::NORMAL,
- EnhancedCustomShapeParameterType::NORMAL,
- 0, 0
- };
- aTextFrame.TopLeft = createParameterPair(&aData);
- }
+ static const CustomShapeProvider::ParameterPairData aData =
+ {
+ EnhancedCustomShapeParameterType::NORMAL,
+ EnhancedCustomShapeParameterType::NORMAL,
+ 0, 0
+ };
+ aTextFrame.TopLeft = createParameterPair(&aData);
+ }
{
static const CustomShapeProvider::ParameterPairData aData =
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 22, 23
+ 4, 7
};
aTextFrame.BottomRight = createParameterPair(&aData);
}
@@ -312,7 +292,7 @@ class ShapeCactionButtonSound : public CustomShapeProvider
aRectangle.Height = 0;
aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
}
- aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonSound"));
+ aPropertyMap.setProperty( PROP_Type, OUString("ooxml-accentBorderCallout1"));
return aPropertyMap;
}
@@ -320,14 +300,14 @@ class ShapeCactionButtonSound : public CustomShapeProvider
// This is a generated source file. DO NOT EDIT.
-class ShapeCborderCallout1 : public CustomShapeProvider
+class ShapeCaccentBorderCallout2 : public CustomShapeProvider
{
virtual PropertyMap getProperties() SAL_OVERRIDE
{
PropertyMap aPropertyMap;
{
- Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
+ Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (6);
{
Any aAny ((sal_Int32) 18750);
aAdjSequence [0].Value = aAny;
@@ -339,15 +319,25 @@ class ShapeCborderCallout1 : public CustomShapeProvider
aAdjSequence [1].Name = "adj2";
}
{
- Any aAny ((sal_Int32) 112500);
+ Any aAny ((sal_Int32) 18750);
aAdjSequence [2].Value = aAny;
aAdjSequence [2].Name = "adj3";
}
{
- Any aAny ((sal_Int32) -38333);
+ Any aAny ((sal_Int32) -16667);
aAdjSequence [3].Value = aAny;
aAdjSequence [3].Name = "adj4";
}
+ {
+ Any aAny ((sal_Int32) 112500);
+ aAdjSequence [4].Value = aAny;
+ aAdjSequence [4].Name = "adj5";
+ }
+ {
+ Any aAny ((sal_Int32) -46667);
+ aAdjSequence [5].Value = aAny;
+ aAdjSequence [5].Name = "adj6";
+ }
aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
}
{
@@ -356,6 +346,8 @@ class ShapeCborderCallout1 : public CustomShapeProvider
"logwidth*$1 /100000",
"logheight*$2 /100000",
"logwidth*$3 /100000",
+ "logheight*$4 /100000",
+ "logwidth*$5 /100000",
"logwidth",
"logheight/2",
"logwidth/2",
@@ -364,7 +356,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider
aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
}
{
- Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+ Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
{
Sequence< PropertyValue > aPropSequence (7);
{
@@ -477,6 +469,62 @@ class ShapeCborderCallout1 : public CustomShapeProvider
}
aPropSequenceSequence [1] = aPropSequence;
}
+ {
+ Sequence< PropertyValue > aPropSequence (7);
+ {
+ aPropSequence [0].Name = "Position";
+ static const CustomShapeProvider::ParameterPairData aData =
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 5, 4
+ };
+ aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+ }
+ {
+ aPropSequence [1].Name = "RangeXMaximum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [1].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [2].Name = "RangeXMinimum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) -2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [2].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [3].Name = "RangeYMaximum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [3].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [4].Name = "RangeYMinimum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) -2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [4].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [5].Name = "RefX";
+ Any aAny ((sal_Int32) 5);
+ aPropSequence [5].Value = makeAny (aAny);
+ }
+ {
+ aPropSequence [6].Name = "RefY";
+ Any aAny ((sal_Int32) 4);
+ aPropSequence [6].Value = makeAny (aAny);
+ }
+ aPropSequenceSequence [2] = aPropSequence;
+ }
aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
}
{
@@ -498,17 +546,27 @@ class ShapeCborderCallout1 : public CustomShapeProvider
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::NORMAL,
- 4, 0
+ 6, 0
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 4, 7
+ 6, 9
},
{
EnhancedCustomShapeParameterType::NORMAL,
EnhancedCustomShapeParameterType::EQUATION,
- 0, 7
+ 0, 9
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::NORMAL,
+ 1, 0
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 1, 9
},
{
EnhancedCustomShapeParameterType::EQUATION,
@@ -519,6 +577,11 @@ class ShapeCborderCallout1 : public CustomShapeProvider
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
3, 2
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 5, 4
}
};
aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -534,6 +597,10 @@ class ShapeCborderCallout1 : public CustomShapeProvider
1,1,
2,1,
6,0,
+ 5,0,
+ 1,1,
+ 2,2,
+ 6,0,
5,0
};
aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -557,7 +624,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 4, 7
+ 6, 9
};
aTextFrame.BottomRight = createParameterPair(&aData);
}
@@ -575,7 +642,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider
aRectangle.Height = 0;
aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
}
- aPropertyMap.setProperty( PROP_Type, OUString("ooxml-borderCallout1"));
+ aPropertyMap.setProperty( PROP_Type, OUString("ooxml-accentBorderCallout2"));
return aPropertyMap;
}
@@ -583,401 +650,299 @@ class ShapeCborderCallout1 : public CustomShapeProvider
// This is a generated source file. DO NOT EDIT.
-class ShapeCplaqueTabs : public CustomShapeProvider
+class ShapeCaccentBorderCallout3 : public CustomShapeProvider
{
virtual PropertyMap getProperties() SAL_OVERRIDE
{
PropertyMap aPropertyMap;
{
- aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
- }
- {
- 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.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
- }
- {
- aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
- }
- {
- aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
- }
- {
- aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
- }
- {
- Sequence< PropertyValue > aPropSequence (3);
- {
- aPropSequence [0].Name = "Coordinates";
- 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 = "Segments";
- 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 = "TextFrames";
- Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
- {
- EnhancedCustomShapeTextFrame aTextFrame;
- {
- static const CustomShapeProvider::ParameterPairData aData =
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 1, 1
- };
- aTextFrame.TopLeft = createParameterPair(&aData);
- }
- {
- static const CustomShapeProvider::ParameterPairData aData =
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 3, 2
- };
- aTextFrame.BottomRight = createParameterPair(&aData);
- }
- aTextFrameSeq [0] = aTextFrame;
- }
- aPropSequence [2].Value = makeAny (aTextFrameSeq);
- }
- aPropertyMap.setProperty(PROP_Path, aPropSequence);
- }
- {
- awt::Rectangle aRectangle;
- aRectangle.X = 0;
- aRectangle.Y = 0;
- aRectangle.Width = 0;
- aRectangle.Height = 0;
- aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
- }
- aPropertyMap.setProperty( PROP_Type, OUString("ooxml-plaqueTabs"));
-
- return aPropertyMap;
- }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeCcurvedLeftArrow : public CustomShapeProvider
-{
- virtual PropertyMap getProperties() SAL_OVERRIDE
- {
- PropertyMap aPropertyMap;
-
- {
- Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
+ Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (8);
{
- Any aAny ((sal_Int32) 25000);
+ Any aAny ((sal_Int32) 18750);
aAdjSequence [0].Value = aAny;
aAdjSequence [0].Name = "adj1";
}
{
- Any aAny ((sal_Int32) 50000);
+ Any aAny ((sal_Int32) -8333);
aAdjSequence [1].Value = aAny;
aAdjSequence [1].Name = "adj2";
}
{
- Any aAny ((sal_Int32) 25000);
+ Any aAny ((sal_Int32) 18750);
aAdjSequence [2].Value = aAny;
aAdjSequence [2].Name = "adj3";
}
+ {
+ Any aAny ((sal_Int32) -16667);
+ aAdjSequence [3].Value = aAny;
+ aAdjSequence [3].Name = "adj4";
+ }
+ {
+ Any aAny ((sal_Int32) 100000);
+ aAdjSequence [4].Value = aAny;
+ aAdjSequence [4].Name = "adj5";
+ }
+ {
+ Any aAny ((sal_Int32) -16667);
+ aAdjSequence [5].Value = aAny;
+ aAdjSequence [5].Name = "adj6";
+ }
+ {
+ Any aAny ((sal_Int32) 112963);
+ aAdjSequence [6].Value = aAny;
+ aAdjSequence [6].Name = "adj7";
+ }
+ {
+ Any aAny ((sal_Int32) -8333);
+ aAdjSequence [7].Value = aAny;
+ aAdjSequence [7].Name = "adj8";
+ }
aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
}
{
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",
+ "logheight*$0 /100000",
+ "logwidth*$1 /100000",
+ "logheight*$2 /100000",
+ "logwidth*$3 /100000",
+ "logheight*$4 /100000",
+ "logwidth*$5 /100000",
+ "logheight*$6 /100000",
+ "logwidth*$7 /100000",
"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"
+ "logheight/2",
+ "logwidth/2",
+ "logheight"
};
aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
}
{
- Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
+ Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
{
- Sequence< PropertyValue > aPropSequence (4);
+ Sequence< PropertyValue > aPropSequence (7);
{
aPropSequence [0].Name = "Position";
static const CustomShapeProvider::ParameterPairData aData =
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 32, 24
+ 1, 0
};
aPropSequence [0].Value = makeAny (createParameterPair(&aData));
}
{
- aPropSequence [1].Name = "RangeYMaximum";
+ aPropSequence [1].Name = "RangeXMaximum";
EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 2);
+ Any aAny ((sal_Int32) 2147483647);
aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
aPropSequence [1].Value = makeAny (aParameter);
}
{
- aPropSequence [2].Name = "RangeYMinimum";
+ aPropSequence [2].Name = "RangeXMinimum";
EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 0);
+ Any aAny ((sal_Int32) -2147483647);
aParameter.Value = aAny;
aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
aPropSequence [2].Value = makeAny (aParameter);
}
{
- aPropSequence [3].Name = "RefY";
- Any aAny ((sal_Int32) 0);
- aPropSequence [3].Value = makeAny (aAny);
+ aPropSequence [3].Name = "RangeYMaximum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [3].Value = makeAny (aParameter);
}
- aPropSequenceSequence [0] = aPropSequence;
- }
+ {
+ aPropSequence [4].Name = "RangeYMinimum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) -2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [4].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [5].Name = "RefX";
+ Any aAny ((sal_Int32) 1);
+ aPropSequence [5].Value = makeAny (aAny);
+ }
+ {
+ aPropSequence [6].Name = "RefY";
+ Any aAny ((sal_Int32) 0);
+ aPropSequence [6].Value = makeAny (aAny);
+ }
+ aPropSequenceSequence [0] = aPropSequence;
+ }
{
- Sequence< PropertyValue > aPropSequence (4);
+ Sequence< PropertyValue > aPropSequence (7);
{
aPropSequence [0].Name = "Position";
static const CustomShapeProvider::ParameterPairData aData =
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 42, 28
+ 3, 2
};
aPropSequence [0].Value = makeAny (createParameterPair(&aData));
}
{
- aPropSequence [1].Name = "RangeYMaximum";
+ aPropSequence [1].Name = "RangeXMaximum";
EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 1);
+ Any aAny ((sal_Int32) 2147483647);
aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
aPropSequence [1].Value = makeAny (aParameter);
}
{
- aPropSequence [2].Name = "RangeYMinimum";
+ aPropSequence [2].Name = "RangeXMinimum";
EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 0);
+ Any aAny ((sal_Int32) -2147483647);
aParameter.Value = aAny;
aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
aPropSequence [2].Value = makeAny (aParameter);
}
{
- aPropSequence [3].Name = "RefY";
- Any aAny ((sal_Int32) 1);
- aPropSequence [3].Value = makeAny (aAny);
+ aPropSequence [3].Name = "RangeYMaximum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [3].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [4].Name = "RangeYMinimum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) -2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [4].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [5].Name = "RefX";
+ Any aAny ((sal_Int32) 3);
+ aPropSequence [5].Value = makeAny (aAny);
+ }
+ {
+ aPropSequence [6].Name = "RefY";
+ Any aAny ((sal_Int32) 2);
+ aPropSequence [6].Value = makeAny (aAny);
}
aPropSequenceSequence [1] = aPropSequence;
}
{
- Sequence< PropertyValue > aPropSequence (4);
+ Sequence< PropertyValue > aPropSequence (7);
{
aPropSequence [0].Name = "Position";
static const CustomShapeProvider::ParameterPairData aData =
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 32, 43
+ 5, 4
};
aPropSequence [0].Value = makeAny (createParameterPair(&aData));
}
{
aPropSequence [1].Name = "RangeXMaximum";
EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 15);
+ Any aAny ((sal_Int32) 2147483647);
aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
aPropSequence [1].Value = makeAny (aParameter);
}
{
aPropSequence [2].Name = "RangeXMinimum";
EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 0);
+ Any aAny ((sal_Int32) -2147483647);
aParameter.Value = aAny;
aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
aPropSequence [2].Value = makeAny (aParameter);
}
{
- aPropSequence [3].Name = "RefX";
- Any aAny ((sal_Int32) 2);
- aPropSequence [3].Value = makeAny (aAny);
+ aPropSequence [3].Name = "RangeYMaximum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [3].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [4].Name = "RangeYMinimum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) -2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [4].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [5].Name = "RefX";
+ Any aAny ((sal_Int32) 5);
+ aPropSequence [5].Value = makeAny (aAny);
+ }
+ {
+ aPropSequence [6].Name = "RefY";
+ Any aAny ((sal_Int32) 4);
+ aPropSequence [6].Value = makeAny (aAny);
}
aPropSequenceSequence [2] = aPropSequence;
}
+ {
+ Sequence< PropertyValue > aPropSequence (7);
+ {
+ aPropSequence [0].Name = "Position";
+ static const CustomShapeProvider::ParameterPairData aData =
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 7, 6
+ };
+ aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+ }
+ {
+ aPropSequence [1].Name = "RangeXMaximum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [1].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [2].Name = "RangeXMinimum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) -2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [2].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [3].Name = "RangeYMaximum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [3].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [4].Name = "RangeYMinimum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) -2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [4].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [5].Name = "RefX";
+ Any aAny ((sal_Int32) 7);
+ aPropSequence [5].Value = makeAny (aAny);
+ }
+ {
+ aPropSequence [6].Name = "RefY";
+ Any aAny ((sal_Int32) 6);
+ aPropSequence [6].Value = makeAny (aAny);
+ }
+ aPropSequenceSequence [3] = aPropSequence;
+ }
aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
}
{
@@ -993,148 +958,53 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider
static const CustomShapeProvider::ParameterPairData aData[] = {
{
EnhancedCustomShapeParameterType::NORMAL,
- EnhancedCustomShapeParameterType::EQUATION,
- 0, 31
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 32, 28
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 32, 24
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 44, 8
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 45, 46
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 44, 8
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 47, 48
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 32, 29
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 42, 18
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 44, 8
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 49, 50
- },
- {
- EnhancedCustomShapeParameterType::NORMAL,
EnhancedCustomShapeParameterType::NORMAL,
0, 0
},
{
EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 44, 8
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 51, 52
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 42, 18
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 44, 8
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 53, 54
- },
- {
EnhancedCustomShapeParameterType::NORMAL,
- EnhancedCustomShapeParameterType::NORMAL,
- 0, 0
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 44, 8
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 55, 56
+ 8, 0
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 42, 18
+ 8, 11
},
{
+ EnhancedCustomShapeParameterType::NORMAL,
EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 44, 8
+ 0, 11
},
{
EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 57, 58
+ EnhancedCustomShapeParameterType::NORMAL,
+ 1, 0
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 32, 29
- },
- {
- EnhancedCustomShapeParameterType::NORMAL,
- EnhancedCustomShapeParameterType::EQUATION,
- 0, 31
+ 1, 11
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 32, 28
+ 1, 0
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 32, 24
+ 3, 2
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 44, 8
+ 5, 4
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 59, 60
+ 7, 6
}
};
aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -1144,28 +1014,15 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider
static const sal_uInt16 nValues[] = {
// Command, Count
1,1,
- 2,2,
- 17,2,
- 2,1,
+ 2,3,
4,0,
- 7,0,
5,0,
1,1,
- 17,1,
2,1,
- 17,1,
- 4,0,
- 19,0,
- 7,0,
+ 6,0,
5,0,
1,1,
- 17,1,
- 2,1,
- 17,1,
- 2,1,
- 17,1,
- 2,4,
- 17,1,
+ 2,3,
6,0,
5,0
};
@@ -1190,7 +1047,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 42, 43
+ 8, 11
};
aTextFrame.BottomRight = createParameterPair(&aData);
}
@@ -1208,7 +1065,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider
aRectangle.Height = 0;
aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
}
- aPropertyMap.setProperty( PROP_Type, OUString("ooxml-curvedLeftArrow"));
+ aPropertyMap.setProperty( PROP_Type, OUString("ooxml-accentBorderCallout3"));
return aPropertyMap;
}
@@ -1216,54 +1073,67 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider
// This is a generated source file. DO NOT EDIT.
-class ShapeCoctagon : public CustomShapeProvider
+class ShapeCaccentCallout1 : public CustomShapeProvider
{
virtual PropertyMap getProperties() SAL_OVERRIDE
{
PropertyMap aPropertyMap;
{
- Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+ Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
{
- Any aAny ((sal_Int32) 29289);
+ Any aAny ((sal_Int32) 18750);
aAdjSequence [0].Value = aAny;
- aAdjSequence [0].Name = "adj";
+ aAdjSequence [0].Name = "adj1";
+ }
+ {
+ Any aAny ((sal_Int32) -8333);
+ aAdjSequence [1].Value = aAny;
+ aAdjSequence [1].Name = "adj2";
+ }
+ {
+ Any aAny ((sal_Int32) 112500);
+ aAdjSequence [2].Value = aAny;
+ aAdjSequence [2].Name = "adj3";
+ }
+ {
+ Any aAny ((sal_Int32) -38333);
+ aAdjSequence [3].Value = aAny;
+ aAdjSequence [3].Name = "adj4";
}
aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
}
{
static const char *aStrings[] = {
- "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
- "min(logwidth,logheight)",
- "?1 *?0 /100000",
- "logwidth+0-?2 ",
- "logheight+0-?2 ",
- "?2 *1/2",
- "logwidth+0-?5 ",
- "logheight+0-?5 ",
+ "logheight*$0 /100000",
+ "logwidth*$1 /100000",
+ "logheight*$2 /100000",
+ "logwidth*$3 /100000",
"logwidth",
+ "logheight/2",
+ "logwidth/2",
"logheight"
};
aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
}
{
- Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+ Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
{
- Sequence< PropertyValue > aPropSequence (4);
+ Sequence< PropertyValue > aPropSequence (7);
{
aPropSequence [0].Name = "Position";
static const CustomShapeProvider::ParameterPairData aData =
{
EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::NORMAL,
- 2, 0
+ EnhancedCustomShapeParameterType::EQUATION,
+ 1, 0
};
aPropSequence [0].Value = makeAny (createParameterPair(&aData));
}
{
aPropSequence [1].Name = "RangeXMaximum";
EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 50000);
+ Any aAny ((sal_Int32) 2147483647);
aParameter.Value = aAny;
aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
aPropSequence [1].Value = makeAny (aParameter);
@@ -1271,18 +1141,95 @@ class ShapeCoctagon : public CustomShapeProvider
{
aPropSequence [2].Name = "RangeXMinimum";
EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 0);
+ Any aAny ((sal_Int32) -2147483647);
aParameter.Value = aAny;
aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
aPropSequence [2].Value = makeAny (aParameter);
}
{
- aPropSequence [3].Name = "RefX";
+ aPropSequence [3].Name = "RangeYMaximum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [3].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [4].Name = "RangeYMinimum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) -2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [4].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [5].Name = "RefX";
+ Any aAny ((sal_Int32) 1);
+ aPropSequence [5].Value = makeAny (aAny);
+ }
+ {
+ aPropSequence [6].Name = "RefY";
Any aAny ((sal_Int32) 0);
- aPropSequence [3].Value = makeAny (aAny);
+ aPropSequence [6].Value = makeAny (aAny);
}
aPropSequenceSequence [0] = aPropSequence;
}
+ {
+ Sequence< PropertyValue > aPropSequence (7);
+ {
+ aPropSequence [0].Name = "Position";
+ static const CustomShapeProvider::ParameterPairData aData =
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 3, 2
+ };
+ aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+ }
+ {
+ aPropSequence [1].Name = "RangeXMaximum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [1].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [2].Name = "RangeXMinimum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) -2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [2].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [3].Name = "RangeYMaximum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [3].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [4].Name = "RangeYMinimum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) -2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [4].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [5].Name = "RefX";
+ Any aAny ((sal_Int32) 3);
+ aPropSequence [5].Value = makeAny (aAny);
+ }
+ {
+ aPropSequence [6].Name = "RefY";
+ Any aAny ((sal_Int32) 2);
+ aPropSequence [6].Value = makeAny (aAny);
+ }
+ aPropSequenceSequence [1] = aPropSequence;
+ }
aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
}
{
@@ -1298,43 +1245,43 @@ class ShapeCoctagon : public CustomShapeProvider
static const CustomShapeProvider::ParameterPairData aData[] = {
{
EnhancedCustomShapeParameterType::NORMAL,
- EnhancedCustomShapeParameterType::EQUATION,
- 0, 2
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::NORMAL,
- 2, 0
+ 0, 0
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::NORMAL,
- 3, 0
+ 4, 0
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 8, 2
+ 4, 7
},
{
+ EnhancedCustomShapeParameterType::NORMAL,
EnhancedCustomShapeParameterType::EQUATION,
+ 0, 7
+ },
+ {
EnhancedCustomShapeParameterType::EQUATION,
- 8, 4
+ EnhancedCustomShapeParameterType::NORMAL,
+ 1, 0
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 3, 9
+ 1, 7
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 2, 9
+ 1, 0
},
{
- EnhancedCustomShapeParameterType::NORMAL,
EnhancedCustomShapeParameterType::EQUATION,
- 0, 4
+ EnhancedCustomShapeParameterType::EQUATION,
+ 3, 2
}
};
aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -1344,8 +1291,17 @@ class ShapeCoctagon : public CustomShapeProvider
static const sal_uInt16 nValues[] = {
// Command, Count
1,1,
- 2,7,
+ 2,3,
4,0,
+ 7,0,
+ 5,0,
+ 1,1,
+ 2,1,
+ 6,0,
+ 5,0,
+ 1,1,
+ 2,1,
+ 6,0,
5,0
};
aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -1358,9 +1314,9 @@ class ShapeCoctagon : public CustomShapeProvider
{
static const CustomShapeProvider::ParameterPairData aData =
{
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 5, 5
+ EnhancedCustomShapeParameterType::NORMAL,
+ EnhancedCustomShapeParameterType::NORMAL,
+ 0, 0
};
aTextFrame.TopLeft = createParameterPair(&aData);
}
@@ -1369,7 +1325,7 @@ class ShapeCoctagon : public CustomShapeProvider
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 6, 7
+ 4, 7
};
aTextFrame.BottomRight = createParameterPair(&aData);
}
@@ -1387,7 +1343,7 @@ class ShapeCoctagon : public CustomShapeProvider
aRectangle.Height = 0;
aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
}
- aPropertyMap.setProperty( PROP_Type, OUString("ooxml-octagon"));
+ aPropertyMap.setProperty( PROP_Type, OUString("ooxml-accentCallout1"));
return aPropertyMap;
}
@@ -1395,186 +1351,228 @@ class ShapeCoctagon : public CustomShapeProvider
// This is a generated source file. DO NOT EDIT.
-class ShapeCleftRightRibbon : public CustomShapeProvider
+class ShapeCaccentCallout2 : public CustomShapeProvider
{
virtual PropertyMap getProperties() SAL_OVERRIDE
{
PropertyMap aPropertyMap;
{
- Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
+ Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (6);
{
- Any aAny ((sal_Int32) 50000);
+ Any aAny ((sal_Int32) 18750);
aAdjSequence [0].Value = aAny;
aAdjSequence [0].Name = "adj1";
}
{
- Any aAny ((sal_Int32) 50000);
+ Any aAny ((sal_Int32) -8333);
aAdjSequence [1].Value = aAny;
aAdjSequence [1].Name = "adj2";
}
{
- Any aAny ((sal_Int32) 16667);
+ Any aAny ((sal_Int32) 18750);
aAdjSequence [2].Value = aAny;
aAdjSequence [2].Name = "adj3";
}
+ {
+ Any aAny ((sal_Int32) -16667);
+ aAdjSequence [3].Value = aAny;
+ aAdjSequence [3].Name = "adj4";
+ }
+ {
+ Any aAny ((sal_Int32) 112500);
+ aAdjSequence [4].Value = aAny;
+ aAdjSequence [4].Name = "adj5";
+ }
+ {
+ Any aAny ((sal_Int32) -46667);
+ aAdjSequence [5].Value = aAny;
+ aAdjSequence [5].Name = "adj6";
+ }
aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
}
{
static const char *aStrings[] = {
- "if(0-$2 ,0,if(33333-$2 ,$2 ,33333))",
- "100000+0-?0 ",
- "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
- "logwidth/2",
- "logwidth/32",
- "?3 +0-?4 ",
- "min(logwidth,logheight)",
- "100000*?5 /?6 ",
- "if(0-$1 ,0,if(?7 -$1 ,$1 ,?7 ))",
- "?6 *?8 /100000",
- "logwidth+0-?9 ",
- "logheight*?2 /200000",
- "logheight*?0 /-200000",
+ "logheight*$0 /100000",
+ "logwidth*$1 /100000",
+ "logheight*$2 /100000",
+ "logwidth*$3 /100000",
+ "logheight*$4 /100000",
+ "logwidth*$5 /100000",
+ "logwidth",
"logheight/2",
- "?13 +?12 -?11 ",
- "?13 +?11 -?12 ",
- "?14 +?11 -0",
- "logheight+0-?16 ",
- "?16 *2/1",
- "logheight+0-?18 ",
- "?18 +0-?14 ",
- "logheight+0-?20 ",
- "?0 *?6 /400000",
"logwidth/2",
- "?23 +0-?4 ",
- "?23 +?4 -0",
- "?14 +?22 -0",
- "?21 +0-?22 ",
- "logwidth",
- "logheight",
- "(16200000)/60000.0",
- "(10800000)/60000.0",
- "(16200000)/60000.0",
- "(-10800000)/60000.0",
- "(5400000)/60000.0",
- "(5400000)/60000.0",
- "(0)/60000.0",
- "(5400000)/60000.0",
- "(16200000)/60000.0",
- "(-10800000)/60000.0",
- "(16200000)/60000.0",
- "(10800000)/60000.0",
- "(16200000)/60000.0",
- "(-10800000)/60000.0",
- "(5400000)/60000.0",
- "(5400000)/60000.0"
+ "logheight"
};
aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
}
{
Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
{
- Sequence< PropertyValue > aPropSequence (4);
+ Sequence< PropertyValue > aPropSequence (7);
{
aPropSequence [0].Name = "Position";
static const CustomShapeProvider::ParameterPairData aData =
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 10, 21
+ 1, 0
};
aPropSequence [0].Value = makeAny (createParameterPair(&aData));
}
{
- aPropSequence [1].Name = "RangeYMaximum";
+ aPropSequence [1].Name = "RangeXMaximum";
EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 1);
+ Any aAny ((sal_Int32) 2147483647);
aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
aPropSequence [1].Value = makeAny (aParameter);
}
{
- aPropSequence [2].Name = "RangeYMinimum";
+ aPropSequence [2].Name = "RangeXMinimum";
EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 0);
+ Any aAny ((sal_Int32) -2147483647);
aParameter.Value = aAny;
aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
aPropSequence [2].Value = makeAny (aParameter);
}
{
- aPropSequence [3].Name = "RefY";
- Any aAny ((sal_Int32) 0);
- aPropSequence [3].Value = makeAny (aAny);
+ aPropSequence [3].Name = "RangeYMaximum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [3].Value = makeAny (aParameter);
}
- aPropSequenceSequence [0] = aPropSequence;
- }
- {
- Sequence< PropertyValue > aPropSequence (4);
{
- aPropSequence [0].Name = "Position";
- static const CustomShapeProvider::ParameterPairData aData =
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::NORMAL,
- 9, 0
+ aPropSequence [4].Name = "RangeYMinimum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) -2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [4].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [5].Name = "RefX";
+ Any aAny ((sal_Int32) 1);
+ aPropSequence [5].Value = makeAny (aAny);
+ }
+ {
+ aPropSequence [6].Name = "RefY";
+ Any aAny ((sal_Int32) 0);
+ aPropSequence [6].Value = makeAny (aAny);
+ }
+ aPropSequenceSequence [0] = aPropSequence;
+ }
+ {
+ Sequence< PropertyValue > aPropSequence (7);
+ {
+ aPropSequence [0].Name = "Position";
+ static const CustomShapeProvider::ParameterPairData aData =
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 3, 2
};
aPropSequence [0].Value = makeAny (createParameterPair(&aData));
}
{
aPropSequence [1].Name = "RangeXMaximum";
EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 7);
+ Any aAny ((sal_Int32) 2147483647);
aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
aPropSequence [1].Value = makeAny (aParameter);
}
{
aPropSequence [2].Name = "RangeXMinimum";
EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 0);
+ Any aAny ((sal_Int32) -2147483647);
aParameter.Value = aAny;
aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
aPropSequence [2].Value = makeAny (aParameter);
}
{
- aPropSequence [3].Name = "RefX";
- Any aAny ((sal_Int32) 1);
- aPropSequence [3].Value = makeAny (aAny);
+ aPropSequence [3].Name = "RangeYMaximum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [3].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [4].Name = "RangeYMinimum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) -2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [4].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [5].Name = "RefX";
+ Any aAny ((sal_Int32) 3);
+ aPropSequence [5].Value = makeAny (aAny);
+ }
+ {
+ aPropSequence [6].Name = "RefY";
+ Any aAny ((sal_Int32) 2);
+ aPropSequence [6].Value = makeAny (aAny);
}
aPropSequenceSequence [1] = aPropSequence;
}
{
- Sequence< PropertyValue > aPropSequence (4);
+ Sequence< PropertyValue > aPropSequence (7);
{
aPropSequence [0].Name = "Position";
static const CustomShapeProvider::ParameterPairData aData =
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 25, 21
+ 5, 4
};
aPropSequence [0].Value = makeAny (createParameterPair(&aData));
}
{
- aPropSequence [1].Name = "RangeYMaximum";
+ aPropSequence [1].Name = "RangeXMaximum";
EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 33333);
+ Any aAny ((sal_Int32) 2147483647);
aParameter.Value = aAny;
aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
aPropSequence [1].Value = makeAny (aParameter);
}
{
- aPropSequence [2].Name = "RangeYMinimum";
+ aPropSequence [2].Name = "RangeXMinimum";
EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 0);
+ Any aAny ((sal_Int32) -2147483647);
aParameter.Value = aAny;
aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
aPropSequence [2].Value = makeAny (aParameter);
}
{
- aPropSequence [3].Name = "RefY";
- Any aAny ((sal_Int32) 2);
- aPropSequence [3].Value = makeAny (aAny);
+ aPropSequence [3].Name = "RangeYMaximum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [3].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [4].Name = "RangeYMinimum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) -2147483647);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [4].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [5].Name = "RefX";
+ Any aAny ((sal_Int32) 5);
+ aPropSequence [5].Value = makeAny (aAny);
+ }
+ {
+ aPropSequence [6].Name = "RefY";
+ Any aAny ((sal_Int32) 4);
+ aPropSequence [6].Value = makeAny (aAny);
}
aPropSequenceSequence [2] = aPropSequence;
}
@@ -1593,303 +1591,92 @@ class ShapeCleftRightRibbon : public CustomShapeProvider
static const CustomShapeProvider::ParameterPairData aData[] = {
{
EnhancedCustomShapeParameterType::NORMAL,
- EnhancedCustomShapeParameterType::EQUATION,
- 0, 16
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::NORMAL,
- 9, 0
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 9, 14
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 23, 14
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 4, 22
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 30, 31
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 4, 22
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 32, 33
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 10, 21
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 10, 19
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 28, 17
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 10, 29
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 10, 15
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 23, 15
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 4, 22
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 34, 35
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 24, 20
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 9, 20
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 9, 18
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 25, 26
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 4, 22
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 36, 37
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 4, 22
+ 0, 0
},
{
EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 38, 39
+ EnhancedCustomShapeParameterType::NORMAL,
+ 6, 0
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 25, 21
+ 6, 9
},
{
EnhancedCustomShapeParameterType::NORMAL,
EnhancedCustomShapeParameterType::EQUATION,
- 0, 16
+ 0, 9
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::NORMAL,
- 9, 0
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 9, 14
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 23, 14
+ 1, 0
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 4, 22
+ 1, 9
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 40, 41
+ 1, 0
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 4, 22
+ 3, 2
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 42, 43
- },
+ 5, 4
+ }
+ };
+ aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+ }
+ {
+ aPropSequence [1].Name = "Segments";
+ static const sal_uInt16 nValues[] = {
+ // Command, Count
+ 1,1,
+ 2,3,
+ 4,0,
+ 7,0,
+ 5,0,
+ 1,1,
+ 2,1,
+ 6,0,
+ 5,0,
+ 1,1,
+ 2,2,
+ 6,0,
+ 5,0
+ };
+ aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+ }
+ {
+ aPropSequence [2].Name = "TextFrames";
+ Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+ {
+ EnhancedCustomShapeTextFrame aTextFrame;
{
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 10, 21
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 10, 19
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 28, 17
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 10, 29
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 10, 15
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 23, 15
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 4, 22
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 44, 45
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 24, 20
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 9, 20
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 9, 18
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 25, 26
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 25, 21
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 24, 27
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 24, 20
- }
- };
- aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
- }
- {
- aPropSequence [1].Name = "Segments";
- static const sal_uInt16 nValues[] = {
- // Command, Count
- 1,1,
- 2,3,
- 17,2,
- 2,6,
- 17,1,
- 2,3,
- 4,0,
- 7,0,
- 5,0,
- 1,1,
- 17,2,
- 2,1,
- 4,0,
- 19,0,
- 7,0,
- 5,0,
- 1,1,
- 2,3,
- 17,2,
- 2,6,
- 17,1,
- 2,3,
- 4,0,
- 1,1,
- 2,1,
- 1,1,
- 2,1,
- 6,0,
- 5,0
- };
- aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
- }
- {
- aPropSequence [2].Name = "TextFrames";
- Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
- {
- EnhancedCustomShapeTextFrame aTextFrame;
- {
- static const CustomShapeProvider::ParameterPairData aData =
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 9, 14
- };
- aTextFrame.TopLeft = createParameterPair(&aData);
- }
+ static const CustomShapeProvider::ParameterPairData aData =
+ {
+ EnhancedCustomShapeParameterType::NORMAL,
+ EnhancedCustomShapeParameterType::NORMAL,
+ 0, 0
+ };
+ aTextFrame.TopLeft = createParameterPair(&aData);
+ }
{
static const CustomShapeProvider::ParameterPairData aData =
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 10, 15
+ 6, 9
};
aTextFrame.BottomRight = createParameterPair(&aData);
}
@@ -1907,7 +1694,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider
aRectangle.Height = 0;
aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
}
- aPropertyMap.setProperty( PROP_Type, OUString("ooxml-leftRightRibbon"));
+ aPropertyMap.setProperty( PROP_Type, OUString("ooxml-accentCallout2"));
return aPropertyMap;
}
@@ -1915,332 +1702,532 @@ class ShapeCleftRightRibbon : public CustomShapeProvider
// This is a generated source file. DO NOT EDIT.
-class ShapeCactionButtonInformation : public CustomShapeProvider
+class ShapeCaccentCallout3 : public CustomShapeProvider
{
virtual PropertyMap getProperties() SAL_OVERRIDE
{
PropertyMap aPropertyMap;
{
- aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+ Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (8);
+ {
+ Any aAny ((sal_Int32) 18750);
+ aAdjSequence [0].Value = aAny;
+ aAdjSequence [0].Name = "adj1";
+ }
+ {
+ Any aAny ((sal_Int32) -8333);
+ aAdjSequence [1].Value = aAny;
+ aAdjSequence [1].Name = "adj2";
+ }
+ {
+ Any aAny ((sal_Int32) 18750);
+ aAdjSequence [2].Value = aAny;
+ aAdjSequence [2].Name = "adj3";
+ }
+ {
+ Any aAny ((sal_Int32) -16667);
+ aAdjSequence [3].Value = aAny;
+ aAdjSequence [3].Name = "adj4";
+ }
+ {
+ Any aAny ((sal_Int32) 100000);
+ aAdjSequence [4].Value = aAny;
+ aAdjSequence [4].Name = "adj5";
+ }
+ {
+ Any aAny ((sal_Int32) -16667);
+ aAdjSequence [5].Value = aAny;
+ aAdjSequence [5].Name = "adj6";
+ }
+ {
+ Any aAny ((sal_Int32) 112963);
+ aAdjSequence [6].Value = aAny;
+ aAdjSequence [6].Name = "adj7";
+ }
+ {
+ Any aAny ((sal_Int32) -8333);
+ aAdjSequence [7].Value = aAny;
+ aAdjSequence [7].Name = "adj8";
+ }
+ aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
}
{
static const char *aStrings[] = {
- "min(logwidth,logheight)",
- "?0 *3/8",
+ "logheight*$0 /100000",
+ "logwidth*$1 /100000",
+ "logheight*$2 /100000",
+ "logwidth*$3 /100000",
+ "logheight*$4 /100000",
+ "logwidth*$5 /100000",
+ "logheight*$6 /100000",
+ "logwidth*$7 /100000",
+ "logwidth",
"logheight/2",
- "?2 +0-?1 ",
"logwidth/2",
- "?4 +0-?1 ",
- "?0 *3/4",
- "?6 *1/32",
- "?6 *5/16",
- "?6 *3/8",
- "?6 *13/32",
- "?6 *19/32",
- "?6 *11/16",
- "?6 *13/16",
- "?6 *7/8",
- "?3 +?7 -0",
- "?3 +?8 -0",
- "?3 +?9 -0",
- "?3 +?13 -0",
- "?3 +?14 -0",
- "?5 +?8 -0",
- "?5 +?10 -0",
- "?5 +?11 -0",
- "?5 +?12 -0",
- "?6 *3/32",
- "logwidth",
- "logheight",
- "(16200000)/60000.0",
- "(21600000)/60000.0",
- "(16200000)/60000.0",
- "(21600000)/60000.0",
- "(16200000)/60000.0",
- "(21600000)/60000.0",
- "(16200000)/60000.0",
- "(21600000)/60000.0",
- "(16200000)/60000.0",
- "(21600000)/60000.0",
- "(16200000)/60000.0",
- "(21600000)/60000.0"
+ "logheight"
};
aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
}
{
- aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
- }
- {
- aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
- }
- {
- aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
- }
- {
- Sequence< PropertyValue > aPropSequence (3);
+ Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
{
- aPropSequence [0].Name = "Coordinates";
- static const CustomShapeProvider::ParameterPairData aData[] = {
- {
- EnhancedCustomShapeParameterType::NORMAL,
- EnhancedCustomShapeParameterType::NORMAL,
- 0, 0
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::NORMAL,
- 25, 0
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 25, 26
- },
- {
- EnhancedCustomShapeParameterType::NORMAL,
- EnhancedCustomShapeParameterType::EQUATION,
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list