From f1567edb7fc2661e1e05b95243bee65fc268984d Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 15 Aug 2013 17:12:02 +0300 Subject: 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 --- oox/source/drawingml/customshapepresets1.cxx | 14 +- oox/source/drawingml/customshapepresets2.cxx | 444 ++++---- oox/source/drawingml/customshapepresets3.cxx | 1453 ++++++++++++++------------ oox/source/drawingml/customshapepresets4.cxx | 630 ++++------- oox/source/drawingml/customshapepresets5.cxx | 333 +++--- oox/source/drawingml/customshapepresets6.cxx | 132 ++- 6 files changed, 1515 insertions(+), 1491 deletions(-) (limited to 'oox/source') diff --git a/oox/source/drawingml/customshapepresets1.cxx b/oox/source/drawingml/customshapepresets1.cxx index f2bcb4baa119..9e7371f6fa15 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 +#include #include #include #include @@ -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 023588a1fd36..315660de32c9 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 +#include #include #include #include @@ -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 7208cf125a53..171225abd167 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 +#include #include #include #include @@ -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; } @@ -803,146 +1062,294 @@ class ShapeCellipseRibbon : public CustomShapeProvider EnhancedCustomShapeParameterType::NORMAL, 0, 0 }, - { - 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, + 6, 9 + }; + 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-callout2"); + + return aPropertyMap; + } +}; +class ShapeCellipseRibbon : public CustomShapeProvider +{ + virtual PropertyMap getProperties() + { + PropertyMap aPropertyMap; + + { + Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3); + { + Any aAny ((sal_Int32) 25000); + aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = "adj1"; + } + { + Any aAny ((sal_Int32) 50000); + aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = "adj2"; + } + { + Any aAny ((sal_Int32) 12500); + aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = "adj3"; + } + 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", + "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" + }; + aPropertyMap [PROP_Equations] <<= createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ); + } + { + Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3); + { + Sequence< PropertyValue > aPropSequence (4); + { + aPropSequence [0].Name = "Position"; + static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, EnhancedCustomShapeParameterType::EQUATION, - 12, 42 - }, + 8, 23 + }; + aPropSequence [0].Value = makeAny (createParameterPair(&aData)); + } + { + aPropSequence [1].Name = "RangeYMaximum"; + EnhancedCustomShapeParameter aParameter; + Any aAny ((sal_Int32) 100000); + 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; + } + { + Sequence< PropertyValue > aPropSequence (4); + { + aPropSequence [0].Name = "Position"; + static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, EnhancedCustomShapeParameterType::EQUATION, - 8, 43 - }, + 9, 45 + }; + aPropSequence [0].Value = makeAny (createParameterPair(&aData)); + } + { + aPropSequence [1].Name = "RangeXMaximum"; + EnhancedCustomShapeParameter aParameter; + Any aAny ((sal_Int32) 75000); + aParameter.Value = aAny; + aParameter.Type = EnhancedCustomShapeParameterType::NORMAL; + aPropSequence [1].Value = makeAny (aParameter); + } + { + aPropSequence [2].Name = "RangeXMinimum"; + EnhancedCustomShapeParameter aParameter; + Any aAny ((sal_Int32) 25000); + 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); + } + aPropSequenceSequence [1] = aPropSequence; + } + { + Sequence< PropertyValue > aPropSequence (4); + { + aPropSequence [0].Name = "Position"; + static const CustomShapeProvider::ParameterPairData aData = { + EnhancedCustomShapeParameterType::NORMAL, EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::EQUATION, - 11, 42 - }, + 0, 44 + }; + aPropSequence [0].Value = makeAny (createParameterPair(&aData)); + } + { + aPropSequence [1].Name = "RangeYMaximum"; + EnhancedCustomShapeParameter aParameter; + Any aAny ((sal_Int32) 0); + aParameter.Value = aAny; + aParameter.Type = EnhancedCustomShapeParameterType::EQUATION; + aPropSequence [1].Value = makeAny (aParameter); + } + { + aPropSequence [2].Name = "RangeYMinimum"; + EnhancedCustomShapeParameter aParameter; + Any aAny ((sal_Int32) 5); + aParameter.Value = aAny; + aParameter.Type = EnhancedCustomShapeParameterType::EQUATION; + aPropSequence [2].Value = makeAny (aParameter); + } + { + aPropSequence [3].Name = "RefY"; + Any aAny ((sal_Int32) 2); + aPropSequence [3].Value = makeAny (aAny); + } + aPropSequenceSequence [2] = 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::NORMAL, @@ -1046,32 +1453,32 @@ class ShapeCellipseRibbon : public CustomShapeProvider { EnhancedCustomShapeParameterType::EQUATION, EnhancedCustomShapeParameterType::EQUATION, - 9, 35 + 11, 42 }, { EnhancedCustomShapeParameterType::EQUATION, EnhancedCustomShapeParameterType::EQUATION, - 9, 28 + 11, 19 }, { EnhancedCustomShapeParameterType::EQUATION, EnhancedCustomShapeParameterType::EQUATION, - 13, 28 + 9, 28 }, { EnhancedCustomShapeParameterType::EQUATION, EnhancedCustomShapeParameterType::EQUATION, - 13, 35 + 8, 31 }, { EnhancedCustomShapeParameterType::EQUATION, EnhancedCustomShapeParameterType::EQUATION, - 11, 19 + 13, 28 }, { EnhancedCustomShapeParameterType::EQUATION, EnhancedCustomShapeParameterType::EQUATION, - 11, 42 + 12, 19 }, { EnhancedCustomShapeParameterType::EQUATION, @@ -1081,381 +1488,152 @@ class ShapeCellipseRibbon : public CustomShapeProvider { EnhancedCustomShapeParameterType::EQUATION, EnhancedCustomShapeParameterType::EQUATION, - 12, 19 - } - }; - aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); - } - { - aPropSequence [1].Name = "Segments"; - static const sal_uInt16 nValues[] = { - // Command, Count - 1,1, - 16,1, - 2,1, - 16,1, - 2,1, - 16,1, - 2,2, - 16,1, - 2,1, - 16,1, - 2,1, - 16,1, - 2,1, - 4,0, - 7,0, - 5,0, - 1,1, - 2,2, - 16,1, - 2,2, - 16,1, - 4,0, - 19,0, - 7,0, - 5,0, - 1,1, - 16,1, - 2,1, - 16,1, - 2,1, - 16,1, - 2,2, - 16,1, - 2,1, - 16,1, - 2,1, - 16,1, - 2,1, - 4,0, - 1,1, - 2,1, - 1,1, - 2,1, - 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; + 8, 43 + }, { - static const CustomShapeProvider::ParameterPairData aData = - { - EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::EQUATION, - 9, 23 - }; - aTextFrame.TopLeft = createParameterPair(&aData); - } + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::EQUATION, + 11, 42 + }, { - static const CustomShapeProvider::ParameterPairData aData = - { - EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::EQUATION, - 13, 36 - }; - 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-ellipseRibbon"); - - return aPropertyMap; - } -}; -class ShapeCcallout2 : public CustomShapeProvider -{ - virtual PropertyMap getProperties() - { - PropertyMap aPropertyMap; - - { - Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (6); - { - 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) 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[] = { - "logheight*$0 /100000", - "logwidth*$1 /100000", - "logheight*$2 /100000", - "logwidth*$3 /100000", - "logheight*$4 /100000", - "logwidth*$5 /100000", - "logwidth", - "logheight/2", - "logwidth/2", - "logheight" - }; - aPropertyMap [PROP_Equations] <<= createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ); - } - { - Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3); - { - Sequence< PropertyValue > aPropSequence (7); - { - aPropSequence [0].Name = "Position"; - static const CustomShapeProvider::ParameterPairData aData = + EnhancedCustomShapeParameterType::NORMAL, + EnhancedCustomShapeParameterType::NORMAL, + 0, 0 + }, { 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 = + 20, 21 + }, { 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; - } - { - Sequence< PropertyValue > aPropSequence (7); - { - aPropSequence [0].Name = "Position"; - static const CustomShapeProvider::ParameterPairData aData = + 11, 19 + }, { 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 [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[] = { + 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::NORMAL, - EnhancedCustomShapeParameterType::NORMAL, - 0, 0 + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::EQUATION, + 13, 36 }, { EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::NORMAL, - 6, 0 + EnhancedCustomShapeParameterType::EQUATION, + 8, 41 }, { EnhancedCustomShapeParameterType::EQUATION, EnhancedCustomShapeParameterType::EQUATION, - 6, 9 + 9, 36 + }, + { + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::EQUATION, + 9, 35 + }, + { + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::EQUATION, + 37, 39 }, { EnhancedCustomShapeParameterType::NORMAL, EnhancedCustomShapeParameterType::EQUATION, - 0, 9 + 0, 32 }, { EnhancedCustomShapeParameterType::EQUATION, EnhancedCustomShapeParameterType::EQUATION, - 1, 0 + 10, 34 }, { EnhancedCustomShapeParameterType::EQUATION, EnhancedCustomShapeParameterType::EQUATION, - 3, 2 + 9, 35 }, { EnhancedCustomShapeParameterType::EQUATION, EnhancedCustomShapeParameterType::EQUATION, - 5, 4 + 9, 28 + }, + { + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::EQUATION, + 13, 28 + }, + { + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::EQUATION, + 13, 35 + }, + { + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::EQUATION, + 11, 19 + }, + { + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::EQUATION, + 11, 42 + }, + { + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::EQUATION, + 12, 42 + }, + { + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::EQUATION, + 12, 19 } }; aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); @@ -1465,12 +1643,52 @@ class ShapeCcallout2 : public CustomShapeProvider static const sal_uInt16 nValues[] = { // Command, Count 1,1, - 2,3, + 16,1, + 2,1, + 16,1, + 2,1, + 16,1, + 2,2, + 16,1, + 2,1, + 16,1, + 2,1, + 16,1, + 2,1, + 4,0, + 7,0, + 5,0, + 1,1, + 2,2, + 16,1, + 2,2, + 16,1, 4,0, + 19,0, 7,0, 5,0, 1,1, + 16,1, + 2,1, + 16,1, + 2,1, + 16,1, 2,2, + 16,1, + 2,1, + 16,1, + 2,1, + 16,1, + 2,1, + 4,0, + 1,1, + 2,1, + 1,1, + 2,1, + 1,1, + 2,1, + 1,1, + 2,1, 6,0, 5,0 }; @@ -1484,9 +1702,9 @@ class ShapeCcallout2 : public CustomShapeProvider { static const CustomShapeProvider::ParameterPairData aData = { - EnhancedCustomShapeParameterType::NORMAL, - EnhancedCustomShapeParameterType::NORMAL, - 0, 0 + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::EQUATION, + 9, 23 }; aTextFrame.TopLeft = createParameterPair(&aData); } @@ -1495,7 +1713,7 @@ class ShapeCcallout2 : public CustomShapeProvider { EnhancedCustomShapeParameterType::EQUATION, EnhancedCustomShapeParameterType::EQUATION, - 6, 9 + 13, 36 }; aTextFrame.BottomRight = createParameterPair(&aData); } @@ -1513,7 +1731,7 @@ class ShapeCcallout2 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= OUString("ooxml-callout2"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-ellipseRibbon"); return aPropertyMap; } @@ -8921,163 +9139,15 @@ class ShapeCsnip2SameRect : public CustomShapeProvider return aPropertyMap; } }; -class ShapeCtriangle : public CustomShapeProvider -{ - virtual PropertyMap getProperties() - { - PropertyMap aPropertyMap; - - { - Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1); - { - Any aAny ((sal_Int32) 50000); - aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = "adj"; - } - aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; - } - { - static const char *aStrings[] = { - "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))", - "logwidth*?0 /200000", - "logwidth*?0 /100000", - "logwidth/2", - "?1 +?3 -0", - "logheight/2", - "logheight", - "logwidth" - }; - 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::NORMAL, - 2, 0 - }; - 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; - } - 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, 6 - }, - { - EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::NORMAL, - 2, 0 - }, - { - EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::EQUATION, - 7, 6 - } - }; - aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); - } - { - aPropSequence [1].Name = "Segments"; - static const sal_uInt16 nValues[] = { - // Command, Count - 1,1, - 2,2, - 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, 5 - }; - aTextFrame.TopLeft = createParameterPair(&aData); - } - { - static const CustomShapeProvider::ParameterPairData aData = - { - EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::EQUATION, - 4, 6 - }; - 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-triangle"); - - return aPropertyMap; - } -}; } // anonymous namespace void CustomShapeProperties::initializePresetsMap3() { + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "star6" ) ] = new ShapeCstar6(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "round2SameRect" ) ] = new ShapeCround2SameRect(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "nonIsoscelesTrapezoid" ) ] = new ShapeCnonIsoscelesTrapezoid(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "diamond" ) ] = new ShapeCdiamond(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "ellipseRibbon" ) ] = new ShapeCellipseRibbon(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "callout2" ) ] = new ShapeCcallout2(); + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "ellipseRibbon" ) ] = new ShapeCellipseRibbon(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "pie" ) ] = new ShapeCpie(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "star4" ) ] = new ShapeCstar4(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartPredefinedProcess" ) ] = new ShapeCflowChartPredefinedProcess(); @@ -9107,7 +9177,6 @@ void CustomShapeProperties::initializePresetsMap3() maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "gear6" ) ] = new ShapeCgear6(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "halfFrame" ) ] = new ShapeChalfFrame(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "snip2SameRect" ) ] = new ShapeCsnip2SameRect(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "triangle" ) ] = new ShapeCtriangle(); } } } // oox // drawingml diff --git a/oox/source/drawingml/customshapepresets4.cxx b/oox/source/drawingml/customshapepresets4.cxx index f79fb8e53e5f..7a01d6d29420 100644 --- a/oox/source/drawingml/customshapepresets4.cxx +++ b/oox/source/drawingml/customshapepresets4.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 +#include #include #include #include @@ -19,6 +23,155 @@ namespace oox { namespace drawingml { namespace { +class ShapeCtriangle : public CustomShapeProvider +{ + virtual PropertyMap getProperties() + { + PropertyMap aPropertyMap; + + { + Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1); + { + Any aAny ((sal_Int32) 50000); + aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = "adj"; + } + aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; + } + { + static const char *aStrings[] = { + "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))", + "logwidth*?0 /200000", + "logwidth*?0 /100000", + "logwidth/2", + "?1 +?3 -0", + "logheight/2", + "logheight", + "logwidth" + }; + 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::NORMAL, + 2, 0 + }; + 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; + } + 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, 6 + }, + { + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::NORMAL, + 2, 0 + }, + { + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::EQUATION, + 7, 6 + } + }; + aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); + } + { + aPropSequence [1].Name = "Segments"; + static const sal_uInt16 nValues[] = { + // Command, Count + 1,1, + 2,2, + 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, 5 + }; + aTextFrame.TopLeft = createParameterPair(&aData); + } + { + static const CustomShapeProvider::ParameterPairData aData = + { + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::EQUATION, + 4, 6 + }; + 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-triangle"); + + return aPropertyMap; + } +}; class ShapeCteardrop : public CustomShapeProvider { virtual PropertyMap getProperties() @@ -1399,201 +1552,13 @@ class ShapeCline : public CustomShapeProvider static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, - EnhancedCustomShapeParameterType::NORMAL, - 0, 0 - }, - { - EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::EQUATION, - 0, 1 - } - }; - 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, - 5,0 - }; - aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); - } - 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-line"); - - return aPropertyMap; - } -}; -class ShapeCdownArrow : 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", - "logheight+0-?4 ", - "logwidth*?2 /200000", - "logwidth/2", - "?7 +0-?6 ", - "?7 +?6 -0", - "logwidth/2", - "?8 *?4 /?10 ", - "?5 +?11 -0", - "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::NORMAL, - 8, 0 - }; - 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::EQUATION, - 8, 5 - }, - { - EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::NORMAL, - 8, 0 - }, - { - EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::NORMAL, - 9, 0 - }, - { - EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::EQUATION, - 9, 5 - }, - { - EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::EQUATION, - 14, 5 + EnhancedCustomShapeParameterType::NORMAL, + 0, 0 }, { EnhancedCustomShapeParameterType::EQUATION, EnhancedCustomShapeParameterType::EQUATION, - 7, 13 + 0, 1 } }; aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); @@ -1603,39 +1568,11 @@ class ShapeCdownArrow : public CustomShapeProvider static const sal_uInt16 nValues[] = { // Command, Count 1,1, - 2,6, - 4,0, + 2,1, 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::NORMAL, - 8, 0 - }; - aTextFrame.TopLeft = createParameterPair(&aData); - } - { - static const CustomShapeProvider::ParameterPairData aData = - { - EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::EQUATION, - 9, 12 - }; - aTextFrame.BottomRight = createParameterPair(&aData); - } - aTextFrameSeq [0] = aTextFrame; - } - aPropSequence [2].Value = makeAny (aTextFrameSeq); - } aPropertyMap [PROP_Path] <<= aPropSequence; } { @@ -1646,12 +1583,12 @@ class ShapeCdownArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= OUString("ooxml-downArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-line"); return aPropertyMap; } }; -class ShapeCupArrow : public CustomShapeProvider +class ShapeCdownArrow : public CustomShapeProvider { virtual PropertyMap getProperties() { @@ -1678,16 +1615,16 @@ class ShapeCupArrow : public CustomShapeProvider "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))", "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))", "?0 *?3 /100000", - "0+?4 -0", + "logheight+0-?4 ", "logwidth*?2 /200000", "logwidth/2", "?7 +0-?6 ", "?7 +?6 -0", "logwidth/2", "?8 *?4 /?10 ", - "?5 +0 -?11", - "logwidth", - "logheight" + "?5 +?11 -0", + "logheight", + "logwidth" }; aPropertyMap [PROP_Equations] <<= createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ); } @@ -1700,8 +1637,8 @@ class ShapeCupArrow : public CustomShapeProvider static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::EQUATION, - 8, 14 + EnhancedCustomShapeParameterType::NORMAL, + 8, 0 }; aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } @@ -1777,24 +1714,24 @@ class ShapeCupArrow : public CustomShapeProvider aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { + EnhancedCustomShapeParameterType::NORMAL, EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::EQUATION, - 8, 5 + 0, 5 }, { - EnhancedCustomShapeParameterType::NORMAL, EnhancedCustomShapeParameterType::EQUATION, - 0, 5 + EnhancedCustomShapeParameterType::EQUATION, + 8, 5 }, { EnhancedCustomShapeParameterType::EQUATION, EnhancedCustomShapeParameterType::NORMAL, - 7, 0 + 8, 0 }, { EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::EQUATION, - 13, 5 + EnhancedCustomShapeParameterType::NORMAL, + 9, 0 }, { EnhancedCustomShapeParameterType::EQUATION, @@ -1804,12 +1741,12 @@ class ShapeCupArrow : public CustomShapeProvider { EnhancedCustomShapeParameterType::EQUATION, EnhancedCustomShapeParameterType::EQUATION, - 9, 14 + 14, 5 }, { EnhancedCustomShapeParameterType::EQUATION, EnhancedCustomShapeParameterType::EQUATION, - 8, 14 + 7, 13 } }; aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); @@ -1834,8 +1771,8 @@ class ShapeCupArrow : public CustomShapeProvider static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::EQUATION, - 8, 12 + EnhancedCustomShapeParameterType::NORMAL, + 8, 0 }; aTextFrame.TopLeft = createParameterPair(&aData); } @@ -1844,7 +1781,7 @@ class ShapeCupArrow : public CustomShapeProvider { EnhancedCustomShapeParameterType::EQUATION, EnhancedCustomShapeParameterType::EQUATION, - 9, 13 + 9, 12 }; aTextFrame.BottomRight = createParameterPair(&aData); } @@ -1862,7 +1799,7 @@ class ShapeCupArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= OUString("ooxml-upArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-downArrow"); return aPropertyMap; } @@ -8479,209 +8416,10 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider return aPropertyMap; } }; -class ShapeCplus : public CustomShapeProvider -{ - virtual PropertyMap getProperties() - { - PropertyMap aPropertyMap; - - { - Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1); - { - Any aAny ((sal_Int32) 25000); - aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = "adj"; - } - aPropertyMap [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 ", - "logwidth+0-logheight", - "if(?5 ,0,?2 )", - "if(?5 ,logwidth,?3 )", - "if(?5 ,?2 ,0)", - "if(?5 ,?4 ,logheight)", - "logwidth/2", - "logheight/2", - "logheight", - "logwidth" - }; - 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::NORMAL, - 2, 0 - }; - aPropSequence [0].Value = makeAny (createParameterPair(&aData)); - } - { - aPropSequence [1].Name = "RangeXMaximum"; - EnhancedCustomShapeParameter aParameter; - Any aAny ((sal_Int32) 50000); - 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; - } - 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, 2 - }, - { - EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::EQUATION, - 2, 2 - }, - { - EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::NORMAL, - 2, 0 - }, - { - EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::NORMAL, - 3, 0 - }, - { - EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::EQUATION, - 3, 2 - }, - { - EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::EQUATION, - 13, 2 - }, - { - EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::EQUATION, - 13, 4 - }, - { - EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::EQUATION, - 3, 4 - }, - { - EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::EQUATION, - 3, 12 - }, - { - EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::EQUATION, - 2, 12 - }, - { - EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::EQUATION, - 2, 4 - }, - { - EnhancedCustomShapeParameterType::NORMAL, - EnhancedCustomShapeParameterType::EQUATION, - 0, 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,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, - 6, 8 - }; - aTextFrame.TopLeft = createParameterPair(&aData); - } - { - static const CustomShapeProvider::ParameterPairData aData = - { - EnhancedCustomShapeParameterType::EQUATION, - EnhancedCustomShapeParameterType::EQUATION, - 7, 9 - }; - 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-plus"); - - return aPropertyMap; - } -}; } // anonymous namespace void CustomShapeProperties::initializePresetsMap4() { + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "triangle" ) ] = new ShapeCtriangle(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "teardrop" ) ] = new ShapeCteardrop(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartDocument" ) ] = new ShapeCflowChartDocument(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "rightArrowCallout" ) ] = new ShapeCrightArrowCallout(); @@ -8691,7 +8429,6 @@ void CustomShapeProperties::initializePresetsMap4() maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartMerge" ) ] = new ShapeCflowChartMerge(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "line" ) ] = new ShapeCline(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "downArrow" ) ] = new ShapeCdownArrow(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "upArrow" ) ] = new ShapeCupArrow(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "curvedDownArrow" ) ] = new ShapeCcurvedDownArrow(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonReturn" ) ] = new ShapeCactionButtonReturn(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartInputOutput" ) ] = new ShapeCflowChartInputOutput(); @@ -8717,7 +8454,6 @@ void CustomShapeProperties::initializePresetsMap4() maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "curvedUpArrow" ) ] = new ShapeCcurvedUpArrow(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "snip1Rect" ) ] = new ShapeCsnip1Rect(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "ellipseRibbon2" ) ] = new ShapeCellipseRibbon2(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "plus" ) ] = new ShapeCplus(); } } } // oox // drawingml diff --git a/oox/source/drawingml/customshapepresets5.cxx b/oox/source/drawingml/customshapepresets5.cxx index 1f69833b1c11..a2001c2b6125 100644 --- a/oox/source/drawingml/customshapepresets5.cxx +++ b/oox/source/drawingml/customshapepresets5.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 +#include #include #include #include @@ -19,6 +23,206 @@ namespace oox { namespace drawingml { namespace { +class ShapeCplus : public CustomShapeProvider +{ + virtual PropertyMap getProperties() + { + PropertyMap aPropertyMap; + + { + Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1); + { + Any aAny ((sal_Int32) 25000); + aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = "adj"; + } + aPropertyMap [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 ", + "logwidth+0-logheight", + "if(?5 ,0,?2 )", + "if(?5 ,logwidth,?3 )", + "if(?5 ,?2 ,0)", + "if(?5 ,?4 ,logheight)", + "logwidth/2", + "logheight/2", + "logheight", + "logwidth" + }; + 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::NORMAL, + 2, 0 + }; + aPropSequence [0].Value = makeAny (createParameterPair(&aData)); + } + { + aPropSequence [1].Name = "RangeXMaximum"; + EnhancedCustomShapeParameter aParameter; + Any aAny ((sal_Int32) 50000); + 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; + } + 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, 2 + }, + { + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::EQUATION, + 2, 2 + }, + { + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::NORMAL, + 2, 0 + }, + { + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::NORMAL, + 3, 0 + }, + { + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::EQUATION, + 3, 2 + }, + { + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::EQUATION, + 13, 2 + }, + { + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::EQUATION, + 13, 4 + }, + { + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::EQUATION, + 3, 4 + }, + { + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::EQUATION, + 3, 12 + }, + { + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::EQUATION, + 2, 12 + }, + { + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::EQUATION, + 2, 4 + }, + { + EnhancedCustomShapeParameterType::NORMAL, + EnhancedCustomShapeParameterType::EQUATION, + 0, 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,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, + 6, 8 + }; + aTextFrame.TopLeft = createParameterPair(&aData); + } + { + static const CustomShapeProvider::ParameterPairData aData = + { + EnhancedCustomShapeParameterType::EQUATION, + EnhancedCustomShapeParameterType::EQUATION, + 7, 9 + }; + 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-plus"); + + return aPropertyMap; + } +}; class ShapeCaccentCallout3 : public CustomShapeProvider { virtual PropertyMap getProperties() @@ -9361,128 +9565,10 @@ class ShapeCupArrowCallout : public CustomShapeProvider return aPropertyMap; } }; -class ShapeCflowChartProcess : public CustomShapeProvider -{ - virtual PropertyMap getProperties() - { - PropertyMap aPropertyMap; - - { - aPropertyMap [PROP_AdjustmentValues] <<= Sequence< OUString >(0); - } - { - static const char *aStrings[] = { - "logwidth/2", - "logheight/2", - "logheight", - "logwidth" - }; - aPropertyMap [PROP_Equations] <<= createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ); - } - { - aPropertyMap [PROP_Handles] <<= Sequence< OUString >(0); - } - { - aPropertyMap [PROP_MirroredX] <<= Any ((sal_Bool) sal_False); - } - { - aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False); - } - { - Sequence< PropertyValue > aPropSequence (4); - { - aPropSequence [0].Name = "Coordinates"; - static const CustomShapeProvider::ParameterPairData aData[] = { - { - EnhancedCustomShapeParameterType::NORMAL, - EnhancedCustomShapeParameterType::NORMAL, - 0, 0 - }, - { - EnhancedCustomShapeParameterType::NORMAL, - EnhancedCustomShapeParameterType::NORMAL, - 1, 0 - }, - { - EnhancedCustomShapeParameterType::NORMAL, - EnhancedCustomShapeParameterType::NORMAL, - 1, 1 - }, - { - EnhancedCustomShapeParameterType::NORMAL, - EnhancedCustomShapeParameterType::NORMAL, - 0, 1 - } - }; - 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 - }; - aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); - } - { - aPropSequence [2].Name = "SubViewSize"; - Sequence< awt::Size > aSizeSequence (1); - { - awt::Size aSize; - aSize.Width = 1; - aSize.Height = 1; - aSizeSequence [0] = aSize; - } - aPropSequence [2].Value = makeAny (aSizeSequence); - } - { - aPropSequence [3].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::EQUATION, - EnhancedCustomShapeParameterType::EQUATION, - 3, 2 - }; - aTextFrame.BottomRight = createParameterPair(&aData); - } - aTextFrameSeq [0] = aTextFrame; - } - aPropSequence [3].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-flowChartProcess"); - - return aPropertyMap; - } -}; } // anonymous namespace void CustomShapeProperties::initializePresetsMap5() { + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "plus" ) ] = new ShapeCplus(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "accentCallout3" ) ] = new ShapeCaccentCallout3(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftCircularArrow" ) ] = new ShapeCleftCircularArrow(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "rightArrow" ) ] = new ShapeCrightArrow(); @@ -9517,7 +9603,6 @@ void CustomShapeProperties::initializePresetsMap5() maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "accentBorderCallout2" ) ] = new ShapeCaccentBorderCallout2(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "pieWedge" ) ] = new ShapeCpieWedge(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "upArrowCallout" ) ] = new ShapeCupArrowCallout(); - maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartProcess" ) ] = new ShapeCflowChartProcess(); } } } // oox // drawingml diff --git a/oox/source/drawingml/customshapepresets6.cxx b/oox/source/drawingml/customshapepresets6.cxx index bd1a51dc866d..a252113037f5 100644 --- a/oox/source/drawingml/customshapepresets6.cxx +++ b/oox/source/drawingml/customshapepresets6.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 +#include #include #include #include @@ -19,6 +23,125 @@ namespace oox { namespace drawingml { namespace { +class ShapeCflowChartProcess : public CustomShapeProvider +{ + virtual PropertyMap getProperties() + { + PropertyMap aPropertyMap; + + { + aPropertyMap [PROP_AdjustmentValues] <<= Sequence< OUString >(0); + } + { + static const char *aStrings[] = { + "logwidth/2", + "logheight/2", + "logheight", + "logwidth" + }; + aPropertyMap [PROP_Equations] <<= createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ); + } + { + aPropertyMap [PROP_Handles] <<= Sequence< OUString >(0); + } + { + aPropertyMap [PROP_MirroredX] <<= Any ((sal_Bool) sal_False); + } + { + aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False); + } + { + Sequence< PropertyValue > aPropSequence (4); + { + aPropSequence [0].Name = "Coordinates"; + static const CustomShapeProvider::ParameterPairData aData[] = { + { + EnhancedCustomShapeParameterType::NORMAL, + EnhancedCustomShapeParameterType::NORMAL, + 0, 0 + }, + { + EnhancedCustomShapeParameterType::NORMAL, + EnhancedCustomShapeParameterType::NORMAL, + 1, 0 + }, + { + EnhancedCustomShapeParameterType::NORMAL, + EnhancedCustomShapeParameterType::NORMAL, + 1, 1 + }, + { + EnhancedCustomShapeParameterType::NORMAL, + EnhancedCustomShapeParameterType::NORMAL, + 0, 1 + } + }; + 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 + }; + aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); + } + { + aPropSequence [2].Name = "SubViewSize"; + Sequence< awt::Size > aSizeSequence (1); + { + awt::Size aSize; + aSize.Width = 1; + aSize.Height = 1; + aSizeSequence [0] = aSize; + } + aPropSequence [2].Value = makeAny (aSizeSequence); + } + { + aPropSequence [3].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::EQUATION, + EnhancedCustomShapeParameterType::EQUATION, + 3, 2 + }; + aTextFrame.BottomRight = createParameterPair(&aData); + } + aTextFrameSeq [0] = aTextFrame; + } + aPropSequence [3].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-flowChartProcess"); + + return aPropertyMap; + } +}; class ShapeCstar5 : public CustomShapeProvider { virtual PropertyMap getProperties() @@ -3314,6 +3437,7 @@ class ShapeCribbon : public CustomShapeProvider } // anonymous namespace void CustomShapeProperties::initializePresetsMap6() { + maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartProcess" ) ] = new ShapeCflowChartProcess(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "star5" ) ] = new ShapeCstar5(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "lineInv" ) ] = new ShapeClineInv(); maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "straightConnector1" ) ] = new ShapeCstraightConnector1(); -- cgit