diff options
Diffstat (limited to 'oox/source/drawingml/customshapepresets1.cxx')
| -rw-r--r-- | oox/source/drawingml/customshapepresets1.cxx | 832 |
1 files changed, 416 insertions, 416 deletions
diff --git a/oox/source/drawingml/customshapepresets1.cxx b/oox/source/drawingml/customshapepresets1.cxx index 5fcf655350dd..f2bcb4baa119 100644 --- a/oox/source/drawingml/customshapepresets1.cxx +++ b/oox/source/drawingml/customshapepresets1.cxx @@ -69,7 +69,7 @@ class ShapeCactionButtonSound : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -235,7 +235,7 @@ class ShapeCactionButtonSound : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -272,7 +272,7 @@ class ShapeCactionButtonSound : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -308,7 +308,7 @@ class ShapeCactionButtonSound : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonSound"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-actionButtonSound"); return aPropertyMap; } @@ -324,22 +324,22 @@ class ShapeCborderCallout1 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 112500); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) -38333); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -361,7 +361,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -371,7 +371,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -379,7 +379,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -387,7 +387,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -395,7 +395,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -403,12 +403,12 @@ class ShapeCborderCallout1 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [6].Value = makeAny (aAny); } @@ -417,7 +417,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -427,7 +427,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -435,7 +435,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -443,7 +443,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -451,7 +451,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -459,12 +459,12 @@ class ShapeCborderCallout1 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 3); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [6].Value = makeAny (aAny); } @@ -481,7 +481,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -517,7 +517,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -532,7 +532,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -568,7 +568,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-borderCallout1"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-borderCallout1"); return aPropertyMap; } @@ -613,7 +613,7 @@ class ShapeCplaqueTabs : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -699,7 +699,7 @@ class ShapeCplaqueTabs : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -726,7 +726,7 @@ class ShapeCplaqueTabs : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -762,7 +762,7 @@ class ShapeCplaqueTabs : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-plaqueTabs"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-plaqueTabs"); return aPropertyMap; } @@ -778,17 +778,17 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -863,7 +863,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -873,7 +873,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2); aParameter.Value = aAny; @@ -881,7 +881,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -889,7 +889,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -898,7 +898,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -908,7 +908,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -916,7 +916,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -924,7 +924,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -933,7 +933,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -943,7 +943,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 15); aParameter.Value = aAny; @@ -951,7 +951,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -959,7 +959,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -976,7 +976,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -1127,7 +1127,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1159,7 +1159,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1195,7 +1195,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-curvedLeftArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-curvedLeftArrow"); return aPropertyMap; } @@ -1211,7 +1211,7 @@ class ShapeCoctagon : public CustomShapeProvider { Any aAny ((sal_Int32) 29289); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1235,7 +1235,7 @@ class ShapeCoctagon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1245,7 +1245,7 @@ class ShapeCoctagon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -1253,7 +1253,7 @@ class ShapeCoctagon : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1261,7 +1261,7 @@ class ShapeCoctagon : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -1278,7 +1278,7 @@ class ShapeCoctagon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -1324,7 +1324,7 @@ class ShapeCoctagon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1335,7 +1335,7 @@ class ShapeCoctagon : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1371,7 +1371,7 @@ class ShapeCoctagon : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-octagon"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-octagon"); return aPropertyMap; } @@ -1387,17 +1387,17 @@ class ShapeCleftRightRibbon : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 16667); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1457,7 +1457,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1467,7 +1467,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -1475,7 +1475,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1483,7 +1483,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -1492,7 +1492,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1502,7 +1502,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 7); aParameter.Value = aAny; @@ -1510,7 +1510,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1518,7 +1518,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -1527,7 +1527,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1537,7 +1537,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 33333); aParameter.Value = aAny; @@ -1545,7 +1545,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1553,7 +1553,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -1570,7 +1570,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -1816,7 +1816,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1852,7 +1852,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1888,7 +1888,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-leftRightRibbon"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-leftRightRibbon"); return aPropertyMap; } @@ -1958,7 +1958,7 @@ class ShapeCactionButtonInformation : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -2244,7 +2244,7 @@ class ShapeCactionButtonInformation : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2293,7 +2293,7 @@ class ShapeCactionButtonInformation : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -2329,7 +2329,7 @@ class ShapeCactionButtonInformation : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonInformation"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-actionButtonInformation"); return aPropertyMap; } @@ -2345,17 +2345,17 @@ class ShapeCbentConnector5 : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -2377,7 +2377,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -2387,7 +2387,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -2395,7 +2395,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -2403,7 +2403,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -2412,7 +2412,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -2422,7 +2422,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -2430,7 +2430,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -2438,7 +2438,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -2447,7 +2447,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -2457,7 +2457,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -2465,7 +2465,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -2473,7 +2473,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -2490,7 +2490,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -2526,7 +2526,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2537,7 +2537,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -2573,7 +2573,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-bentConnector5"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-bentConnector5"); return aPropertyMap; } @@ -2589,27 +2589,27 @@ class ShapeCcircularArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 12500); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 1142319); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 20457681); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) 10800000); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } { Any aAny ((sal_Int32) 12500); aAdjSequence [4].Value = aAny; - aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); + aAdjSequence [4].Name = "adj5"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -2824,7 +2824,7 @@ class ShapeCcircularArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (1); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -2838,7 +2838,7 @@ class ShapeCcircularArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (1); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -2852,7 +2852,7 @@ class ShapeCcircularArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -2862,7 +2862,7 @@ class ShapeCcircularArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RadiusRangeMaximum"); + aPropSequence [1].Name = "RadiusRangeMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -2870,7 +2870,7 @@ class ShapeCcircularArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RadiusRangeMinimum"); + aPropSequence [2].Name = "RadiusRangeMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -2882,7 +2882,7 @@ class ShapeCcircularArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -2892,7 +2892,7 @@ class ShapeCcircularArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RadiusRangeMaximum"); + aPropSequence [1].Name = "RadiusRangeMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 25000); aParameter.Value = aAny; @@ -2900,7 +2900,7 @@ class ShapeCcircularArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RadiusRangeMinimum"); + aPropSequence [2].Name = "RadiusRangeMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -2920,7 +2920,7 @@ class ShapeCcircularArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -2971,7 +2971,7 @@ class ShapeCcircularArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2984,7 +2984,7 @@ class ShapeCcircularArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -3020,7 +3020,7 @@ class ShapeCcircularArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-circularArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-circularArrow"); return aPropertyMap; } @@ -3036,22 +3036,22 @@ class ShapeCdownArrowCallout : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) 64977); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3088,7 +3088,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -3098,7 +3098,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 3); aParameter.Value = aAny; @@ -3106,7 +3106,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -3114,7 +3114,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -3123,7 +3123,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -3133,7 +3133,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -3141,7 +3141,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -3149,7 +3149,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -3158,7 +3158,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -3168,7 +3168,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 5); aParameter.Value = aAny; @@ -3176,7 +3176,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -3184,7 +3184,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -3193,7 +3193,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -3203,7 +3203,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 8); aParameter.Value = aAny; @@ -3211,7 +3211,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -3219,7 +3219,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 3); aPropSequence [3].Value = makeAny (aAny); } @@ -3236,7 +3236,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -3297,7 +3297,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -3308,7 +3308,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -3344,7 +3344,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-downArrowCallout"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-downArrowCallout"); return aPropertyMap; } @@ -3360,7 +3360,7 @@ class ShapeCmathMinus : public CustomShapeProvider { Any aAny ((sal_Int32) 23520); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3383,7 +3383,7 @@ class ShapeCmathMinus : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -3393,7 +3393,7 @@ class ShapeCmathMinus : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 100000); aParameter.Value = aAny; @@ -3401,7 +3401,7 @@ class ShapeCmathMinus : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -3409,7 +3409,7 @@ class ShapeCmathMinus : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -3426,7 +3426,7 @@ class ShapeCmathMinus : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -3452,7 +3452,7 @@ class ShapeCmathMinus : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -3463,7 +3463,7 @@ class ShapeCmathMinus : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -3499,7 +3499,7 @@ class ShapeCmathMinus : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-mathMinus"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-mathMinus"); return aPropertyMap; } @@ -3515,12 +3515,12 @@ class ShapeCgear9 : public CustomShapeProvider { Any aAny ((sal_Int32) 10000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 1763); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3799,7 +3799,7 @@ class ShapeCgear9 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -3809,7 +3809,7 @@ class ShapeCgear9 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 20000); aParameter.Value = aAny; @@ -3817,7 +3817,7 @@ class ShapeCgear9 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -3825,7 +3825,7 @@ class ShapeCgear9 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -3834,7 +3834,7 @@ class ShapeCgear9 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -3844,7 +3844,7 @@ class ShapeCgear9 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2679); aParameter.Value = aAny; @@ -3852,7 +3852,7 @@ class ShapeCgear9 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -3860,7 +3860,7 @@ class ShapeCgear9 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -3877,7 +3877,7 @@ class ShapeCgear9 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -4113,7 +4113,7 @@ class ShapeCgear9 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4141,7 +4141,7 @@ class ShapeCgear9 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4177,7 +4177,7 @@ class ShapeCgear9 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-gear9"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-gear9"); return aPropertyMap; } @@ -4193,7 +4193,7 @@ class ShapeCround1Rect : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4219,7 +4219,7 @@ class ShapeCround1Rect : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -4229,7 +4229,7 @@ class ShapeCround1Rect : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -4237,7 +4237,7 @@ class ShapeCround1Rect : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -4245,7 +4245,7 @@ class ShapeCround1Rect : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -4262,7 +4262,7 @@ class ShapeCround1Rect : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -4298,7 +4298,7 @@ class ShapeCround1Rect : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4311,7 +4311,7 @@ class ShapeCround1Rect : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4347,7 +4347,7 @@ class ShapeCround1Rect : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-round1Rect"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-round1Rect"); return aPropertyMap; } @@ -4363,7 +4363,7 @@ class ShapeCsun : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4430,7 +4430,7 @@ class ShapeCsun : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -4440,7 +4440,7 @@ class ShapeCsun : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 46875); aParameter.Value = aAny; @@ -4448,7 +4448,7 @@ class ShapeCsun : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 12500); aParameter.Value = aAny; @@ -4456,7 +4456,7 @@ class ShapeCsun : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -4473,7 +4473,7 @@ class ShapeCsun : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -4614,7 +4614,7 @@ class ShapeCsun : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4649,7 +4649,7 @@ class ShapeCsun : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4685,7 +4685,7 @@ class ShapeCsun : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-sun"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-sun"); return aPropertyMap; } @@ -4701,7 +4701,7 @@ class ShapeCplaque : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4735,7 +4735,7 @@ class ShapeCplaque : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -4745,7 +4745,7 @@ class ShapeCplaque : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -4753,7 +4753,7 @@ class ShapeCplaque : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -4761,7 +4761,7 @@ class ShapeCplaque : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -4778,7 +4778,7 @@ class ShapeCplaque : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -4844,7 +4844,7 @@ class ShapeCplaque : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4861,7 +4861,7 @@ class ShapeCplaque : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4897,7 +4897,7 @@ class ShapeCplaque : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-plaque"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-plaque"); return aPropertyMap; } @@ -4913,7 +4913,7 @@ class ShapeCchevron : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4939,7 +4939,7 @@ class ShapeCchevron : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -4949,7 +4949,7 @@ class ShapeCchevron : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -4957,7 +4957,7 @@ class ShapeCchevron : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -4965,7 +4965,7 @@ class ShapeCchevron : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -4982,7 +4982,7 @@ class ShapeCchevron : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -5018,7 +5018,7 @@ class ShapeCchevron : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5029,7 +5029,7 @@ class ShapeCchevron : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5065,7 +5065,7 @@ class ShapeCchevron : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-chevron"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-chevron"); return aPropertyMap; } @@ -5102,7 +5102,7 @@ class ShapeCflowChartPreparation : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -5138,7 +5138,7 @@ class ShapeCflowChartPreparation : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5149,7 +5149,7 @@ class ShapeCflowChartPreparation : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (1); { awt::Size aSize; @@ -5160,7 +5160,7 @@ class ShapeCflowChartPreparation : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5196,7 +5196,7 @@ class ShapeCflowChartPreparation : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartPreparation"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartPreparation"); return aPropertyMap; } @@ -5212,7 +5212,7 @@ class ShapeCdiagStripe : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5237,7 +5237,7 @@ class ShapeCdiagStripe : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -5247,7 +5247,7 @@ class ShapeCdiagStripe : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 100000); aParameter.Value = aAny; @@ -5255,7 +5255,7 @@ class ShapeCdiagStripe : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -5263,7 +5263,7 @@ class ShapeCdiagStripe : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -5280,7 +5280,7 @@ class ShapeCdiagStripe : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -5306,7 +5306,7 @@ class ShapeCdiagStripe : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5317,7 +5317,7 @@ class ShapeCdiagStripe : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5353,7 +5353,7 @@ class ShapeCdiagStripe : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-diagStripe"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-diagStripe"); return aPropertyMap; } @@ -5369,12 +5369,12 @@ class ShapeCpentagon : public CustomShapeProvider { Any aAny ((sal_Int32) 105146); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("hf"); + aAdjSequence [0].Name = "hf"; } { Any aAny ((sal_Int32) 110557); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("vf"); + aAdjSequence [1].Name = "vf"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5414,7 +5414,7 @@ class ShapeCpentagon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -5445,7 +5445,7 @@ class ShapeCpentagon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5456,7 +5456,7 @@ class ShapeCpentagon : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5492,7 +5492,7 @@ class ShapeCpentagon : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-pentagon"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-pentagon"); return aPropertyMap; } @@ -5566,7 +5566,7 @@ class ShapeCfunnel : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -5617,7 +5617,7 @@ class ShapeCfunnel : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5633,7 +5633,7 @@ class ShapeCfunnel : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5669,7 +5669,7 @@ class ShapeCfunnel : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-funnel"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-funnel"); return aPropertyMap; } @@ -5698,7 +5698,7 @@ class ShapeCchartStar : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -5754,7 +5754,7 @@ class ShapeCchartStar : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5774,7 +5774,7 @@ class ShapeCchartStar : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (2); { awt::Size aSize; @@ -5800,7 +5800,7 @@ class ShapeCchartStar : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-chartStar"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-chartStar"); return aPropertyMap; } @@ -5816,22 +5816,22 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 112500); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) -38333); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5853,7 +5853,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5863,7 +5863,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -5871,7 +5871,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -5879,7 +5879,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -5887,7 +5887,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -5895,12 +5895,12 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [6].Value = makeAny (aAny); } @@ -5909,7 +5909,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5919,7 +5919,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -5927,7 +5927,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -5935,7 +5935,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -5943,7 +5943,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -5951,12 +5951,12 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 3); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [6].Value = makeAny (aAny); } @@ -5973,7 +5973,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -6019,7 +6019,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6038,7 +6038,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6074,7 +6074,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-accentBorderCallout1"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-accentBorderCallout1"); return aPropertyMap; } @@ -6090,12 +6090,12 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6124,7 +6124,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6134,7 +6134,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 100000); aParameter.Value = aAny; @@ -6142,7 +6142,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6150,7 +6150,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -6159,7 +6159,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6169,7 +6169,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -6177,7 +6177,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6185,7 +6185,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -6202,7 +6202,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -6248,7 +6248,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6259,7 +6259,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6295,7 +6295,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-notchedRightArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-notchedRightArrow"); return aPropertyMap; } @@ -6311,7 +6311,7 @@ class ShapeCrightBracket : public CustomShapeProvider { Any aAny ((sal_Int32) 8333); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6347,7 +6347,7 @@ class ShapeCrightBracket : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6357,7 +6357,7 @@ class ShapeCrightBracket : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -6365,7 +6365,7 @@ class ShapeCrightBracket : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6373,7 +6373,7 @@ class ShapeCrightBracket : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -6390,7 +6390,7 @@ class ShapeCrightBracket : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -6456,7 +6456,7 @@ class ShapeCrightBracket : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6476,7 +6476,7 @@ class ShapeCrightBracket : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6512,7 +6512,7 @@ class ShapeCrightBracket : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-rightBracket"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-rightBracket"); return aPropertyMap; } @@ -6548,7 +6548,7 @@ class ShapeCflowChartOffpageConnector : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -6579,7 +6579,7 @@ class ShapeCflowChartOffpageConnector : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6590,7 +6590,7 @@ class ShapeCflowChartOffpageConnector : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (1); { awt::Size aSize; @@ -6601,7 +6601,7 @@ class ShapeCflowChartOffpageConnector : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6637,7 +6637,7 @@ class ShapeCflowChartOffpageConnector : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartOffpageConnector"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartOffpageConnector"); return aPropertyMap; } @@ -6653,12 +6653,12 @@ class ShapeCleftRightArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6688,7 +6688,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6698,7 +6698,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 100000); aParameter.Value = aAny; @@ -6706,7 +6706,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6714,7 +6714,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -6723,7 +6723,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6733,7 +6733,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -6741,7 +6741,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6749,7 +6749,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -6766,7 +6766,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -6822,7 +6822,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6833,7 +6833,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6869,7 +6869,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-leftRightArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-leftRightArrow"); return aPropertyMap; } @@ -6885,7 +6885,7 @@ class ShapeCdecagon : public CustomShapeProvider { Any aAny ((sal_Int32) 105146); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("vf"); + aAdjSequence [0].Name = "vf"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6924,7 +6924,7 @@ class ShapeCdecagon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -6980,7 +6980,7 @@ class ShapeCdecagon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6991,7 +6991,7 @@ class ShapeCdecagon : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -7027,7 +7027,7 @@ class ShapeCdecagon : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-decagon"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-decagon"); return aPropertyMap; } @@ -7126,7 +7126,7 @@ class ShapeCactionButtonHelp : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -7457,7 +7457,7 @@ class ShapeCactionButtonHelp : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -7503,7 +7503,7 @@ class ShapeCactionButtonHelp : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -7539,7 +7539,7 @@ class ShapeCactionButtonHelp : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonHelp"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-actionButtonHelp"); return aPropertyMap; } @@ -7555,7 +7555,7 @@ class ShapeCstar24 : public CustomShapeProvider { Any aAny ((sal_Int32) 37500); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -7654,7 +7654,7 @@ class ShapeCstar24 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -7664,7 +7664,7 @@ class ShapeCstar24 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 82); aParameter.Value = aAny; @@ -7672,7 +7672,7 @@ class ShapeCstar24 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -7680,7 +7680,7 @@ class ShapeCstar24 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -7697,7 +7697,7 @@ class ShapeCstar24 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -7943,7 +7943,7 @@ class ShapeCstar24 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -7954,7 +7954,7 @@ class ShapeCstar24 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -7990,7 +7990,7 @@ class ShapeCstar24 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-star24"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-star24"); return aPropertyMap; } @@ -8006,17 +8006,17 @@ class ShapeCmathDivide : public CustomShapeProvider { Any aAny ((sal_Int32) 23520); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 5880); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 11760); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8059,7 +8059,7 @@ class ShapeCmathDivide : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -8069,7 +8069,7 @@ class ShapeCmathDivide : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 36745); aParameter.Value = aAny; @@ -8077,7 +8077,7 @@ class ShapeCmathDivide : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1000); aParameter.Value = aAny; @@ -8085,7 +8085,7 @@ class ShapeCmathDivide : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -8094,7 +8094,7 @@ class ShapeCmathDivide : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8104,7 +8104,7 @@ class ShapeCmathDivide : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 7); aParameter.Value = aAny; @@ -8112,7 +8112,7 @@ class ShapeCmathDivide : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -8120,7 +8120,7 @@ class ShapeCmathDivide : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -8129,7 +8129,7 @@ class ShapeCmathDivide : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8139,7 +8139,7 @@ class ShapeCmathDivide : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 4); aParameter.Value = aAny; @@ -8147,7 +8147,7 @@ class ShapeCmathDivide : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1000); aParameter.Value = aAny; @@ -8155,7 +8155,7 @@ class ShapeCmathDivide : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -8172,7 +8172,7 @@ class ShapeCmathDivide : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -8228,7 +8228,7 @@ class ShapeCmathDivide : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -8245,7 +8245,7 @@ class ShapeCmathDivide : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -8281,7 +8281,7 @@ class ShapeCmathDivide : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-mathDivide"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-mathDivide"); return aPropertyMap; } @@ -8297,12 +8297,12 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8328,7 +8328,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8338,7 +8338,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -8346,7 +8346,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -8354,7 +8354,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -8363,7 +8363,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8373,7 +8373,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -8381,7 +8381,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -8389,7 +8389,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -8406,7 +8406,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -8462,7 +8462,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -8473,7 +8473,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -8509,7 +8509,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-curvedConnector4"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-curvedConnector4"); return aPropertyMap; } @@ -8568,7 +8568,7 @@ class ShapeCflowChartOr : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -8684,7 +8684,7 @@ class ShapeCflowChartOr : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -8707,7 +8707,7 @@ class ShapeCflowChartOr : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -8743,7 +8743,7 @@ class ShapeCflowChartOr : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartOr"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartOr"); return aPropertyMap; } @@ -8759,42 +8759,42 @@ class ShapeCborderCallout3 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 18750); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) -16667); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } { Any aAny ((sal_Int32) 100000); aAdjSequence [4].Value = aAny; - aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); + aAdjSequence [4].Name = "adj5"; } { Any aAny ((sal_Int32) -16667); aAdjSequence [5].Value = aAny; - aAdjSequence [5].Name = CREATE_OUSTRING ("adj6"); + aAdjSequence [5].Name = "adj6"; } { Any aAny ((sal_Int32) 112963); aAdjSequence [6].Value = aAny; - aAdjSequence [6].Name = CREATE_OUSTRING ("adj7"); + aAdjSequence [6].Name = "adj7"; } { Any aAny ((sal_Int32) -8333); aAdjSequence [7].Value = aAny; - aAdjSequence [7].Name = CREATE_OUSTRING ("adj8"); + aAdjSequence [7].Name = "adj8"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8820,7 +8820,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8830,7 +8830,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -8838,7 +8838,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -8846,7 +8846,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -8854,7 +8854,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -8862,12 +8862,12 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [6].Value = makeAny (aAny); } @@ -8876,7 +8876,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8886,7 +8886,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -8894,7 +8894,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -8902,7 +8902,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -8910,7 +8910,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -8918,12 +8918,12 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 3); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [6].Value = makeAny (aAny); } @@ -8932,7 +8932,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8942,7 +8942,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -8950,7 +8950,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -8958,7 +8958,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -8966,7 +8966,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -8974,12 +8974,12 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 5); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 4); aPropSequence [6].Value = makeAny (aAny); } @@ -8988,7 +8988,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8998,7 +8998,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -9006,7 +9006,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -9014,7 +9014,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -9022,7 +9022,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -9030,12 +9030,12 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 7); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 6); aPropSequence [6].Value = makeAny (aAny); } @@ -9052,7 +9052,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -9098,7 +9098,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -9113,7 +9113,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -9149,7 +9149,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-borderCallout3"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-borderCallout3"); return aPropertyMap; } @@ -9165,22 +9165,22 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) 48123); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -9220,7 +9220,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -9230,7 +9230,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 3); aParameter.Value = aAny; @@ -9238,7 +9238,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -9246,7 +9246,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -9255,7 +9255,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -9265,7 +9265,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -9273,7 +9273,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -9281,7 +9281,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -9290,7 +9290,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -9300,7 +9300,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 5); aParameter.Value = aAny; @@ -9308,7 +9308,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -9316,7 +9316,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -9325,7 +9325,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -9335,7 +9335,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 9); aParameter.Value = aAny; @@ -9343,7 +9343,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -9351,7 +9351,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 3); aPropSequence [3].Value = makeAny (aAny); } @@ -9368,7 +9368,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -9464,7 +9464,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -9475,7 +9475,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -9511,7 +9511,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-upDownArrowCallout"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-upDownArrowCallout"); return aPropertyMap; } @@ -9550,7 +9550,7 @@ class ShapeCflowChartDecision : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -9576,7 +9576,7 @@ class ShapeCflowChartDecision : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -9587,7 +9587,7 @@ class ShapeCflowChartDecision : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (1); { awt::Size aSize; @@ -9598,7 +9598,7 @@ class ShapeCflowChartDecision : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -9634,7 +9634,7 @@ class ShapeCflowChartDecision : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartDecision"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartDecision"); return aPropertyMap; } |