diff options
| -rw-r--r-- | offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl | 5 | ||||
| -rw-r--r-- | oox/source/drawingml/customshapepresets1.cxx | 61 | ||||
| -rw-r--r-- | oox/source/drawingml/customshapepresets2.cxx | 48 | ||||
| -rw-r--r-- | oox/source/drawingml/customshapepresets3.cxx | 50 | ||||
| -rw-r--r-- | oox/source/drawingml/customshapepresets4.cxx | 45 | ||||
| -rw-r--r-- | oox/source/drawingml/customshapepresets5.cxx | 68 | ||||
| -rw-r--r-- | oox/source/drawingml/customshapepresets6.cxx | 26 | ||||
| -rw-r--r-- | oox/source/drawingml/customshapeproperties.cxx | 3 | ||||
| -rw-r--r-- | oox/source/export/drawingml.cxx | 2 | ||||
| -rw-r--r-- | oox/source/helper/propertymap.cxx | 4 |
10 files changed, 311 insertions, 1 deletions
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl index c6aad3818db2..230ca0fade66 100644 --- a/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl +++ b/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl @@ -47,6 +47,11 @@ struct EnhancedCustomShapeAdjustmentValue /** */ ::com::sun::star::beans::PropertyState State; + + + /** optional name, used by pptx import/export for custom shape presets + */ + string Name; }; //============================================================================= diff --git a/oox/source/drawingml/customshapepresets1.cxx b/oox/source/drawingml/customshapepresets1.cxx index d4708d8c4d2a..4a241dcd3795 100644 --- a/oox/source/drawingml/customshapepresets1.cxx +++ b/oox/source/drawingml/customshapepresets1.cxx @@ -325,18 +325,22 @@ class ShapeCborderCallout1 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 112500); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } { Any aAny ((sal_Int32) -38333); aAdjSequence [3].Value = aAny; + aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -775,14 +779,17 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1205,6 +1212,7 @@ class ShapeCoctagon : public CustomShapeProvider { Any aAny ((sal_Int32) 29289); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1380,14 +1388,17 @@ class ShapeCleftRightRibbon : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 16667); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -2335,14 +2346,17 @@ class ShapeCbentConnector5 : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -2576,22 +2590,27 @@ class ShapeCcircularArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 12500); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 1142319); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 20457681); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } { Any aAny ((sal_Int32) 10800000); aAdjSequence [3].Value = aAny; + aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); } { Any aAny ((sal_Int32) 12500); aAdjSequence [4].Value = aAny; + aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3018,18 +3037,22 @@ class ShapeCdownArrowCallout : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } { Any aAny ((sal_Int32) 64977); aAdjSequence [3].Value = aAny; + aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3338,6 +3361,7 @@ class ShapeCmathMinus : public CustomShapeProvider { Any aAny ((sal_Int32) 23520); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3492,10 +3516,12 @@ class ShapeCgear9 : public CustomShapeProvider { Any aAny ((sal_Int32) 10000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 1763); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4168,6 +4194,7 @@ class ShapeCround1Rect : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4337,6 +4364,7 @@ class ShapeCsun : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4674,6 +4702,7 @@ class ShapeCplaque : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4885,6 +4914,7 @@ class ShapeCchevron : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5183,6 +5213,7 @@ class ShapeCdiagStripe : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5339,10 +5370,12 @@ class ShapeCpentagon : public CustomShapeProvider { Any aAny ((sal_Int32) 105146); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("hf"); } { Any aAny ((sal_Int32) 110557); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("vf"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5784,18 +5817,22 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 112500); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } { Any aAny ((sal_Int32) -38333); aAdjSequence [3].Value = aAny; + aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6054,10 +6091,12 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6273,6 +6312,7 @@ class ShapeCrightBracket : public CustomShapeProvider { Any aAny ((sal_Int32) 8333); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6614,10 +6654,12 @@ class ShapeCleftRightArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6844,6 +6886,7 @@ class ShapeCdecagon : public CustomShapeProvider { Any aAny ((sal_Int32) 105146); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("vf"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -7513,6 +7556,7 @@ class ShapeCstar24 : public CustomShapeProvider { Any aAny ((sal_Int32) 37500); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -7963,14 +8007,17 @@ class ShapeCmathDivide : public CustomShapeProvider { Any aAny ((sal_Int32) 23520); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 5880); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 11760); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8251,10 +8298,12 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8711,34 +8760,42 @@ class ShapeCborderCallout3 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 18750); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } { Any aAny ((sal_Int32) -16667); aAdjSequence [3].Value = aAny; + aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); } { Any aAny ((sal_Int32) 100000); aAdjSequence [4].Value = aAny; + aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); } { Any aAny ((sal_Int32) -16667); aAdjSequence [5].Value = aAny; + aAdjSequence [5].Name = CREATE_OUSTRING ("adj6"); } { Any aAny ((sal_Int32) 112963); aAdjSequence [6].Value = aAny; + aAdjSequence [6].Name = CREATE_OUSTRING ("adj7"); } { Any aAny ((sal_Int32) -8333); aAdjSequence [7].Value = aAny; + aAdjSequence [7].Name = CREATE_OUSTRING ("adj8"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -9109,18 +9166,22 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } { Any aAny ((sal_Int32) 48123); aAdjSequence [3].Value = aAny; + aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } diff --git a/oox/source/drawingml/customshapepresets2.cxx b/oox/source/drawingml/customshapepresets2.cxx index ed516108a3f6..08fc089dbe65 100644 --- a/oox/source/drawingml/customshapepresets2.cxx +++ b/oox/source/drawingml/customshapepresets2.cxx @@ -31,18 +31,22 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } { Any aAny ((sal_Int32) 48123); aAdjSequence [3].Value = aAny; + aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -511,10 +515,12 @@ class ShapeCsnipRoundRect : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 16667); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -730,6 +736,7 @@ class ShapeCmathPlus : public CustomShapeProvider { Any aAny ((sal_Int32) 23520); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1129,6 +1136,7 @@ class ShapeCcan : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1395,6 +1403,7 @@ class ShapeCfoldedCorner : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1623,6 +1632,7 @@ class ShapeCstar32 : public CustomShapeProvider { Any aAny ((sal_Int32) 37500); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -2360,10 +2370,12 @@ class ShapeCupDownArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -2838,10 +2850,12 @@ class ShapeCmathEqual : public CustomShapeProvider { Any aAny ((sal_Int32) 23520); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 11760); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3063,6 +3077,7 @@ class ShapeCstar12 : public CustomShapeProvider { Any aAny ((sal_Int32) 37500); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3346,22 +3361,27 @@ class ShapeCuturnArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } { Any aAny ((sal_Int32) 43750); aAdjSequence [3].Value = aAny; + aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); } { Any aAny ((sal_Int32) 75000); aAdjSequence [4].Value = aAny; + aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3955,14 +3975,17 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4268,6 +4291,7 @@ class ShapeChomePlate : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4582,18 +4606,22 @@ class ShapeCleftArrowCallout : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } { Any aAny ((sal_Int32) 64977); aAdjSequence [3].Value = aAny; + aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4902,10 +4930,12 @@ class ShapeCchord : public CustomShapeProvider { Any aAny ((sal_Int32) 2700000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 16200000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5072,18 +5102,22 @@ class ShapeCquadArrowCallout : public CustomShapeProvider { Any aAny ((sal_Int32) 18515); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 18515); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 18515); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } { Any aAny ((sal_Int32) 48123); aAdjSequence [3].Value = aAny; + aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6201,10 +6235,12 @@ class ShapeCarc : public CustomShapeProvider { Any aAny ((sal_Int32) 16200000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 0); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6414,6 +6450,7 @@ class ShapeCstar16 : public CustomShapeProvider { Any aAny ((sal_Int32) 37500); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6757,6 +6794,7 @@ class ShapeCparallelogram : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6926,6 +6964,7 @@ class ShapeCbevel : public CustomShapeProvider { Any aAny ((sal_Int32) 12500); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -7281,6 +7320,7 @@ class ShapeCroundRect : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -7492,18 +7532,22 @@ class ShapeCaccentCallout1 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 112500); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } { Any aAny ((sal_Int32) -38333); aAdjSequence [3].Value = aAny; + aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -7938,6 +7982,7 @@ class ShapeCstar8 : public CustomShapeProvider { Any aAny ((sal_Int32) 37500); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8339,6 +8384,7 @@ class ShapeCmoon : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8533,10 +8579,12 @@ class ShapeCstar6 : public CustomShapeProvider { Any aAny ((sal_Int32) 28868); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } { Any aAny ((sal_Int32) 115470); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("hf"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } diff --git a/oox/source/drawingml/customshapepresets3.cxx b/oox/source/drawingml/customshapepresets3.cxx index 14524e561039..1cd4084e52c1 100644 --- a/oox/source/drawingml/customshapepresets3.cxx +++ b/oox/source/drawingml/customshapepresets3.cxx @@ -31,10 +31,12 @@ class ShapeCround2SameRect : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 0); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -293,10 +295,12 @@ class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -609,14 +613,17 @@ class ShapeCellipseRibbon : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 12500); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1189,26 +1196,32 @@ class ShapeCcallout2 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 18750); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } { Any aAny ((sal_Int32) -16667); aAdjSequence [3].Value = aAny; + aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); } { Any aAny ((sal_Int32) 112500); aAdjSequence [4].Value = aAny; + aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); } { Any aAny ((sal_Int32) -46667); aAdjSequence [5].Value = aAny; + aAdjSequence [5].Name = CREATE_OUSTRING ("adj6"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1517,10 +1530,12 @@ class ShapeCpie : public CustomShapeProvider { Any aAny ((sal_Int32) 0); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 16200000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1691,6 +1706,7 @@ class ShapeCstar4 : public CustomShapeProvider { Any aAny ((sal_Int32) 12500); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -2327,6 +2343,7 @@ class ShapeCbentConnector3 : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -2638,10 +2655,12 @@ class ShapeChexagon : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } { Any aAny ((sal_Int32) 115470); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("vf"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3315,10 +3334,12 @@ class ShapeCribbon2 : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3964,6 +3985,7 @@ class ShapeCbracePair : public CustomShapeProvider { Any aAny ((sal_Int32) 8333); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4936,34 +4958,42 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 18750); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } { Any aAny ((sal_Int32) -16667); aAdjSequence [3].Value = aAny; + aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); } { Any aAny ((sal_Int32) 100000); aAdjSequence [4].Value = aAny; + aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); } { Any aAny ((sal_Int32) -16667); aAdjSequence [5].Value = aAny; + aAdjSequence [5].Name = CREATE_OUSTRING ("adj6"); } { Any aAny ((sal_Int32) 112963); aAdjSequence [6].Value = aAny; + aAdjSequence [6].Name = CREATE_OUSTRING ("adj7"); } { Any aAny ((sal_Int32) -8333); aAdjSequence [7].Value = aAny; + aAdjSequence [7].Name = CREATE_OUSTRING ("adj8"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5735,14 +5765,17 @@ class ShapeCquadArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 22500); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 22500); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 22500); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6084,10 +6117,12 @@ class ShapeCleftBrace : public CustomShapeProvider { Any aAny ((sal_Int32) 8333); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6406,6 +6441,7 @@ class ShapeCleftBracket : public CustomShapeProvider { Any aAny ((sal_Int32) 8333); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6622,14 +6658,17 @@ class ShapeCblockArc : public CustomShapeProvider { Any aAny ((sal_Int32) 10800000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 0); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6876,6 +6915,7 @@ class ShapeCcurvedConnector3 : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -7044,14 +7084,17 @@ class ShapeCwedgeRoundRectCallout : public CustomShapeProvider { Any aAny ((sal_Int32) -20833); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 62500); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 16667); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -7993,10 +8036,12 @@ class ShapeCgear6 : public CustomShapeProvider { Any aAny ((sal_Int32) 15000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 3526); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8447,10 +8492,12 @@ class ShapeChalfFrame : public CustomShapeProvider { Any aAny ((sal_Int32) 33333); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 33333); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8662,10 +8709,12 @@ class ShapeCsnip2SameRect : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 0); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8884,6 +8933,7 @@ class ShapeCtriangle : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } diff --git a/oox/source/drawingml/customshapepresets4.cxx b/oox/source/drawingml/customshapepresets4.cxx index 1e24115a74f2..4aee3a2d84f2 100644 --- a/oox/source/drawingml/customshapepresets4.cxx +++ b/oox/source/drawingml/customshapepresets4.cxx @@ -31,6 +31,7 @@ class ShapeCteardrop : public CustomShapeProvider { Any aAny ((sal_Int32) 100000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -374,18 +375,22 @@ class ShapeCrightArrowCallout : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } { Any aAny ((sal_Int32) 64977); aAdjSequence [3].Value = aAny; + aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -694,10 +699,12 @@ class ShapeCrightBrace : public CustomShapeProvider { Any aAny ((sal_Int32) 8333); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1440,10 +1447,12 @@ class ShapeCdownArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1654,14 +1663,17 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -2718,6 +2730,7 @@ class ShapeCbracketPair : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3008,6 +3021,7 @@ class ShapeCsmileyFace : public CustomShapeProvider { Any aAny ((sal_Int32) 4653); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3366,10 +3380,12 @@ class ShapeCwave : public CustomShapeProvider { Any aAny ((sal_Int32) 12500); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 0); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3605,10 +3621,12 @@ class ShapeCswooshArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 16667); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4582,6 +4600,7 @@ class ShapeCframe : public CustomShapeProvider { Any aAny ((sal_Int32) 12500); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5027,14 +5046,17 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5456,14 +5478,17 @@ class ShapeCleftUpArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5742,10 +5767,12 @@ class ShapeCwedgeEllipseCallout : public CustomShapeProvider { Any aAny ((sal_Int32) -20833); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 62500); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5949,10 +5976,12 @@ class ShapeCdoubleWave : public CustomShapeProvider { Any aAny ((sal_Int32) 6250); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 0); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6224,18 +6253,22 @@ class ShapeCbentArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } { Any aAny ((sal_Int32) 43750); aAdjSequence [3].Value = aAny; + aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6565,10 +6598,12 @@ class ShapeCstar10 : public CustomShapeProvider { Any aAny ((sal_Int32) 42533); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } { Any aAny ((sal_Int32) 105146); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("hf"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6830,10 +6865,12 @@ class ShapeCleftArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -7044,14 +7081,17 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -7476,6 +7516,7 @@ class ShapeCsnip1Rect : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -7636,14 +7677,17 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 12500); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8231,6 +8275,7 @@ class ShapeCplus : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } diff --git a/oox/source/drawingml/customshapepresets5.cxx b/oox/source/drawingml/customshapepresets5.cxx index 1c2d81a122e3..e160c7ab0054 100644 --- a/oox/source/drawingml/customshapepresets5.cxx +++ b/oox/source/drawingml/customshapepresets5.cxx @@ -31,34 +31,42 @@ class ShapeCaccentCallout3 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 18750); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } { Any aAny ((sal_Int32) -16667); aAdjSequence [3].Value = aAny; + aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); } { Any aAny ((sal_Int32) 100000); aAdjSequence [4].Value = aAny; + aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); } { Any aAny ((sal_Int32) -16667); aAdjSequence [5].Value = aAny; + aAdjSequence [5].Name = CREATE_OUSTRING ("adj6"); } { Any aAny ((sal_Int32) 112963); aAdjSequence [6].Value = aAny; + aAdjSequence [6].Name = CREATE_OUSTRING ("adj7"); } { Any aAny ((sal_Int32) -8333); aAdjSequence [7].Value = aAny; + aAdjSequence [7].Name = CREATE_OUSTRING ("adj8"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -444,22 +452,27 @@ class ShapeCleftCircularArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 12500); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) -1142319); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 1142319); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } { Any aAny ((sal_Int32) 10800000); aAdjSequence [3].Value = aAny; + aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); } { Any aAny ((sal_Int32) 12500); aAdjSequence [4].Value = aAny; + aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -905,10 +918,12 @@ class ShapeCrightArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1244,10 +1259,12 @@ class ShapeCsnip2DiagRect : public CustomShapeProvider { Any aAny ((sal_Int32) 0); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 16667); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1466,6 +1483,7 @@ class ShapeCverticalScroll : public CustomShapeProvider { Any aAny ((sal_Int32) 12500); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1998,14 +2016,17 @@ class ShapeCstar7 : public CustomShapeProvider { Any aAny ((sal_Int32) 34601); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } { Any aAny ((sal_Int32) 102572); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("hf"); } { Any aAny ((sal_Int32) 105210); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("vf"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -2821,6 +2842,7 @@ class ShapeCcube : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3094,10 +3116,12 @@ class ShapeCround2DiagRect : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 0); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4350,14 +4374,17 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4634,6 +4661,7 @@ class ShapeChorizontalScroll : public CustomShapeProvider { Any aAny ((sal_Int32) 12500); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5165,10 +5193,12 @@ class ShapeCbentConnector4 : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5360,22 +5390,27 @@ class ShapeCleftRightCircularArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 12500); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 1142319); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 20457681); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } { Any aAny ((sal_Int32) 11942319); aAdjSequence [3].Value = aAny; + aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); } { Any aAny ((sal_Int32) 12500); aAdjSequence [4].Value = aAny; + aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5857,10 +5892,12 @@ class ShapeCwedgeRectCallout : public CustomShapeProvider { Any aAny ((sal_Int32) -20833); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 62500); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6125,26 +6162,32 @@ class ShapeCaccentCallout2 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 18750); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } { Any aAny ((sal_Int32) -16667); aAdjSequence [3].Value = aAny; + aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); } { Any aAny ((sal_Int32) 112500); aAdjSequence [4].Value = aAny; + aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); } { Any aAny ((sal_Int32) -46667); aAdjSequence [5].Value = aAny; + aAdjSequence [5].Name = CREATE_OUSTRING ("adj6"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6691,10 +6734,12 @@ class ShapeCcorner : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6902,26 +6947,32 @@ class ShapeCborderCallout2 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 18750); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } { Any aAny ((sal_Int32) -16667); aAdjSequence [3].Value = aAny; + aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); } { Any aAny ((sal_Int32) 112500); aAdjSequence [4].Value = aAny; + aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); } { Any aAny ((sal_Int32) -46667); aAdjSequence [5].Value = aAny; + aAdjSequence [5].Name = CREATE_OUSTRING ("adj6"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -7229,6 +7280,7 @@ class ShapeCdonut : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -7607,14 +7659,17 @@ class ShapeCmathNotEqual : public CustomShapeProvider { Any aAny ((sal_Int32) 23520); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 6600000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 11760); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8049,6 +8104,7 @@ class ShapeCmathMultiply : public CustomShapeProvider { Any aAny ((sal_Int32) 23520); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8268,10 +8324,12 @@ class ShapeCheptagon : public CustomShapeProvider { Any aAny ((sal_Int32) 102572); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("hf"); } { Any aAny ((sal_Int32) 105210); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("vf"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8527,26 +8585,32 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 18750); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } { Any aAny ((sal_Int32) -16667); aAdjSequence [3].Value = aAny; + aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); } { Any aAny ((sal_Int32) 112500); aAdjSequence [4].Value = aAny; + aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); } { Any aAny ((sal_Int32) -46667); aAdjSequence [5].Value = aAny; + aAdjSequence [5].Name = CREATE_OUSTRING ("adj6"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8985,18 +9049,22 @@ class ShapeCupArrowCallout : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } { Any aAny ((sal_Int32) 64977); aAdjSequence [3].Value = aAny; + aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } diff --git a/oox/source/drawingml/customshapepresets6.cxx b/oox/source/drawingml/customshapepresets6.cxx index 74221653bc28..15470fd83986 100644 --- a/oox/source/drawingml/customshapepresets6.cxx +++ b/oox/source/drawingml/customshapepresets6.cxx @@ -31,14 +31,17 @@ class ShapeCstar5 : public CustomShapeProvider { Any aAny ((sal_Int32) 19098); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } { Any aAny ((sal_Int32) 105146); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("hf"); } { Any aAny ((sal_Int32) 110557); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("vf"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -410,10 +413,12 @@ class ShapeCstripedRightArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -674,34 +679,42 @@ class ShapeCcallout3 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 18750); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } { Any aAny ((sal_Int32) -16667); aAdjSequence [3].Value = aAny; + aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); } { Any aAny ((sal_Int32) 100000); aAdjSequence [4].Value = aAny; + aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); } { Any aAny ((sal_Int32) -16667); aAdjSequence [5].Value = aAny; + aAdjSequence [5].Name = CREATE_OUSTRING ("adj6"); } { Any aAny ((sal_Int32) 112963); aAdjSequence [6].Value = aAny; + aAdjSequence [6].Name = CREATE_OUSTRING ("adj7"); } { Any aAny ((sal_Int32) -8333); aAdjSequence [7].Value = aAny; + aAdjSequence [7].Name = CREATE_OUSTRING ("adj8"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1073,14 +1086,17 @@ class ShapeCbentUpArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1340,6 +1356,7 @@ class ShapeCnoSmoking : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1592,6 +1609,7 @@ class ShapeCtrapezoid : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1753,10 +1771,12 @@ class ShapeCcloudCallout : public CustomShapeProvider { Any aAny ((sal_Int32) -20833); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 62500); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -2397,18 +2417,22 @@ class ShapeCcallout1 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } { Any aAny ((sal_Int32) 112500); aAdjSequence [2].Value = aAny; + aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); } { Any aAny ((sal_Int32) -38333); aAdjSequence [3].Value = aAny; + aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -2654,10 +2678,12 @@ class ShapeCribbon : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; + aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; + aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index 42718973a037..dc883e4045dd 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -191,12 +191,14 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi EnhancedCustomShapeAdjustmentValue aAdjustmentVal; aAdjustmentVal.Value <<= (*aIter).maFormula.toInt32(); aAdjustmentVal.State = PropertyState_DIRECT_VALUE; + aAdjustmentVal.Name = (*aIter).maName; aAdjustmentSeq[ nAdjustmentIndex ] = aAdjustmentVal; } } else if ( aAdjustmentSeq.getLength() > 0 ) { EnhancedCustomShapeAdjustmentValue aAdjustmentVal; aAdjustmentVal.Value <<= (*aIter).maFormula.toInt32(); aAdjustmentVal.State = PropertyState_DIRECT_VALUE; + aAdjustmentVal.Name = (*aIter).maName; aAdjustmentSeq[ 0 ] = aAdjustmentVal; } aIter++; @@ -233,6 +235,7 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi EnhancedCustomShapeAdjustmentValue aAdjustmentVal; aAdjustmentVal.Value <<= maAdjustmentGuideList[ i ].maFormula.toInt32(); aAdjustmentVal.State = PropertyState_DIRECT_VALUE; + aAdjustmentVal.Name = maAdjustmentGuideList[ i ].maName; aAdjustmentValues[ i ] = aAdjustmentVal; } aPropertyMap[ PROP_AdjustmentValues ] <<= aAdjustmentValues; diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index b4dcc1cfcd14..080d3ec14a2f 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -1344,7 +1344,7 @@ void DrawingML::WritePresetShape( const char* pShape, MSO_SPT eShapeType, sal_Bo for( sal_Int32 i=0; i < nLength; i++ ) if( EscherPropertyContainer::GetAdjustmentValue( aAdjustmentSeq[ i ], i, nAdjustmentsWhichNeedsToBeConverted, nValue ) ) mpFS->singleElementNS( XML_a, XML_gd, - XML_name, nLength > 1 ? ( OString( "adj" ) + OString::valueOf( i + 1 ) ).getStr() : "adj", + XML_name, aAdjustmentSeq[ i ].Name.getLength() > 0 ? USS(aAdjustmentSeq[ i ].Name) : (nLength > 1 ? ( OString( "adj" ) + OString::valueOf( i + 1 ) ).getStr() : "adj"), XML_fmla, (OString("val ") + OString::valueOf( nValue )).getStr(), FSEND ); } diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx index 513dfdbdeb27..e1a1867e249d 100644 --- a/oox/source/helper/propertymap.cxx +++ b/oox/source/helper/propertymap.cxx @@ -640,6 +640,10 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0) const char *var = lclDumpAnyValueCode( makeAny (adjArray[i].Value), level + 1 ); printLevel (level + 1); fprintf (stderr, "aAdjSequence [%d].Value = %s;\n", i, var); + if (adjArray[i].Name.getLength() > 0) { + printLevel (level + 1); + fprintf (stderr, "aAdjSequence [%d].Name = CREATE_OUSTRING (\"%s\");\n", i, USS (adjArray[i].Name)); + } printLevel (level); fprintf (stderr, "}\n"); } |