[Libreoffice-commits] core.git: 4 commits - include/sal oox/source
Tor Lillqvist
tml at iki.fi
Thu Aug 15 12:57:20 PDT 2013
include/sal/log-areas.dox | 5
oox/source/drawingml/customshapepresets1.cxx | 119
oox/source/drawingml/customshapepresets2.cxx | 545 ++-
oox/source/drawingml/customshapepresets3.cxx | 1552 ++++++-----
oox/source/drawingml/customshapepresets4.cxx | 707 +----
oox/source/drawingml/customshapepresets5.cxx | 434 ++-
oox/source/drawingml/customshapepresets6.cxx | 168 +
oox/source/drawingml/customshapeproperties.cxx | 4
oox/source/drawingml/customshapes/README | 61
oox/source/drawingml/customshapes/generatePresetsCXX.pl | 20
oox/source/drawingml/customshapes/presetShapeDefinitions.xml | 51
oox/source/drawingml/shape.cxx | 2
12 files changed, 2142 insertions(+), 1526 deletions(-)
New commits:
commit b04b5cfca4bce863a28f0b8fef8b2cf02dda3be2
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Aug 15 17:18:28 2013 +0300
Sprinkle more warnings into the generated custom shape preset source files
Change-Id: I1c19e8a7d775b1c37649dd36b611d145fd4ce47e
diff --git a/oox/source/drawingml/customshapepresets1.cxx b/oox/source/drawingml/customshapepresets1.cxx
index 9e7371f..8d55f93 100644
--- a/oox/source/drawingml/customshapepresets1.cxx
+++ b/oox/source/drawingml/customshapepresets1.cxx
@@ -317,6 +317,9 @@ class ShapeCactionButtonSound : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCborderCallout1 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -577,6 +580,9 @@ class ShapeCborderCallout1 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCplaqueTabs : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -771,6 +777,9 @@ class ShapeCplaqueTabs : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCcurvedLeftArrow : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -1204,6 +1213,9 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCoctagon : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -1380,6 +1392,9 @@ class ShapeCoctagon : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCleftRightRibbon : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -1897,6 +1912,9 @@ class ShapeCleftRightRibbon : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCactionButtonInformation : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -2338,6 +2356,9 @@ class ShapeCactionButtonInformation : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCbentConnector5 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -2582,6 +2603,9 @@ class ShapeCbentConnector5 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCcircularArrow : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -3029,6 +3053,9 @@ class ShapeCcircularArrow : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCdownArrowCallout : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -3353,6 +3380,9 @@ class ShapeCdownArrowCallout : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCmathMinus : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -3508,6 +3538,9 @@ class ShapeCmathMinus : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCgear9 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -4186,6 +4219,9 @@ class ShapeCgear9 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCround1Rect : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -4356,6 +4392,9 @@ class ShapeCround1Rect : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCsun : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -4694,6 +4733,9 @@ class ShapeCsun : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCplaque : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -4906,6 +4948,9 @@ class ShapeCplaque : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCchevron : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -5074,6 +5119,9 @@ class ShapeCchevron : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartPreparation : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -5205,6 +5253,9 @@ class ShapeCflowChartPreparation : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCdiagStripe : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -5362,6 +5413,9 @@ class ShapeCdiagStripe : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCpentagon : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -5501,6 +5555,9 @@ class ShapeCpentagon : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCfunnel : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -5678,6 +5735,9 @@ class ShapeCfunnel : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCchartStar : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -5809,6 +5869,9 @@ class ShapeCchartStar : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCaccentBorderCallout1 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -6083,6 +6146,9 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCnotchedRightArrow : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -6304,6 +6370,9 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCrightBracket : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -6521,6 +6590,9 @@ class ShapeCrightBracket : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartOffpageConnector : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -6646,6 +6718,9 @@ class ShapeCflowChartOffpageConnector : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCleftRightArrow : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -6878,6 +6953,9 @@ class ShapeCleftRightArrow : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCdecagon : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -7036,6 +7114,9 @@ class ShapeCdecagon : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCactionButtonHelp : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -7548,6 +7629,9 @@ class ShapeCactionButtonHelp : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCstar24 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -7999,6 +8083,9 @@ class ShapeCstar24 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCmathDivide : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -8290,6 +8377,9 @@ class ShapeCmathDivide : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCcurvedConnector4 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -8518,6 +8608,9 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartOr : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -8752,6 +8845,9 @@ class ShapeCflowChartOr : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCborderCallout3 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -9158,6 +9254,9 @@ class ShapeCborderCallout3 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCupDownArrowCallout : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -9520,6 +9619,9 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartDecision : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -9643,6 +9745,9 @@ class ShapeCflowChartDecision : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
} // anonymous namespace
void CustomShapeProperties::initializePresetsMap1()
{
diff --git a/oox/source/drawingml/customshapepresets2.cxx b/oox/source/drawingml/customshapepresets2.cxx
index 315660d..f88abd6 100644
--- a/oox/source/drawingml/customshapepresets2.cxx
+++ b/oox/source/drawingml/customshapepresets2.cxx
@@ -385,6 +385,9 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartManualOperation : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -507,6 +510,9 @@ class ShapeCflowChartManualOperation : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCsnipRoundRect : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -728,6 +734,9 @@ class ShapeCsnipRoundRect : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCmathPlus : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -929,6 +938,9 @@ class ShapeCmathPlus : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCactionButtonForwardNext : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -1128,6 +1140,9 @@ class ShapeCactionButtonForwardNext : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCcan : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -1395,6 +1410,9 @@ class ShapeCcan : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCfoldedCorner : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -1624,6 +1642,9 @@ class ShapeCfoldedCorner : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCstar32 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -2177,6 +2198,9 @@ class ShapeCstar32 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartInternalStorage : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -2362,6 +2386,9 @@ class ShapeCflowChartInternalStorage : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCupDownArrow : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -2595,6 +2622,9 @@ class ShapeCupDownArrow : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCirregularSeal2 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -2842,6 +2872,9 @@ class ShapeCirregularSeal2 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCmathEqual : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -3069,6 +3102,9 @@ class ShapeCmathEqual : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCstar12 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -3353,6 +3389,9 @@ class ShapeCstar12 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCuturnArrow : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -3785,6 +3824,9 @@ class ShapeCuturnArrow : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCsquareTabs : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -3967,6 +4009,9 @@ class ShapeCsquareTabs : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCleftRightUpArrow : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -4283,6 +4328,9 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCupArrow : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -4499,6 +4547,9 @@ class ShapeCupArrow : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeChomePlate : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -4660,6 +4711,9 @@ class ShapeChomePlate : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCdodecagon : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -4814,6 +4868,9 @@ class ShapeCdodecagon : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCleftArrowCallout : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -5138,6 +5195,9 @@ class ShapeCleftArrowCallout : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCchord : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -5310,6 +5370,9 @@ class ShapeCchord : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCquadArrowCallout : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -5748,6 +5811,9 @@ class ShapeCquadArrowCallout : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCactionButtonBeginning : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -6021,6 +6087,9 @@ class ShapeCactionButtonBeginning : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCellipse : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -6170,6 +6239,9 @@ class ShapeCellipse : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCactionButtonEnd : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -6443,6 +6515,9 @@ class ShapeCactionButtonEnd : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCarc : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -6658,6 +6733,9 @@ class ShapeCarc : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCstar16 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -7002,6 +7080,9 @@ class ShapeCstar16 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCparallelogram : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -7172,6 +7253,9 @@ class ShapeCparallelogram : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCbevel : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -7528,6 +7612,9 @@ class ShapeCbevel : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCroundRect : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -7740,6 +7827,9 @@ class ShapeCroundRect : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCaccentCallout1 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -8015,6 +8105,9 @@ class ShapeCaccentCallout1 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartSort : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -8190,6 +8283,9 @@ class ShapeCflowChartSort : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCstar8 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -8424,6 +8520,9 @@ class ShapeCstar8 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartAlternateProcess : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -8592,6 +8691,9 @@ class ShapeCflowChartAlternateProcess : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCmoon : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -8787,6 +8889,9 @@ class ShapeCmoon : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
} // anonymous namespace
void CustomShapeProperties::initializePresetsMap2()
{
diff --git a/oox/source/drawingml/customshapepresets3.cxx b/oox/source/drawingml/customshapepresets3.cxx
index 171225a..c833e33 100644
--- a/oox/source/drawingml/customshapepresets3.cxx
+++ b/oox/source/drawingml/customshapepresets3.cxx
@@ -237,6 +237,9 @@ class ShapeCstar6 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCround2SameRect : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -501,6 +504,9 @@ class ShapeCround2SameRect : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -707,6 +713,9 @@ class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCdiamond : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -819,6 +828,9 @@ class ShapeCdiamond : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCcallout2 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -1153,6 +1165,9 @@ class ShapeCcallout2 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCellipseRibbon : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -1736,6 +1751,9 @@ class ShapeCellipseRibbon : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCpie : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -1912,6 +1930,9 @@ class ShapeCpie : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCstar4 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -2094,6 +2115,9 @@ class ShapeCstar4 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartPredefinedProcess : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -2279,6 +2303,9 @@ class ShapeCflowChartPredefinedProcess : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartPunchedTape : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -2441,6 +2468,9 @@ class ShapeCflowChartPunchedTape : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCcurvedConnector2 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -2549,6 +2579,9 @@ class ShapeCcurvedConnector2 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCbentConnector3 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -2699,6 +2732,9 @@ class ShapeCbentConnector3 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCcornerTabs : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -2861,6 +2897,9 @@ class ShapeCcornerTabs : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeChexagon : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -3046,6 +3085,9 @@ class ShapeChexagon : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartConnector : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -3195,6 +3237,9 @@ class ShapeCflowChartConnector : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartMagneticDisk : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -3407,6 +3452,9 @@ class ShapeCflowChartMagneticDisk : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCheart : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -3540,6 +3588,9 @@ class ShapeCheart : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCribbon2 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -4191,6 +4242,9 @@ class ShapeCribbon2 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCbracePair : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -4611,6 +4665,9 @@ class ShapeCbracePair : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartExtract : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -4726,6 +4783,9 @@ class ShapeCflowChartExtract : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCactionButtonHome : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -5164,6 +5224,9 @@ class ShapeCactionButtonHome : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCaccentBorderCallout3 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -5584,6 +5647,9 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartOfflineStorage : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -5746,6 +5812,9 @@ class ShapeCflowChartOfflineStorage : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCirregularSeal1 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -5971,6 +6040,9 @@ class ShapeCirregularSeal1 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCquadArrow : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -6323,6 +6395,9 @@ class ShapeCquadArrow : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCleftBrace : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -6647,6 +6722,9 @@ class ShapeCleftBrace : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCleftBracket : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -6864,6 +6942,9 @@ class ShapeCleftBracket : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCblockArc : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -7121,6 +7202,9 @@ class ShapeCblockArc : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCcurvedConnector3 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -7290,6 +7374,9 @@ class ShapeCcurvedConnector3 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCwedgeRoundRectCallout : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -7625,6 +7712,9 @@ class ShapeCwedgeRoundRectCallout : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCactionButtonMovie : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -8100,6 +8190,9 @@ class ShapeCactionButtonMovie : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartOnlineStorage : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -8242,6 +8335,9 @@ class ShapeCflowChartOnlineStorage : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCgear6 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -8698,6 +8794,9 @@ class ShapeCgear6 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeChalfFrame : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -8915,6 +9014,9 @@ class ShapeChalfFrame : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCsnip2SameRect : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -9139,6 +9241,9 @@ class ShapeCsnip2SameRect : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
} // anonymous namespace
void CustomShapeProperties::initializePresetsMap3()
{
diff --git a/oox/source/drawingml/customshapepresets4.cxx b/oox/source/drawingml/customshapepresets4.cxx
index 7a01d6d..79c49be 100644
--- a/oox/source/drawingml/customshapepresets4.cxx
+++ b/oox/source/drawingml/customshapepresets4.cxx
@@ -172,6 +172,9 @@ class ShapeCtriangle : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCteardrop : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -385,6 +388,9 @@ class ShapeCteardrop : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartDocument : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -516,6 +522,9 @@ class ShapeCflowChartDocument : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCrightArrowCallout : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -840,6 +849,9 @@ class ShapeCrightArrowCallout : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCrightBrace : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -1165,6 +1177,9 @@ class ShapeCrightBrace : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCchartPlus : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -1284,6 +1299,9 @@ class ShapeCchartPlus : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartManualInput : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -1405,6 +1423,9 @@ class ShapeCflowChartManualInput : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartMerge : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -1520,6 +1541,9 @@ class ShapeCflowChartMerge : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCline : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -1588,6 +1612,9 @@ class ShapeCline : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCdownArrow : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -1804,6 +1831,9 @@ class ShapeCdownArrow : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCcurvedDownArrow : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -2245,6 +2275,9 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCactionButtonReturn : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -2747,6 +2780,9 @@ class ShapeCactionButtonReturn : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartInputOutput : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -2871,6 +2907,9 @@ class ShapeCflowChartInputOutput : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCbracketPair : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -3162,6 +3201,9 @@ class ShapeCbracketPair : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCsmileyFace : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -3413,6 +3455,9 @@ class ShapeCsmileyFace : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCactionButtonBlank : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -3521,6 +3566,9 @@ class ShapeCactionButtonBlank : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCwave : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -3762,6 +3810,9 @@ class ShapeCwave : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCswooshArrow : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -4007,6 +4058,9 @@ class ShapeCswooshArrow : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartSummingJunction : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -4241,6 +4295,9 @@ class ShapeCflowChartSummingJunction : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeClightningBolt : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -4407,6 +4464,9 @@ class ShapeClightningBolt : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartDisplay : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -4542,6 +4602,9 @@ class ShapeCflowChartDisplay : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCactionButtonBackPrevious : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -4741,6 +4804,9 @@ class ShapeCactionButtonBackPrevious : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCframe : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -4919,6 +4985,9 @@ class ShapeCframe : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCrtTriangle : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -5026,6 +5095,9 @@ class ShapeCrtTriangle : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartMagneticTape : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -5187,6 +5259,9 @@ class ShapeCflowChartMagneticTape : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCcurvedRightArrow : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -5619,6 +5694,9 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCleftUpArrow : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -5908,6 +5986,9 @@ class ShapeCleftUpArrow : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCwedgeEllipseCallout : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -6117,6 +6198,9 @@ class ShapeCwedgeEllipseCallout : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCdoubleWave : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -6394,6 +6478,9 @@ class ShapeCdoubleWave : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCbentArrow : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -6739,6 +6826,9 @@ class ShapeCbentArrow : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCstar10 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -7006,6 +7096,9 @@ class ShapeCstar10 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCleftArrow : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -7222,6 +7315,9 @@ class ShapeCleftArrow : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCcurvedUpArrow : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -7657,6 +7753,9 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCsnip1Rect : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -7818,6 +7917,9 @@ class ShapeCsnip1Rect : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCellipseRibbon2 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -8416,6 +8518,9 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
} // anonymous namespace
void CustomShapeProperties::initializePresetsMap4()
{
diff --git a/oox/source/drawingml/customshapepresets5.cxx b/oox/source/drawingml/customshapepresets5.cxx
index a2001c2..fdc640a 100644
--- a/oox/source/drawingml/customshapepresets5.cxx
+++ b/oox/source/drawingml/customshapepresets5.cxx
@@ -223,6 +223,9 @@ class ShapeCplus : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCaccentCallout3 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -644,6 +647,9 @@ class ShapeCaccentCallout3 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCleftCircularArrow : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -1110,6 +1116,9 @@ class ShapeCleftCircularArrow : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCrightArrow : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -1326,6 +1335,9 @@ class ShapeCrightArrow : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartPunchedCard : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -1451,6 +1463,9 @@ class ShapeCflowChartPunchedCard : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCsnip2DiagRect : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -1675,6 +1690,9 @@ class ShapeCsnip2DiagRect : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCverticalScroll : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -2208,6 +2226,9 @@ class ShapeCverticalScroll : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCstar7 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -2456,6 +2477,9 @@ class ShapeCstar7 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCchartX : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -2575,6 +2599,9 @@ class ShapeCchartX : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCcloud : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -3034,6 +3061,9 @@ class ShapeCcloud : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCcube : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -3308,6 +3338,9 @@ class ShapeCcube : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCround2DiagRect : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -3572,6 +3605,9 @@ class ShapeCround2DiagRect : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartMultidocument : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -4021,6 +4057,9 @@ class ShapeCflowChartMultidocument : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCactionButtonDocument : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -4297,6 +4336,9 @@ class ShapeCactionButtonDocument : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartTerminator : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -4442,6 +4484,9 @@ class ShapeCflowChartTerminator : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartDelay : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -4566,6 +4611,9 @@ class ShapeCflowChartDelay : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCcurvedConnector5 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -4853,6 +4901,9 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeChorizontalScroll : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -5385,6 +5436,9 @@ class ShapeChorizontalScroll : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCbentConnector4 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -5582,6 +5636,9 @@ class ShapeCbentConnector4 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCleftRightCircularArrow : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -6084,6 +6141,9 @@ class ShapeCleftRightCircularArrow : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCwedgeRectCallout : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -6354,6 +6414,9 @@ class ShapeCwedgeRectCallout : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCaccentCallout2 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -6702,6 +6765,9 @@ class ShapeCaccentCallout2 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartMagneticDrum : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -6926,6 +6992,9 @@ class ShapeCflowChartMagneticDrum : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCcorner : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -7139,6 +7208,9 @@ class ShapeCcorner : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCborderCallout2 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -7472,6 +7544,9 @@ class ShapeCborderCallout2 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCdonut : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -7719,6 +7794,9 @@ class ShapeCdonut : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCflowChartCollate : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -7851,6 +7929,9 @@ class ShapeCflowChartCollate : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCmathNotEqual : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -8195,6 +8276,9 @@ class ShapeCmathNotEqual : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCbentConnector2 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -8296,6 +8380,9 @@ class ShapeCbentConnector2 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCmathMultiply : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -8516,6 +8603,9 @@ class ShapeCmathMultiply : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCheptagon : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -8669,6 +8759,9 @@ class ShapeCheptagon : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCrect : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -8777,6 +8870,9 @@ class ShapeCrect : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCaccentBorderCallout2 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -9124,6 +9220,9 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCpieWedge : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -9241,6 +9340,9 @@ class ShapeCpieWedge : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCupArrowCallout : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -9565,6 +9667,9 @@ class ShapeCupArrowCallout : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
} // anonymous namespace
void CustomShapeProperties::initializePresetsMap5()
{
diff --git a/oox/source/drawingml/customshapepresets6.cxx b/oox/source/drawingml/customshapepresets6.cxx
index a252113..1f6c680 100644
--- a/oox/source/drawingml/customshapepresets6.cxx
+++ b/oox/source/drawingml/customshapepresets6.cxx
@@ -142,6 +142,9 @@ class ShapeCflowChartProcess : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCstar5 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -360,6 +363,9 @@ class ShapeCstar5 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeClineInv : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -428,6 +434,9 @@ class ShapeClineInv : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCstraightConnector1 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -524,6 +533,9 @@ class ShapeCstraightConnector1 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCstripedRightArrow : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -790,6 +802,9 @@ class ShapeCstripedRightArrow : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCcallout3 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -1197,6 +1212,9 @@ class ShapeCcallout3 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCbentUpArrow : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -1467,6 +1485,9 @@ class ShapeCbentUpArrow : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCnoSmoking : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -1720,6 +1741,9 @@ class ShapeCnoSmoking : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCtrapezoid : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -1882,6 +1906,9 @@ class ShapeCtrapezoid : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCcloudCallout : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -2528,6 +2555,9 @@ class ShapeCcloudCallout : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCcallout1 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -2789,6 +2819,9 @@ class ShapeCcallout1 : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
class ShapeCribbon : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -3434,6 +3467,9 @@ class ShapeCribbon : public CustomShapeProvider
return aPropertyMap;
}
};
+
+// This is a generated source file. DO NOT EDIT.
+
} // anonymous namespace
void CustomShapeProperties::initializePresetsMap6()
{
diff --git a/oox/source/drawingml/customshapes/generatePresetsCXX.pl b/oox/source/drawingml/customshapes/generatePresetsCXX.pl
index fcd2152..e5a509d 100755
--- a/oox/source/drawingml/customshapes/generatePresetsCXX.pl
+++ b/oox/source/drawingml/customshapes/generatePresetsCXX.pl
@@ -134,6 +134,9 @@ sub generateSource
print OUT " return aPropertyMap;\n";
print OUT " }\n";
print OUT "};\n";
+ print OUT "\n";
+ print OUT "// This is a generated source file. DO NOT EDIT.\n";
+ print OUT "\n";
$shCount++;
commit f1567edb7fc2661e1e05b95243bee65fc268984d
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Aug 15 17:12:02 2013 +0300
Update the custom shape preset source files to actually be generated
They had been edited manually a couple of times...
(Instead in the previous commits I edited the generating script and the input
data.)
Change-Id: I3c89d021450a3c3e64055991450c205251fdd41f
diff --git a/oox/source/drawingml/customshapepresets1.cxx b/oox/source/drawingml/customshapepresets1.cxx
index f2bcb4b..9e7371f 100644
--- a/oox/source/drawingml/customshapepresets1.cxx
+++ b/oox/source/drawingml/customshapepresets1.cxx
@@ -1,8 +1,12 @@
-// this file was generated by: ./generatePresetsCXX.pl
-// please do not edit
+//
+// This file was generated by: ./generatePresetsCXX.pl
+//
+// Please, DO NOT EDIT.
+//
+// We mean it.
-#include "oox/drawingml/customshapeproperties.hxx"
-#include "oox/token/tokenmap.hxx"
+#include <oox/drawingml/customshapeproperties.hxx>
+#include <oox/token/tokenmap.hxx>
#include <com/sun/star/awt/Rectangle.hpp>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
@@ -9649,7 +9653,7 @@ void CustomShapeProperties::initializePresetsMap1()
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "octagon" ) ] = new ShapeCoctagon();
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftRightRibbon" ) ] = new ShapeCleftRightRibbon();
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonInformation" ) ] = new ShapeCactionButtonInformation();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "bentConnector5" ) ] = new ShapeCbentConnector5();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "bentConnector5" ) ] = new ShapeCbentConnector5();
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "circularArrow" ) ] = new ShapeCcircularArrow();
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "downArrowCallout" ) ] = new ShapeCdownArrowCallout();
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "mathMinus" ) ] = new ShapeCmathMinus();
diff --git a/oox/source/drawingml/customshapepresets2.cxx b/oox/source/drawingml/customshapepresets2.cxx
index 023588a..315660d 100644
--- a/oox/source/drawingml/customshapepresets2.cxx
+++ b/oox/source/drawingml/customshapepresets2.cxx
@@ -1,8 +1,12 @@
-// this file was generated by: ./generatePresetsCXX.pl
-// please do not edit
+//
+// This file was generated by: ./generatePresetsCXX.pl
+//
+// Please, DO NOT EDIT.
+//
+// We mean it.
-#include "oox/drawingml/customshapeproperties.hxx"
-#include "oox/token/tokenmap.hxx"
+#include <oox/drawingml/customshapeproperties.hxx>
+#include <oox/token/tokenmap.hxx>
#include <com/sun/star/awt/Rectangle.hpp>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
@@ -4279,6 +4283,222 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider
return aPropertyMap;
}
};
+class ShapeCupArrow : public CustomShapeProvider
+{
+ virtual PropertyMap getProperties()
+ {
+ PropertyMap aPropertyMap;
+
+ {
+ Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+ {
+ Any aAny ((sal_Int32) 50000);
+ aAdjSequence [0].Value = aAny;
+ aAdjSequence [0].Name = "adj1";
+ }
+ {
+ Any aAny ((sal_Int32) 50000);
+ aAdjSequence [1].Value = aAny;
+ aAdjSequence [1].Name = "adj2";
+ }
+ aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence;
+ }
+ {
+ static const char *aStrings[] = {
+ "min(logwidth,logheight)",
+ "100000*logheight/?0 ",
+ "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
+ "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
+ "?0 *?3 /100000",
+ "0+?4 -0",
+ "logwidth*?2 /200000",
+ "logwidth/2",
+ "?7 +0-?6 ",
+ "?7 +?6 -0",
+ "logwidth/2",
+ "?8 *?4 /?10 ",
+ "?5 +0-?11 ",
+ "logheight",
+ "logwidth"
+ };
+ aPropertyMap [PROP_Equations] <<= createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings );
+ }
+ {
+ Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+ {
+ Sequence< PropertyValue > aPropSequence (4);
+ {
+ aPropSequence [0].Name = "Position";
+ static const CustomShapeProvider::ParameterPairData aData =
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 8, 13
+ };
+ aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+ }
+ {
+ aPropSequence [1].Name = "RangeXMaximum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 100000);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [1].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [2].Name = "RangeXMinimum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [2].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [3].Name = "RefX";
+ Any aAny ((sal_Int32) 0);
+ aPropSequence [3].Value = makeAny (aAny);
+ }
+ aPropSequenceSequence [0] = aPropSequence;
+ }
+ {
+ Sequence< PropertyValue > aPropSequence (4);
+ {
+ aPropSequence [0].Name = "Position";
+ static const CustomShapeProvider::ParameterPairData aData =
+ {
+ EnhancedCustomShapeParameterType::NORMAL,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 0, 5
+ };
+ aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+ }
+ {
+ aPropSequence [1].Name = "RangeYMaximum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 1);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ aPropSequence [1].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [2].Name = "RangeYMinimum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ 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);
+ }
+ aPropSequenceSequence [1] = aPropSequence;
+ }
+ aPropertyMap [PROP_Handles] <<= aPropSequenceSequence;
+ }
+ {
+ aPropertyMap [PROP_MirroredX] <<= Any ((sal_Bool) sal_False);
+ }
+ {
+ aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
+ }
+ {
+ Sequence< PropertyValue > aPropSequence (3);
+ {
+ aPropSequence [0].Name = "Coordinates";
+ static const CustomShapeProvider::ParameterPairData aData[] = {
+ {
+ EnhancedCustomShapeParameterType::NORMAL,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 0, 5
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::NORMAL,
+ 7, 0
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 14, 5
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 9, 5
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 9, 13
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 8, 13
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 8, 5
+ }
+ };
+ aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+ }
+ {
+ aPropSequence [1].Name = "Segments";
+ static const sal_uInt16 nValues[] = {
+ // Command, Count
+ 1,1,
+ 2,6,
+ 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,
+ 8, 12
+ };
+ aTextFrame.TopLeft = createParameterPair(&aData);
+ }
+ {
+ static const CustomShapeProvider::ParameterPairData aData =
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 9, 13
+ };
+ aTextFrame.BottomRight = createParameterPair(&aData);
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
+ aPropertyMap [PROP_Path] <<= aPropSequence;
+ }
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
+ aPropertyMap [ PROP_Type ] <<= OUString("ooxml-upArrow");
+
+ return aPropertyMap;
+ }
+};
class ShapeChomePlate : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -8567,220 +8787,6 @@ class ShapeCmoon : public CustomShapeProvider
return aPropertyMap;
}
};
-class ShapeCstar6 : public CustomShapeProvider
-{
- virtual PropertyMap getProperties()
- {
- PropertyMap aPropertyMap;
-
- {
- Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
- {
- Any aAny ((sal_Int32) 28868);
- aAdjSequence [0].Value = aAny;
- aAdjSequence [0].Name = "adj";
- }
- {
- Any aAny ((sal_Int32) 115470);
- aAdjSequence [1].Value = aAny;
- aAdjSequence [1].Name = "hf";
- }
- aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence;
- }
- {
- static const char *aStrings[] = {
- "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
- "logwidth/2",
- "?1 *$1 /100000",
- "?2 *cos(pi*(1800000)/10800000)",
- "logwidth/2",
- "?4 +0-?3 ",
- "?4 +?3 -0",
- "logheight/2",
- "logheight/4",
- "?7 +?8 -0",
- "?2 *?0 /50000",
- "logheight/2",
- "?11 *?0 /50000",
- "?10 *1/2",
- "?4 +0-?10 ",
- "?4 +0-?13 ",
- "?4 +?13 -0",
- "?4 +?10 -0",
- "?12 *sin(pi*(3600000)/10800000)",
- "?7 +0-?18 ",
- "?7 +?18 -0",
- "?7 +0-?12 ",
- "logheight"
- };
- aPropertyMap [PROP_Equations] <<= createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings );
- }
- {
- Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
- {
- Sequence< PropertyValue > aPropSequence (4);
- {
- aPropSequence [0].Name = "Position";
- static const CustomShapeProvider::ParameterPairData aData =
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 4, 21
- };
- aPropSequence [0].Value = makeAny (createParameterPair(&aData));
- }
- {
- aPropSequence [1].Name = "RangeYMaximum";
- EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 50000);
- aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
- aPropSequence [1].Value = makeAny (aParameter);
- }
- {
- aPropSequence [2].Name = "RangeYMinimum";
- EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 0);
- 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);
- }
- aPropSequenceSequence [0] = aPropSequence;
- }
- aPropertyMap [PROP_Handles] <<= aPropSequenceSequence;
- }
- {
- aPropertyMap [PROP_MirroredX] <<= Any ((sal_Bool) sal_False);
- }
- {
- aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
- }
- {
- Sequence< PropertyValue > aPropSequence (3);
- {
- aPropSequence [0].Name = "Coordinates";
- static const CustomShapeProvider::ParameterPairData aData[] = {
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 5, 8
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 15, 19
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::NORMAL,
- 4, 0
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 16, 19
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 6, 8
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 17, 7
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 6, 9
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 16, 20
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 4, 22
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 15, 20
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 5, 9
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 14, 7
- }
- };
- aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
- }
- {
- aPropSequence [1].Name = "Segments";
- static const sal_uInt16 nValues[] = {
- // Command, Count
- 1,1,
- 2,11,
- 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,
- 14, 19
- };
- aTextFrame.TopLeft = createParameterPair(&aData);
- }
- {
- static const CustomShapeProvider::ParameterPairData aData =
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 17, 20
- };
- aTextFrame.BottomRight = createParameterPair(&aData);
- }
- aTextFrameSeq [0] = aTextFrame;
- }
- aPropSequence [2].Value = makeAny (aTextFrameSeq);
- }
- aPropertyMap [PROP_Path] <<= aPropSequence;
- }
- {
- awt::Rectangle aRectangle;
- aRectangle.X = 0;
- aRectangle.Y = 0;
- aRectangle.Width = 0;
- aRectangle.Height = 0;
- aPropertyMap [PROP_ViewBox] <<= aRectangle;
- }
- aPropertyMap [ PROP_Type ] <<= OUString("ooxml-star6");
-
- return aPropertyMap;
- }
-};
} // anonymous namespace
void CustomShapeProperties::initializePresetsMap2()
{
@@ -8800,6 +8806,7 @@ void CustomShapeProperties::initializePresetsMap2()
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "uturnArrow" ) ] = new ShapeCuturnArrow();
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "squareTabs" ) ] = new ShapeCsquareTabs();
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftRightUpArrow" ) ] = new ShapeCleftRightUpArrow();
+ maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "upArrow" ) ] = new ShapeCupArrow();
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "homePlate" ) ] = new ShapeChomePlate();
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "dodecagon" ) ] = new ShapeCdodecagon();
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftArrowCallout" ) ] = new ShapeCleftArrowCallout();
@@ -8818,7 +8825,6 @@ void CustomShapeProperties::initializePresetsMap2()
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "star8" ) ] = new ShapeCstar8();
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartAlternateProcess" ) ] = new ShapeCflowChartAlternateProcess();
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "moon" ) ] = new ShapeCmoon();
- maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "star6" ) ] = new ShapeCstar6();
}
} } // oox // drawingml
diff --git a/oox/source/drawingml/customshapepresets3.cxx b/oox/source/drawingml/customshapepresets3.cxx
index 7208cf1..171225a 100644
--- a/oox/source/drawingml/customshapepresets3.cxx
+++ b/oox/source/drawingml/customshapepresets3.cxx
@@ -1,8 +1,12 @@
-// this file was generated by: ./generatePresetsCXX.pl
-// please do not edit
+//
+// This file was generated by: ./generatePresetsCXX.pl
+//
+// Please, DO NOT EDIT.
+//
+// We mean it.
-#include "oox/drawingml/customshapeproperties.hxx"
-#include "oox/token/tokenmap.hxx"
+#include <oox/drawingml/customshapeproperties.hxx>
+#include <oox/token/tokenmap.hxx>
#include <com/sun/star/awt/Rectangle.hpp>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
@@ -19,6 +23,220 @@ namespace oox { namespace drawingml {
namespace
{
+class ShapeCstar6 : public CustomShapeProvider
+{
+ virtual PropertyMap getProperties()
+ {
+ PropertyMap aPropertyMap;
+
+ {
+ Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+ {
+ Any aAny ((sal_Int32) 28868);
+ aAdjSequence [0].Value = aAny;
+ aAdjSequence [0].Name = "adj";
+ }
+ {
+ Any aAny ((sal_Int32) 115470);
+ aAdjSequence [1].Value = aAny;
+ aAdjSequence [1].Name = "hf";
+ }
+ aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence;
+ }
+ {
+ static const char *aStrings[] = {
+ "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
+ "logwidth/2",
+ "?1 *$1 /100000",
+ "?2 *cos(pi*(1800000)/10800000)",
+ "logwidth/2",
+ "?4 +0-?3 ",
+ "?4 +?3 -0",
+ "logheight/2",
+ "logheight/4",
+ "?7 +?8 -0",
+ "?2 *?0 /50000",
+ "logheight/2",
+ "?11 *?0 /50000",
+ "?10 *1/2",
+ "?4 +0-?10 ",
+ "?4 +0-?13 ",
+ "?4 +?13 -0",
+ "?4 +?10 -0",
+ "?12 *sin(pi*(3600000)/10800000)",
+ "?7 +0-?18 ",
+ "?7 +?18 -0",
+ "?7 +0-?12 ",
+ "logheight"
+ };
+ aPropertyMap [PROP_Equations] <<= createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings );
+ }
+ {
+ Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+ {
+ Sequence< PropertyValue > aPropSequence (4);
+ {
+ aPropSequence [0].Name = "Position";
+ static const CustomShapeProvider::ParameterPairData aData =
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 4, 21
+ };
+ aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+ }
+ {
+ aPropSequence [1].Name = "RangeYMaximum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 50000);
+ aParameter.Value = aAny;
+ aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+ aPropSequence [1].Value = makeAny (aParameter);
+ }
+ {
+ aPropSequence [2].Name = "RangeYMinimum";
+ EnhancedCustomShapeParameter aParameter;
+ Any aAny ((sal_Int32) 0);
+ 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);
+ }
+ aPropSequenceSequence [0] = aPropSequence;
+ }
+ aPropertyMap [PROP_Handles] <<= aPropSequenceSequence;
+ }
+ {
+ aPropertyMap [PROP_MirroredX] <<= Any ((sal_Bool) sal_False);
+ }
+ {
+ aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False);
+ }
+ {
+ Sequence< PropertyValue > aPropSequence (3);
+ {
+ aPropSequence [0].Name = "Coordinates";
+ static const CustomShapeProvider::ParameterPairData aData[] = {
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 5, 8
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 15, 19
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::NORMAL,
+ 4, 0
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 16, 19
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 6, 8
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 17, 7
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 6, 9
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 16, 20
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 4, 22
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 15, 20
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 5, 9
+ },
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 14, 7
+ }
+ };
+ aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+ }
+ {
+ aPropSequence [1].Name = "Segments";
+ static const sal_uInt16 nValues[] = {
+ // Command, Count
+ 1,1,
+ 2,11,
+ 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,
+ 14, 19
+ };
+ aTextFrame.TopLeft = createParameterPair(&aData);
+ }
+ {
+ static const CustomShapeProvider::ParameterPairData aData =
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
+ 17, 20
+ };
+ aTextFrame.BottomRight = createParameterPair(&aData);
+ }
+ aTextFrameSeq [0] = aTextFrame;
+ }
+ aPropSequence [2].Value = makeAny (aTextFrameSeq);
+ }
+ aPropertyMap [PROP_Path] <<= aPropSequence;
+ }
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
+ aPropertyMap [ PROP_Type ] <<= OUString("ooxml-star6");
+
+ return aPropertyMap;
+ }
+};
class ShapeCround2SameRect : public CustomShapeProvider
{
virtual PropertyMap getProperties()
@@ -601,136 +819,135 @@ class ShapeCdiamond : public CustomShapeProvider
return aPropertyMap;
}
};
-class ShapeCellipseRibbon : public CustomShapeProvider
+class ShapeCcallout2 : public CustomShapeProvider
{
virtual PropertyMap getProperties()
{
PropertyMap aPropertyMap;
{
- Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
+ Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (6);
{
- 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) 12500);
+ 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 [PROP_AdjustmentValues] <<= aAdjSequence;
}
{
static const char *aStrings[] = {
- "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
- "if(25000-$1 ,25000,if(75000-$1 ,$1 ,75000))",
- "100000+0-?0 ",
- "?2 *1/2",
- "?0 +0-?3 ",
- "max(0,?4 )",
- "if(?5 -$2 ,?5 ,if(?0 -$2 ,$2 ,?0 ))",
- "logwidth*?1 /200000",
+ "logheight*$0 /100000",
+ "logwidth*$1 /100000",
+ "logheight*$2 /100000",
+ "logwidth*$3 /100000",
+ "logheight*$4 /100000",
+ "logwidth*$5 /100000",
+ "logwidth",
+ "logheight/2",
"logwidth/2",
- "?8 +0-?7 ",
- "logwidth/8",
- "?9 +?10 -0",
- "logwidth+0-?11 ",
- "logwidth+0-?9 ",
- "logwidth+0-?10 ",
- "logheight*?6 /100000",
- "4*?15 /logwidth",
- "?11 *?11 /logwidth",
- "?11 +0-?17 ",
- "?16 *?18 /1",
- "?11 *1/2",
- "?16 *?20 /1",
- "logwidth+0-?20 ",
- "logheight*?0 /100000",
- "?23 +0-?15 ",
- "?9 *?9 /logwidth",
- "?9 +0-?25 ",
- "?16 *?26 /1",
- "?27 +?24 -0",
- "?15 +?24 -?28 ",
- "?29 +?15 -0",
- "?30 +?24 -0",
- "logheight+0-?23 ",
- "?15 *14/16",
- "(?33 +?32 )/2",
- "?27 +?32 -0",
- "?28 +?32 -0",
- "?9 *1/2",
- "?16 *?37 /1",
- "?38 +?32 -0",
- "logwidth+0-?37 ",
- "?31 +?32 -0",
- "?19 +?24 -0",
- "?23 +?23 -?42 ",
- "logheight+0-?15 ",
- "logheight",
- "logwidth"
+ "logheight"
};
aPropertyMap [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,
- 8, 23
+ 1, 0
};
aPropSequence [0].Value = makeAny (createParameterPair(&aData));
}
{
- aPropSequence [1].Name = "RangeYMaximum";
+ aPropSequence [1].Name = "RangeXMaximum";
EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 100000);
+ 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";
+ 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 (4);
+ Sequence< PropertyValue > aPropSequence (7);
{
aPropSequence [0].Name = "Position";
static const CustomShapeProvider::ParameterPairData aData =
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 9, 45
+ 3, 2
};
aPropSequence [0].Value = makeAny (createParameterPair(&aData));
}
{
aPropSequence [1].Name = "RangeXMaximum";
EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 75000);
+ Any aAny ((sal_Int32) 2147483647);
aParameter.Value = aAny;
aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
aPropSequence [1].Value = makeAny (aParameter);
@@ -738,50 +955,92 @@ class ShapeCellipseRibbon : public CustomShapeProvider
{
aPropSequence [2].Name = "RangeXMinimum";
EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 25000);
+ 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::NORMAL,
EnhancedCustomShapeParameterType::EQUATION,
- 0, 44
+ EnhancedCustomShapeParameterType::EQUATION,
+ 5, 4
};
aPropSequence [0].Value = makeAny (createParameterPair(&aData));
}
{
- aPropSequence [1].Name = "RangeYMaximum";
+ aPropSequence [1].Name = "RangeXMaximum";
EnhancedCustomShapeParameter aParameter;
- Any aAny ((sal_Int32) 0);
+ 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) 5);
+ Any aAny ((sal_Int32) -2147483647);
aParameter.Value = aAny;
- aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+ 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;
}
@@ -805,144 +1064,292 @@ class ShapeCellipseRibbon : public CustomShapeProvider
},
{
EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 20, 21
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 11, 19
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 9, 28
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 8, 31
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 13, 28
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 12, 19
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 22, 21
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::NORMAL,
- 46, 0
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 14, 34
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 46, 32
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 40, 39
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 13, 35
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 13, 36
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 8, 41
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 9, 36
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 9, 35
+ 6, 0
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 37, 39
+ 6, 9
},
{
EnhancedCustomShapeParameterType::NORMAL,
EnhancedCustomShapeParameterType::EQUATION,
- 0, 32
+ 0, 9
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 10, 34
+ 1, 0
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 11, 42
+ 3, 2
},
{
EnhancedCustomShapeParameterType::EQUATION,
EnhancedCustomShapeParameterType::EQUATION,
- 11, 19
- },
+ 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,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,
- 9, 28
- },
+ static const CustomShapeProvider::ParameterPairData aData =
+ {
+ EnhancedCustomShapeParameterType::NORMAL,
+ EnhancedCustomShapeParameterType::NORMAL,
+ 0, 0
+ };
+ aTextFrame.TopLeft = createParameterPair(&aData);
+ }
{
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 8, 31
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 13, 28
- },
- {
- EnhancedCustomShapeParameterType::EQUATION,
- EnhancedCustomShapeParameterType::EQUATION,
- 12, 19
- },
+ static const CustomShapeProvider::ParameterPairData aData =
+ {
+ EnhancedCustomShapeParameterType::EQUATION,
+ EnhancedCustomShapeParameterType::EQUATION,
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list