[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 11 commits - canvas/source chart2/source offapi/com oox/inc oox/source sd/source svx/source xmloff/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Oct 15 06:37:28 PDT 2012
canvas/source/cairo/cairo_canvashelper.cxx | 14 +-
chart2/source/view/main/ChartView.cxx | 2
offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl | 5
oox/inc/oox/ppt/pptshape.hxx | 6
oox/source/drawingml/customshapepresets1.cxx | 61 ++++++++
oox/source/drawingml/customshapepresets2.cxx | 48 +++++++
oox/source/drawingml/customshapepresets3.cxx | 50 +++++++
oox/source/drawingml/customshapepresets4.cxx | 45 ++++++
oox/source/drawingml/customshapepresets5.cxx | 68 ++++++++++
oox/source/drawingml/customshapepresets6.cxx | 26 +++
oox/source/drawingml/customshapeproperties.cxx | 3
oox/source/export/chartexport.cxx | 3
oox/source/export/drawingml.cxx | 7 -
oox/source/helper/propertymap.cxx | 4
oox/source/ppt/pptshape.cxx | 43 +++++-
sd/source/filter/eppt/pptx-epptooxml.cxx | 17 +-
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 7 -
svx/source/customshapes/EnhancedCustomShapeGeometry.cxx | 22 ++-
xmloff/source/core/xmlexp.cxx | 2
xmloff/source/draw/sdxmlexp.cxx | 5
xmloff/source/draw/shapeexport4.cxx | 21 ++-
xmloff/source/draw/ximpcustomshape.cxx | 7 +
22 files changed, 421 insertions(+), 45 deletions(-)
New commits:
commit eb0950f81414aac112d814011c02413354a974b4
Author: Radek Doulik <rodo at novell.com>
Date: Wed Aug 15 13:54:46 2012 +0200
avoid writing empty p:childTnLst elements, fixes rest of fdo#41992
Change-Id: Idc09103bb8e4dbd580b5ae53f7929b4700f2c818
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index dd36bd7..23be9b8 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1127,16 +1127,17 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons
if( xEnumeration.is() ) {
DBG(printf ("-----\n"));
- pFS->startElementNS( XML_p, XML_childTnLst, FSEND );
+ if( xEnumeration->hasMoreElements() ) {
+ pFS->startElementNS( XML_p, XML_childTnLst, FSEND );
- while( xEnumeration->hasMoreElements() ) {
- Reference< XAnimationNode > xChildNode( xEnumeration->nextElement(), UNO_QUERY );
- if( xChildNode.is() )
- WriteAnimationNode( pFS, xChildNode, nType == EffectNodeType::MAIN_SEQUENCE );
- }
-
- pFS->endElementNS( XML_p, XML_childTnLst );
+ while( xEnumeration->hasMoreElements() ) {
+ Reference< XAnimationNode > xChildNode( xEnumeration->nextElement(), UNO_QUERY );
+ if( xChildNode.is() )
+ WriteAnimationNode( pFS, xChildNode, nType == EffectNodeType::MAIN_SEQUENCE );
+ }
+ pFS->endElementNS( XML_p, XML_childTnLst );
+ }
DBG(printf ("-----\n"));
}
}
commit 0f53a5de76e4ac5d9e655bcfc08418706eef838c
Author: Radek Doulik <rodo at novell.com>
Date: Tue Sep 18 18:42:22 2012 +0200
better pptx custom shape presets import/export
- sometimes we produced unreadable pptx document with custom shape presets
- fixes part of n#760997
- before we rely on simple rule that adjustments were named
adj1, adj2, ... in case of multiple adjustments and named
adj in case there was only one. there are few exceptions though,
so now we use exact adjustment names defined in presetShapeDefinitions.xml
- TODO: there still might be problem when exporting custom shapes, which
didn't originated in pptx import
Change-Id: Ic9517a69145a295ba6f680ddc3cc30fc771db3fd
diff --git a/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl b/offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.idl
index c6aad38..230ca0f 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 d4708d8..4a241dc 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 ed51610..08fc089 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 14524e5..1cd4084 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 1e24115..4aee3a2 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 1c2d81a..e160c7a 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 7422165..15470fd 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 4271897..dc883e4 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 b4dcc1c..080d3ec 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 513dfdb..e1a1867 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");
}
commit 707efee607b3f30ff6e4baaee6a09ac8d216cbba
Author: Radek Doulik <rodo at novell.com>
Date: Mon Aug 20 12:54:37 2012 +0200
fill whole polypolygon at once, so that fill rule is applied correctly
- fixes rest of n#759172
Change-Id: I6c2694bf8276337b7d1fa54a12867bfc2b658a23
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index 924e6f8..1b058b5 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -1044,13 +1044,6 @@ namespace cairocanvas
if( aPolygon.isClosed() )
cairo_close_path( pCairo );
-
- if( aOperation == Fill && pTextures )
- {
- cairo_set_matrix( pCairo, &aOrigMatrix );
- doOperation( aOperation, pCairo, pTextures, pDevice, aPolyPolygon.getB2DRange() );
- cairo_set_matrix( pCairo, &aIdentityMatrix );
- }
}
else
{
@@ -1063,6 +1056,13 @@ namespace cairocanvas
}
}
}
+
+ if( aOperation == Fill && pTextures )
+ {
+ cairo_set_matrix( pCairo, &aOrigMatrix );
+ doOperation( aOperation, pCairo, pTextures, pDevice, aPolyPolygon.getB2DRange() );
+ cairo_set_matrix( pCairo, &aIdentityMatrix );
+ }
if( bOpToDo && ( aOperation != Fill || !pTextures ) )
doOperation( aOperation, pCairo, pTextures, pDevice, aPolyPolygon.getB2DRange() );
commit 8899b7ca2ae3987189243fda460aebb18f84d8ed
Author: Radek Doulik <rodo at novell.com>
Date: Wed Aug 15 09:46:56 2012 +0200
make fontwork custom shapes as one path object created from polypolygon
- which contains outlines of all characters instead of creating group
of path objects
- now the stretched bitmap fill works correctly - stretching over whole
text instead of only 1st character
- fixes part of n#759172
Change-Id: I65211e336aadb8909b5d4a3dcb3647f44be22595
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 498cdfc..c4f53ec 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -788,9 +788,9 @@ void FitTextOutlinesToShapeOutlines( const PolyPolygon& aOutlines2d, FWData& rFW
SdrObject* CreateSdrObjectFromParagraphOutlines( const FWData& rFWData, const SdrObject* pCustomShape )
{
SdrObject* pRet = NULL;
+ basegfx::B2DPolyPolygon aPolyPoly;
if ( !rFWData.vTextAreas.empty() )
{
- pRet = new SdrObjGroup();
std::vector< FWTextArea >::const_iterator aTextAreaIter = rFWData.vTextAreas.begin();
std::vector< FWTextArea >::const_iterator aTextAreaIEnd = rFWData.vTextAreas.end();
while ( aTextAreaIter != aTextAreaIEnd )
@@ -807,8 +807,7 @@ SdrObject* CreateSdrObjectFromParagraphOutlines( const FWData& rFWData, const Sd
std::vector< PolyPolygon >::const_iterator aOutlineIEnd = aCharacterIter->vOutlines.end();
while( aOutlineIter != aOutlineIEnd )
{
- SdrObject* pPathObj = new SdrPathObj( OBJ_POLY, aOutlineIter->getB2DPolyPolygon() );
- ((SdrObjGroup*)pRet)->GetSubList()->NbcInsertObject( pPathObj );
+ aPolyPoly.append( aOutlineIter->getB2DPolyPolygon() );
++aOutlineIter;
}
++aCharacterIter;
@@ -818,6 +817,8 @@ SdrObject* CreateSdrObjectFromParagraphOutlines( const FWData& rFWData, const Sd
++aTextAreaIter;
}
+ pRet = new SdrPathObj( OBJ_POLY, aPolyPoly );
+
Point aP( pCustomShape->GetSnapRect().Center() );
Size aS( pCustomShape->GetLogicRect().GetSize() );
aP.X() -= aS.Width() / 2;
commit d61388426060bada1532cf079496cfe02ad2687a
Author: Radek Doulik <rodo at novell.com>
Date: Thu Jun 21 12:02:57 2012 +0200
make sure we don't export shapes with negative size (fixes n#760997)
Change-Id: Id77cbfaa287d15c4af9a91976f3b091e68229223
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index bc0e987..b4dcc1c 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -635,6 +635,11 @@ void DrawingML::WriteShapeTransformation( Reference< XShape > rXShape, sal_Int32
awt::Point aPos = rXShape->getPosition();
awt::Size aSize = rXShape->getSize();
+ if ( aSize.Width < 0 )
+ aSize.Width = 1000;
+ if ( aSize.Height < 0 )
+ aSize.Height = 1000;
+
WriteTransformation( Rectangle( Point( aPos.X, aPos.Y ), Size( aSize.Width, aSize.Height ) ), nXmlNamespace, bFlipH, bFlipV, nRotation );
}
commit c1160636c5af766287aa2ada67ad2727fee30c4b
Author: Radek Doulik <rodo at novell.com>
Date: Thu Jul 19 16:06:52 2012 +0200
odf: export old path without unsupported commands in draw namespace as well
- to preserve at least some data for older versions of Libre Office
Change-Id: I2a33706c2a2344e45b57a00469a7387072f8602b
diff --git a/xmloff/source/draw/shapeexport4.cxx b/xmloff/source/draw/shapeexport4.cxx
index 43e75f9..28bfd29 100644
--- a/xmloff/source/draw/shapeexport4.cxx
+++ b/xmloff/source/draw/shapeexport4.cxx
@@ -323,13 +323,14 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert
}
void ImpExportEnhancedPath( SvXMLExport& rExport,
- const uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair >& rCoordinates,
- const uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeSegment >& rSegments )
+ const uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair >& rCoordinates,
+ const uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeSegment >& rSegments,
+ bool bExtended = false )
{
rtl::OUString aStr;
rtl::OUStringBuffer aStrBuffer;
- sal_uInt16 aNamespace = XML_NAMESPACE_DRAW;
+ bool bNeedExtended = false;
sal_Int32 i, j, k, l;
@@ -415,8 +416,15 @@ void ImpExportEnhancedPath( SvXMLExport& rExport,
case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::QUADRATICCURVETO :
aStrBuffer.append( (sal_Unicode)'Q' ); nParameter = 2; break;
case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARCANGLETO :
- aStrBuffer.append( (sal_Unicode)'G' ); nParameter = 2; aNamespace = XML_NAMESPACE_DRAW_EXT; break;
-
+ if ( bExtended ) {
+ aStrBuffer.append( (sal_Unicode)'G' );
+ nParameter = 2;
+ } else {
+ aStrBuffer.setLength( aStrBuffer.getLength() - 1);
+ bNeedExtended = true;
+ i += 2;
+ }
+ break;
default : // ups, seems to be something wrong
{
aSegment.Count = 1;
@@ -445,7 +453,9 @@ void ImpExportEnhancedPath( SvXMLExport& rExport,
}
}
aStr = aStrBuffer.makeStringAndClear();
- rExport.AddAttribute( aNamespace, XML_ENHANCED_PATH, aStr );
+ rExport.AddAttribute( bExtended ? XML_NAMESPACE_DRAW_EXT : XML_NAMESPACE_DRAW, XML_ENHANCED_PATH, aStr );
+ if ( !bExtended && bNeedExtended )
+ ImpExportEnhancedPath( rExport, rCoordinates, rSegments, true );
}
void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< beans::XPropertySet >& xPropSet )
commit 92ccb17c37a73358c6e7f33629e6df662687209c
Author: Radek Doulik <rodo at novell.com>
Date: Thu Jul 19 11:06:50 2012 +0200
odf: export arcangleto commands in enhanced path (use drawooo namespace)
Change-Id: I43a2c08ee8dfc0abe4d05579b837b5be0944c0fe
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 9dc41e6..a288610 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -380,6 +380,8 @@ void SvXMLExport::_InitCtor()
}
}
if( (getExportFlags() & (EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 )
+ mpNamespaceMap->Add(
+ GetXMLToken(XML_NP_DRAW_EXT), GetXMLToken(XML_N_DRAW_EXT), XML_NAMESPACE_DRAW_EXT);
{
mpNamespaceMap->Add( GetXMLToken(XML_NP_MATH), GetXMLToken(XML_N_MATH), XML_NAMESPACE_MATH );
mpNamespaceMap->Add( GetXMLToken(XML_NP_FORM), GetXMLToken(XML_N_FORM), XML_NAMESPACE_FORM );
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index ce4d418..8927e92 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -641,11 +641,6 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent
GetXMLToken(XML_NP_OFFICE_EXT),
GetXMLToken(XML_N_OFFICE_EXT),
XML_NAMESPACE_OFFICE_EXT);
-
- _GetNamespaceMap().Add(
- GetXMLToken(XML_NP_DRAW_EXT),
- GetXMLToken(XML_N_DRAW_EXT),
- XML_NAMESPACE_DRAW_EXT);
}
GetShapeExport()->enableLayerExport();
diff --git a/xmloff/source/draw/shapeexport4.cxx b/xmloff/source/draw/shapeexport4.cxx
index aa4701d..43e75f9 100644
--- a/xmloff/source/draw/shapeexport4.cxx
+++ b/xmloff/source/draw/shapeexport4.cxx
@@ -329,6 +329,7 @@ void ImpExportEnhancedPath( SvXMLExport& rExport,
rtl::OUString aStr;
rtl::OUStringBuffer aStrBuffer;
+ sal_uInt16 aNamespace = XML_NAMESPACE_DRAW;
sal_Int32 i, j, k, l;
@@ -413,6 +414,8 @@ void ImpExportEnhancedPath( SvXMLExport& rExport,
aStrBuffer.append( (sal_Unicode)'Y' ); nParameter = 1; break;
case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::QUADRATICCURVETO :
aStrBuffer.append( (sal_Unicode)'Q' ); nParameter = 2; break;
+ case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARCANGLETO :
+ aStrBuffer.append( (sal_Unicode)'G' ); nParameter = 2; aNamespace = XML_NAMESPACE_DRAW_EXT; break;
default : // ups, seems to be something wrong
{
@@ -442,7 +445,7 @@ void ImpExportEnhancedPath( SvXMLExport& rExport,
}
}
aStr = aStrBuffer.makeStringAndClear();
- rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_ENHANCED_PATH, aStr );
+ rExport.AddAttribute( aNamespace, XML_ENHANCED_PATH, aStr );
}
void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< beans::XPropertySet >& xPropSet )
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index 0736fe3..f8966a1 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -667,6 +667,13 @@ void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest
nIndex++;
}
break;
+ case 'G' :
+ {
+ nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARCANGLETO;
+ nParametersNeeded = 2;
+ nIndex++;
+ }
+ break;
case 'W' :
{
nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO;
commit 14c908aba142d4ba33782d6de5796c10c148865c
Author: Felix Zhang <fezhang at suse.com>
Date: Tue May 29 18:15:52 2012 +0800
bnc#741480: adjusted display of Bracket/BracePair in ppt
Change-Id: Ia4bbce74e2c1a5f46e0b1a73940aeb2ce8fc6ab9
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index 4bc2cd3..87e7e91 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -3472,12 +3472,18 @@ static const SvxMSDffVertPair mso_sptBracketPairVert[] = // adj value 0 -> 10
{ 0 MSO_I, 0 }, { 0, 1 MSO_I }, // left top alignment
{ 0, 2 MSO_I }, { 0 MSO_I, 21600 }, // left bottom "
{ 3 MSO_I, 21600 }, { 21600, 2 MSO_I }, // right bottom "
- { 21600, 1 MSO_I }, { 3 MSO_I, 0 } // right top "
+ { 21600, 1 MSO_I }, { 3 MSO_I, 0 }, // right top "
+ { 0 MSO_I, 0 }, { 0, 1 MSO_I }, // filling area
+ { 0, 2 MSO_I }, { 0 MSO_I, 21600 },
+ { 3 MSO_I, 21600 }, { 21600, 2 MSO_I },
+ { 21600, 1 MSO_I }, { 3 MSO_I, 0 }
};
static const sal_uInt16 mso_sptBracketPairSegm[] =
{
- 0x4000, 0xa701, 0x0001, 0xa801, 0x8000,
- 0x4000, 0xa701, 0x0001, 0xa801, 0x8000
+ 0x4000, 0xa701, 0x0001, 0xa801, 0xaa00, 0x8000,
+ 0x4000, 0xa701, 0x0001, 0xa801, 0xaa00, 0x8000,
+ 0x4000, 0xa701, 0x0001, 0xa801, 0x0001, // filling area
+ 0xa701, 0x0001, 0xa801, 0x6000, 0xab00, 0x8000
};
static const SvxMSDffCalculationData mso_sptBracketPairCalc[] =
{
@@ -3551,12 +3557,18 @@ static const SvxMSDffVertPair mso_sptBracePairVert[] = // adj value 0 -> 5400
{ 4 MSO_I, 0 }, { 0 MSO_I, 1 MSO_I }, { 0 MSO_I, 6 MSO_I }, { 0 ,10800 }, // left bracket
{ 0 MSO_I, 7 MSO_I }, { 0 MSO_I, 2 MSO_I }, { 4 MSO_I, 21600 },
{ 8 MSO_I, 21600 }, { 3 MSO_I, 2 MSO_I }, { 3 MSO_I, 7 MSO_I }, { 21600, 10800 }, // right bracket
+ { 3 MSO_I, 6 MSO_I }, { 3 MSO_I, 1 MSO_I }, { 8 MSO_I, 0 },
+ { 4 MSO_I, 0 }, { 0 MSO_I, 1 MSO_I }, { 0 MSO_I, 6 MSO_I }, { 0 ,10800 }, // filling area
+ { 0 MSO_I, 7 MSO_I }, { 0 MSO_I, 2 MSO_I }, { 4 MSO_I, 21600 },
+ { 8 MSO_I, 21600 }, { 3 MSO_I, 2 MSO_I }, { 3 MSO_I, 7 MSO_I }, { 21600, 10800 },
{ 3 MSO_I, 6 MSO_I }, { 3 MSO_I, 1 MSO_I }, { 8 MSO_I, 0 }
};
static const sal_uInt16 mso_sptBracePairSegm[] =
{
- 0x4000, 0xa701, 0x0001, 0xa801, 0xa701, 0x0001, 0xa801, 0x8000,
- 0x4000, 0xa701, 0x0001, 0xa801, 0xa701, 0x0001, 0xa801, 0x8000
+ 0x4000, 0xa701, 0x0001, 0xa801, 0xa701, 0x0001, 0xa801, 0xaa00, 0x8000,
+ 0x4000, 0xa701, 0x0001, 0xa801, 0xa701, 0x0001, 0xa801, 0xaa00, 0x8000,
+ 0x4000, 0xa701, 0x0001, 0xa801, 0xa701, 0x0001, 0xa801, 0x0001, // filling area
+ 0xa701, 0x0001, 0xa801, 0xa701, 0x0001, 0xa801, 0x6000, 0xab00, 0x8000
};
static const SvxMSDffCalculationData mso_sptBracePairCalc[] =
{
commit f75e2ed065031b1d447d58253d6993b590220ca6
Author: Radek Doulik <rodo at novell.com>
Date: Thu Sep 20 12:46:15 2012 +0200
write only non NaN chart series values (fixes part of n#760997
Change-Id: I7c5bc8b9375a325d4ea78f033f577eff44cfd6e9
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 9d68be9..1e485ab 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1810,7 +1810,8 @@ void ChartExport::exportSeriesValues( const Reference< chart2::data::XDataSequen
FSEND );
pFS->startElement( FSNS( XML_c, XML_v ),
FSEND );
- pFS->write( aValues[i] );
+ if (aValues[i] == aValues[i])
+ pFS->write( aValues[i] );
pFS->endElement( FSNS( XML_c, XML_v ) );
pFS->endElement( FSNS( XML_c, XML_pt ) );
}
commit 770fc015b4099b20abc259f2d7ed14b6bed9ebad
Author: Radek Doulik <rodo at novell.com>
Date: Mon Jul 2 18:24:04 2012 +0200
use master's shape position/size for layout shapes when needed (n#760997)
Change-Id: I2a9d4f6b134817bda84645df3ab6fa217186e1d2
diff --git a/oox/inc/oox/ppt/pptshape.hxx b/oox/inc/oox/ppt/pptshape.hxx
index e171f24..d0b31a6 100644
--- a/oox/inc/oox/ppt/pptshape.hxx
+++ b/oox/inc/oox/ppt/pptshape.hxx
@@ -50,7 +50,7 @@ public:
// addShape is creating and inserting the corresponding XShape.
void addShape(
oox::core::XmlFilterBase& rFilterBase,
- const SlidePersist& rPersist,
+ SlidePersist& rPersist,
const oox::drawingml::Theme* pTheme,
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
basegfx::B2DHomMatrix& aTransformation,
@@ -65,8 +65,8 @@ public:
void setReferenced( sal_Bool bReferenced ){ mbReferenced = bReferenced; };
void setPlaceholder( oox::drawingml::ShapePtr pPlaceholder ) { mpPlaceholder = pPlaceholder; }
- static oox::drawingml::ShapePtr findPlaceholder( const sal_Int32 nMasterPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes );
- static oox::drawingml::ShapePtr findPlaceholderByIndex( const sal_Int32 nIdx, std::vector< oox::drawingml::ShapePtr >& rShapes );
+ static oox::drawingml::ShapePtr findPlaceholder( const sal_Int32 nMasterPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes, bool bMasterOnly = false );
+ static oox::drawingml::ShapePtr findPlaceholderByIndex( const sal_Int32 nIdx, std::vector< oox::drawingml::ShapePtr >& rShapes, bool bMasterOnly = false );
static oox::drawingml::TextListStylePtr getSubTypeTextListStyle( const SlidePersist& rSlidePersist, sal_Int32 nSubType );
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 417c1bd..bbe12cb 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -119,7 +119,7 @@ oox::drawingml::TextListStylePtr PPTShape::getSubTypeTextListStyle( const SlideP
void PPTShape::addShape(
oox::core::XmlFilterBase& rFilterBase,
- const SlidePersist& rSlidePersist,
+ SlidePersist& rSlidePersist,
const oox::drawingml::Theme* pTheme,
const Reference< XShapes >& rxShapes,
basegfx::B2DHomMatrix& aTransformation,
@@ -261,6 +261,31 @@ void PPTShape::addShape(
OSL_TRACE("shape service: %s", rtl::OUStringToOString(sServiceName, RTL_TEXTENCODING_UTF8 ).getStr());
+ if( mnSubType && getSubTypeIndex().has() && meShapeLocation == Layout ) {
+ oox::drawingml::ShapePtr pPlaceholder = PPTShape::findPlaceholderByIndex( getSubTypeIndex().get(), rSlidePersist.getShapes()->getChildren(), true );
+ if (!pPlaceholder.get())
+ pPlaceholder = PPTShape::findPlaceholder( mnSubType, rSlidePersist.getShapes()->getChildren(), true );
+
+ if (pPlaceholder.get()) {
+ if( maSize.Width == 0 || maSize.Height == 0 ) {
+ awt::Size aSize = maSize;
+ if( maSize.Width == 0 )
+ aSize.Width = pPlaceholder->getSize().Width;
+ if( maSize.Height == 0 )
+ aSize.Height = pPlaceholder->getSize().Height;
+ setSize( aSize );
+ if ( maPosition.X == 0 || maPosition.Y == 0 ) {
+ awt::Point aPosition = maPosition;
+ if( maPosition.X == 0 )
+ aPosition.X = pPlaceholder->getPosition().X;
+ if( maPosition.Y == 0 )
+ aPosition.Y = pPlaceholder->getPosition().Y;
+ setPosition( aPosition );
+ }
+ }
+ }
+ }
+
// use placeholder index if possible
if( mnSubType && getSubTypeIndex().has() && rSlidePersist.getMasterPersist().get() ) {
oox::drawingml::ShapePtr pPlaceholder = PPTShape::findPlaceholderByIndex( getSubTypeIndex().get(), rSlidePersist.getMasterPersist()->getShapes()->getChildren() );
@@ -383,19 +408,21 @@ void PPTShape::applyShapeReference( const oox::drawingml::Shape& rReferencedShap
Shape::applyShapeReference( rReferencedShape, bUseText );
}
-oox::drawingml::ShapePtr PPTShape::findPlaceholder( const sal_Int32 nMasterPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes )
+oox::drawingml::ShapePtr PPTShape::findPlaceholder( const sal_Int32 nMasterPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes, bool bMasterOnly )
{
oox::drawingml::ShapePtr aShapePtr;
std::vector< oox::drawingml::ShapePtr >::reverse_iterator aRevIter( rShapes.rbegin() );
while( aRevIter != rShapes.rend() )
{
- if ( (*aRevIter)->getSubType() == nMasterPlaceholder )
+ if ( (*aRevIter)->getSubType() == nMasterPlaceholder &&
+ ( !bMasterOnly ||
+ ( dynamic_cast< PPTShape* >( (*aRevIter).get() ) && dynamic_cast< PPTShape* >( (*aRevIter).get() )->getShapeLocation() == Master ) ) )
{
aShapePtr = *aRevIter;
break;
}
std::vector< oox::drawingml::ShapePtr >& rChildren = (*aRevIter)->getChildren();
- aShapePtr = findPlaceholder( nMasterPlaceholder, rChildren );
+ aShapePtr = findPlaceholder( nMasterPlaceholder, rChildren, bMasterOnly );
if ( aShapePtr.get() )
break;
++aRevIter;
@@ -403,20 +430,22 @@ oox::drawingml::ShapePtr PPTShape::findPlaceholder( const sal_Int32 nMasterPlace
return aShapePtr;
}
-oox::drawingml::ShapePtr PPTShape::findPlaceholderByIndex( const sal_Int32 nIdx, std::vector< oox::drawingml::ShapePtr >& rShapes )
+oox::drawingml::ShapePtr PPTShape::findPlaceholderByIndex( const sal_Int32 nIdx, std::vector< oox::drawingml::ShapePtr >& rShapes, bool bMasterOnly )
{
oox::drawingml::ShapePtr aShapePtr;
std::vector< oox::drawingml::ShapePtr >::reverse_iterator aRevIter( rShapes.rbegin() );
while( aRevIter != rShapes.rend() )
{
- if ( (*aRevIter)->getSubTypeIndex().has() && (*aRevIter)->getSubTypeIndex().get() == nIdx )
+ if ( (*aRevIter)->getSubTypeIndex().has() && (*aRevIter)->getSubTypeIndex().get() == nIdx &&
+ ( !bMasterOnly ||
+ ( dynamic_cast< PPTShape* >( (*aRevIter).get() ) && dynamic_cast< PPTShape* >( (*aRevIter).get() )->getShapeLocation() == Master ) ) )
{
aShapePtr = *aRevIter;
break;
}
std::vector< oox::drawingml::ShapePtr >& rChildren = (*aRevIter)->getChildren();
- aShapePtr = findPlaceholderByIndex( nIdx, rChildren );
+ aShapePtr = findPlaceholderByIndex( nIdx, rChildren, bMasterOnly );
if ( aShapePtr.get() )
break;
++aRevIter;
commit 49582f3f28ce2299624fb2f7f875829b2edc8bf0
Author: Felix Zhang <fezhang at suse.com>
Date: Tue Sep 4 14:40:43 2012 +0800
bnc#759197: adjust chart layout distance
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list