oox/source/drawingml/customshapepresetdata.cxx | 67 +++++++++++++
oox/source/drawingml/customshapes/oox-drawingml-cs-presets | 22 ++--
sd/qa/unit/data/pptx/tdf147459.pptx |binary
sd/qa/unit/data/xml/n820786_0.xml | 2
sd/qa/unit/data/xml/tdf109317_0.xml | 3
sd/qa/unit/import-tests.cxx | 35 ++++++
6 files changed, 118 insertions(+), 11 deletions(-)
New commits:
commit 744e6c0b758fefe6011f09860b44f03ab70fbcfe
Author: Tibor Nagy <nagy.tib...@nisz.hu>
AuthorDate: Mon Feb 21 14:07:51 2022 +0100
Commit: László Németh <nem...@numbertext.org>
CommitDate: Tue Mar 1 13:45:48 2022 +0100
tdf#147459 PPTX: add "glue points" to some basic shapes
(ellipse, triangle, right triangle, trapezoid,
parallelogram, diamond, pentagon, hexagon, heptagon,
octagon).
These glue points allow to add and use connectors
on basic shapes, e.g. by specifying 8 glue points on
outline of ellipses (and not 4 glue points only on
their bounding boxes).
Usage: insert a basic shape from the list above,
select it, and click on the icon Connectors to
show and use the new glue points on the outline of
the shape.
Note: PPTX import doesn't import connectors
connected to the glue points – only ODP export keeps
them for the planned editing, i.e. moving the connected
shapes without losing the connecting lines and arrows.
Change-Id: Iaef21ce8dc3f6677fa2fd6a484adf6d546e72ad1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130281
Tested-by: László Németh <nem...@numbertext.org>
Reviewed-by: László Németh <nem...@numbertext.org>
diff --git a/oox/source/drawingml/customshapepresetdata.cxx
b/oox/source/drawingml/customshapepresetdata.cxx
index a80ddeacae21..ea1fcbb41362 100644
--- a/oox/source/drawingml/customshapepresetdata.cxx
+++ b/oox/source/drawingml/customshapepresetdata.cxx
@@ -507,6 +507,71 @@ void
lcl_parsePathCoordinates(std::vector<beans::PropertyValue>& rPath, const OS
}
}
+void lcl_parsePathGluePointsValues(std::vector<beans::PropertyValue>& rPath,
const OString& rValue)
+{
+ std::vector<drawing::EnhancedCustomShapeParameterPair> aPairs;
+ sal_Int32 nLevel = 0;
+ sal_Int32 nStart = 0;
+ for (sal_Int32 i = 0; i < rValue.getLength(); ++i)
+ {
+ if (rValue[i] == '{')
+ {
+ if (!nLevel)
+ nStart = i;
+ nLevel++;
+ }
+ else if (rValue[i] == '}')
+ {
+ nLevel--;
+ if (!nLevel)
+ aPairs.push_back(lcl_parseEnhancedCustomShapeParameterPair(
+ rValue.copy(nStart + strlen("{ "), i - nStart - strlen("
},"))));
+ }
+ }
+
+ beans::PropertyValue aPropertyValue;
+ aPropertyValue.Name = "GluePoints";
+ aPropertyValue.Value <<= comphelper::containerToSequence(aPairs);
+ rPath.push_back(aPropertyValue);
+}
+
+void lcl_parsePathGluePoints(std::vector<beans::PropertyValue>& rPath, const
OString& rValue)
+{
+ sal_Int32 nLevel = 0;
+ bool bIgnore = false;
+ sal_Int32 nStart = 0;
+ for (sal_Int32 i = 0; i < rValue.getLength(); ++i)
+ {
+ if (rValue[i] == '{')
+ {
+ if (!nLevel)
+ bIgnore = true;
+ nLevel++;
+ }
+ else if (rValue[i] == '}')
+ {
+ nLevel--;
+ if (!nLevel)
+ bIgnore = false;
+ }
+ else if (rValue[i] == ',' && !bIgnore)
+ {
+ OString aToken = rValue.copy(nStart, i - nStart);
+ static const char aExpectedPrefix[]
+ = "Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) { ";
+ if (aToken.startsWith(aExpectedPrefix))
+ {
+ aToken = aToken.copy(strlen(aExpectedPrefix),
+ aToken.getLength() -
strlen(aExpectedPrefix) - strlen(" } }"));
+ lcl_parsePathGluePointsValues(rPath, aToken);
+ }
+ else if (!aToken.startsWith("Name =") &&
!aToken.startsWith("Handle ="))
+ SAL_WARN("oox", "lcl_parsePathGluePoints: unexpected token: "
<< aToken);
+ nStart = i + strlen(", ");
+ }
+ }
+}
+
void lcl_parsePathSegmentValues(std::vector<beans::PropertyValue>& rPath,
const OString& rValue)
{
std::vector<drawing::EnhancedCustomShapeSegment> aSegments;
@@ -725,6 +790,8 @@ void lcl_parsePath(std::vector<beans::PropertyValue>&
rPath, const OString& rVal
OString aToken = rValue.copy(nStart + strlen("{ "), i - nStart
- strlen(" },"));
if (aToken.startsWith("Name = \"Coordinates\""))
lcl_parsePathCoordinates(rPath, aToken);
+ else if (aToken.startsWith("Name = \"GluePoints\""))
+ lcl_parsePathGluePoints(rPath, aToken);
else if (aToken.startsWith("Name = \"Segments\""))
lcl_parsePathSegments(rPath, aToken);
else if (aToken.startsWith("Name = \"TextFrames\""))
diff --git a/oox/source/drawingml/customshapes/oox-drawingml-cs-presets
b/oox/source/drawingml/customshapes/oox-drawingml-cs-presets
index 496e9524c15c..a88d3004006d 100644
--- a/oox/source/drawingml/customshapes/oox-drawingml-cs-presets
+++ b/oox/source/drawingml/customshapes/oox-drawingml-cs-presets
@@ -979,7 +979,7 @@ false
MirroredY
false
Path
-([]com.sun.star.beans.PropertyValue) { { Name = "Coordinates", Handle = (long)
0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) {
{ First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 0 }, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 3
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 3
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 }, Second = (com.sun.star.drawing.EnhancedCustomShapePa
rameter) { Value = (any) { (long) 4 }, Type = (short) 1 } } } }, State =
(com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name = "Segments", Handle
= (long) 0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeSegment)
{ { Command = (short) 1, Count = (short) 1 }, { Command = (short) 2, Count =
(short) 3 }, { Command = (short) 4, Count = (short) 0 }, { Command = (short) 5,
Count = (short) 0 } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "TextFrames", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeTextFrame) { { TopLeft =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 6
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 7
}, Type = (short) 1 } }, BottomRight =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomS
hapeParameter) { Value = (any) { (long) 0 }, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 1
}, Type = (short) 1 } } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE } }
+([]com.sun.star.beans.PropertyValue) { { Name = "Coordinates", Handle = (long)
0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) {
{ First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 0 }, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 3
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 3
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 }, Second = (com.sun.star.drawing.EnhancedCustomShapePa
rameter) { Value = (any) { (long) 4 }, Type = (short) 1 } } } }, State =
(com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name = "GluePoints",
Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) { { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 3
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 4
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 5 }, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 3
}, Type = (short) 1 } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "Segments", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeSegment) { { Command = (short) 1,
Count = (short) 1 }, { Command = (short) 2, Count = (short) 3 }, { Command =
(short) 4, Count = (short) 0 }, { Command = (short) 5, Count = (short) 0 } } },
State = (com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name =
"TextFrames", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeTextFrame) { { TopLeft =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 6
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 7
}, Type = (short) 1 } }, BottomRight = (com.sun.star.drawi
ng.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 1
}, Type = (short) 1 } } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE } }
Type
"ooxml-non-primitive"
ViewBox
@@ -1081,7 +1081,7 @@ false
MirroredY
false
Path
-([]com.sun.star.beans.PropertyValue) { { Name = "Coordinates", Handle = (long)
0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) {
{ First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 0 }, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 7
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 12
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 13
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 1 }, Second = (com.sun.star.drawing.EnhancedCustomShape
Parameter) { Value = (any) { (long) 2 }, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 14
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 15
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 16
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 17
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 } }, { First = (com.sun.star.drawin
g.EnhancedCustomShapeParameter) { Value = (any) { (long) 18 }, Type = (short)
1 }, Second = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value =
(any) { (long) 19 }, Type = (short) 1 } } } }, State =
(com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name = "Segments", Handle
= (long) 0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeSegment)
{ { Command = (short) 1, Count = (short) 1 }, { Command = (short) 17, Count =
(short) 4 }, { Command = (short) 4, Count = (short) 0 }, { Command = (short) 5,
Count = (short) 0 } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "TextFrames", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeTextFrame) { { TopLeft =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 8
}, Ty
pe = (short) 1 } }, BottomRight =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 6
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 9
}, Type = (short) 1 } } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE } }
+([]com.sun.star.beans.PropertyValue) { { Name = "Coordinates", Handle = (long)
0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) {
{ First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 0 }, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 7
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 12
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 13
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 1 }, Second = (com.sun.star.drawing.EnhancedCustomShape
Parameter) { Value = (any) { (long) 2 }, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 14
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 15
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 16
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 17
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 } }, { First = (com.sun.star.drawin
g.EnhancedCustomShapeParameter) { Value = (any) { (long) 18 }, Type = (short)
1 }, Second = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value =
(any) { (long) 19 }, Type = (short) 1 } } } }, State =
(com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name = "GluePoints",
Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) { { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 4
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 8
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 }, Second = (com.sun.star.drawing.EnhancedCustomShapeParamet
er) { Value = (any) { (long) 7 }, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 9
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 4
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 11
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 6
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 9
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 11
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 7
}, Type = (short) 1 } }, { First = (com.sun.star.drawing.Enhance
dCustomShapeParameter) { Value = (any) { (long) 6 }, Type = (short) 1 },
Second = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 8 }, Type = (short) 1 } } } }, State =
(com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name = "Segments", Handle
= (long) 0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeSegment)
{ { Command = (short) 1, Count = (short) 1 }, { Command = (short) 17, Count =
(short) 4 }, { Command = (short) 4, Count = (short) 0 }, { Command = (short) 5,
Count = (short) 0 } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "TextFrames", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeTextFrame) { { TopLeft =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 8
}, Type = (short
) 1 } }, BottomRight = (com.sun.star.drawing.EnhancedCustomShapeParameterPair)
{ First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 6 }, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 9
}, Type = (short) 1 } } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE } }
Type
"ooxml-non-primitive"
ViewBox
@@ -1744,7 +1744,7 @@ false
MirroredY
false
Path
-([]com.sun.star.beans.PropertyValue) { { Name = "Coordinates", Handle = (long)
0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) {
{ First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 13 }, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 20
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 14
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 19
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 12
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 17
}, Type = (short) 1 }, Second = (com.sun.star.drawing.EnhancedCustomS
hapeParameter) { Value = (any) { (long) 19 }, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 18
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 20
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 16
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 21
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 15
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 21
}, Type = (short) 1 } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "Segments", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeSegment) { { Command = (short) 1,
Count = (short) 1 }, { Command = (short) 2, Count =
(short) 6 }, { Command = (short) 4, Count = (short) 0 }, { Command = (short)
5, Count = (short) 0 } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "TextFrames", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeTextFrame) { { TopLeft =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 14
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 19
}, Type = (short) 1 } }, BottomRight =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 17
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 22
}, Type = (short) 1 } } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE } }
+([]com.sun.star.beans.PropertyValue) { { Name = "Coordinates", Handle = (long)
0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) {
{ First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 13 }, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 20
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 14
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 19
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 12
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 17
}, Type = (short) 1 }, Second = (com.sun.star.drawing.EnhancedCustomS
hapeParameter) { Value = (any) { (long) 19 }, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 18
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 20
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 16
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 21
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 15
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 21
}, Type = (short) 1 } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "GluePoints", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) { { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Val
ue = (any) { (long) 17 }, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 19
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 18
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 20
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 16
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 21
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 15
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 21
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 13
}, Type = (short) 1 }, Second = (com.sun.star.drawing.EnhancedCust
omShapeParameter) { Value = (any) { (long) 20 }, Type = (short) 1 } }, { First
= (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long)
14 }, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 19
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 12
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "Segments", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeSegment) { { Command = (short) 1,
Count = (short) 1 }, { Command = (short) 2, Count = (short) 6 }, { Command =
(short) 4, Count = (short) 0 }, { Command = (short) 5, Count = (short) 0 } } },
State = (com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name =
"TextFrames", Handle = (long) 0, Value = (any) { ([]
com.sun.star.drawing.EnhancedCustomShapeTextFrame) { { TopLeft =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 14
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 19
}, Type = (short) 1 } }, BottomRight =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 17
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 22
}, Type = (short) 1 } } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE } }
Type
"ooxml-non-primitive"
ViewBox
@@ -1761,7 +1761,7 @@ false
MirroredY
false
Path
-([]com.sun.star.beans.PropertyValue) { { Name = "Coordinates", Handle = (long)
0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) {
{ First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 0 }, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 8
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 9
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 6
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 9
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 23
}, Type = (short) 1 }, Second = (com.sun.star.drawing.EnhancedCustomShapeP
arameter) { Value = (any) { (long) 8 }, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 6
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 10
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 10
}, Type = (short) 1 } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "Segments", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeSegment) { { Command = (short) 1,
Count = (short) 1 }, { Command = (short) 2, Count = (short) 5 }, { Command =
(short) 4, Count = (short) 0 }, { Command = (short) 5, Count = (short) 0 } } },
State = (com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name =
"TextFrames", Handle = (long) 0, Value = (any) { ([]com.sun.st
ar.drawing.EnhancedCustomShapeTextFrame) { { TopLeft =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 19
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 20
}, Type = (short) 1 } }, BottomRight =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 21
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 22
}, Type = (short) 1 } } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE } }
+([]com.sun.star.beans.PropertyValue) { { Name = "Coordinates", Handle = (long)
0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) {
{ First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 0 }, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 8
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 9
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 6
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 9
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 23
}, Type = (short) 1 }, Second = (com.sun.star.drawing.EnhancedCustomShapeP
arameter) { Value = (any) { (long) 8 }, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 6
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 10
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 10
}, Type = (short) 1 } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "GluePoints", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) { { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 23
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 8
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any
) { (long) 6 }, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 10
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 10
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 8
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 9
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 6
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter
) { Value = (any) { (long) 9 }, Type = (short) 1 } } } }, State =
(com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name = "Segments", Handle
= (long) 0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeSegment)
{ { Command = (short) 1, Count = (short) 1 }, { Command = (short) 2, Count =
(short) 5 }, { Command = (short) 4, Count = (short) 0 }, { Command = (short) 5,
Count = (short) 0 } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "TextFrames", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeTextFrame) { { TopLeft =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 19
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 20
}, Type = (short) 1 } }, BottomRight =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeP
arameter) { Value = (any) { (long) 21 }, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 22
}, Type = (short) 1 } } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE } }
Type
"ooxml-non-primitive"
ViewBox
@@ -2254,7 +2254,7 @@ false
MirroredY
false
Path
-([]com.sun.star.beans.PropertyValue) { { Name = "Coordinates", Handle = (long)
0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) {
{ First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 0 }, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 3
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 8
}, Type = (short) 1 }, Second = (com.sun.star.drawing.EnhancedCustomShapePa
rameter) { Value = (any) { (long) 2 }, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 8
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 4
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 3
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 9
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 9
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 4
}, Type = (short) 1 } } } }, State = (com.sun.star.beans.Prop
ertyState) DIRECT_VALUE }, { Name = "Segments", Handle = (long) 0, Value =
(any) { ([]com.sun.star.drawing.EnhancedCustomShapeSegment) { { Command =
(short) 1, Count = (short) 1 }, { Command = (short) 2, Count = (short) 7 }, {
Command = (short) 4, Count = (short) 0 }, { Command = (short) 5, Count =
(short) 0 } } }, State = (com.sun.star.beans.PropertyState) DIRECT_VALUE }, {
Name = "TextFrames", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeTextFrame) { { TopLeft =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 } }, BottomRight =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 6
}, Type = (short) 1 }, Second = (com.sun.star.drawing.E
nhancedCustomShapeParameter) { Value = (any) { (long) 7 }, Type = (short) 1 }
} } } }, State = (com.sun.star.beans.PropertyState) DIRECT_VALUE } }
+([]com.sun.star.beans.PropertyValue) { { Name = "Coordinates", Handle = (long)
0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) {
{ First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 0 }, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 3
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 8
}, Type = (short) 1 }, Second = (com.sun.star.drawing.EnhancedCustomShapePa
rameter) { Value = (any) { (long) 2 }, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 8
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 4
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 3
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 9
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 9
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 4
}, Type = (short) 1 } } } }, State = (com.sun.star.beans.Prop
ertyState) DIRECT_VALUE }, { Name = "GluePoints", Handle = (long) 0, Value =
(any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) { { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 8
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 8
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 4
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 3
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 9
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Va
lue = (any) { (long) 9 }, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 4
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 3
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } } } }, State = (com.sun.star.beans.PropertyState) DI
RECT_VALUE }, { Name = "Segments", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeSegment) { { Command = (short) 1,
Count = (short) 1 }, { Command = (short) 2, Count = (short) 7 }, { Command =
(short) 4, Count = (short) 0 }, { Command = (short) 5, Count = (short) 0 } } },
State = (com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name =
"TextFrames", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeTextFrame) { { TopLeft =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 } }, BottomRight =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 6
}, Type = (short) 1 }, Second = (com.sun.star.drawing.EnhancedCustom
ShapeParameter) { Value = (any) { (long) 7 }, Type = (short) 1 } } } } },
State = (com.sun.star.beans.PropertyState) DIRECT_VALUE } }
Type
"ooxml-non-primitive"
ViewBox
@@ -2271,7 +2271,7 @@ false
MirroredY
false
Path
-([]com.sun.star.beans.PropertyValue) { { Name = "Coordinates", Handle = (long)
0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) {
{ First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 0 }, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 22
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 4
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 23
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 6
}, Type = (short) 1 }, Second = (com.sun.star.drawing.EnhancedCustomShape
Parameter) { Value = (any) { (long) 22 }, Type = (short) 1 } } } }, State =
(com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name = "Segments", Handle
= (long) 0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeSegment)
{ { Command = (short) 1, Count = (short) 1 }, { Command = (short) 2, Count =
(short) 3 }, { Command = (short) 4, Count = (short) 0 }, { Command = (short) 5,
Count = (short) 0 } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "TextFrames", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeTextFrame) { { TopLeft =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 13
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 14
}, Type = (short) 1 } }, BottomRight =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCu
stomShapeParameter) { Value = (any) { (long) 15 }, Type = (short) 1 }, Second
= (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long)
16 }, Type = (short) 1 } } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE } }
+([]com.sun.star.beans.PropertyValue) { { Name = "Coordinates", Handle = (long)
0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) {
{ First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 0 }, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 22
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 4
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 23
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 6
}, Type = (short) 1 }, Second = (com.sun.star.drawing.EnhancedCustomShape
Parameter) { Value = (any) { (long) 22 }, Type = (short) 1 } } } }, State =
(com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name = "GluePoints",
Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) { { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 9
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 8
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 21
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any
) { (long) 7 }, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 22
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 9
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 22
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 10
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 21
}, Type = (short) 1 } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "Segments", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeSegment) { { Command = (short) 1,
Count = (short) 1 }, { Command = (short) 2, Count = (short) 3 }, { Command =
(short) 4, Count = (short) 0 }, { Command = (short) 5, Count = (short) 0 } } },
State = (com.sun.star.beans.PropertyState
) DIRECT_VALUE }, { Name = "TextFrames", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeTextFrame) { { TopLeft =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 13
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 14
}, Type = (short) 1 } }, BottomRight =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 15
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 16
}, Type = (short) 1 } } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE } }
Type
"ooxml-non-primitive"
ViewBox
@@ -2288,7 +2288,7 @@ false
MirroredY
false
Path
-([]com.sun.star.beans.PropertyValue) { { Name = "Coordinates", Handle = (long)
0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) {
{ First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 11 }, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 15
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 10
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 14
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 15
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 13
}, Type = (short) 1 }, Second = (com.sun.star.drawing.EnhancedCustomS
hapeParameter) { Value = (any) { (long) 16 }, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 12
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 16
}, Type = (short) 1 } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "Segments", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeSegment) { { Command = (short) 1,
Count = (short) 1 }, { Command = (short) 2, Count = (short) 4 }, { Command =
(short) 4, Count = (short) 0 }, { Command = (short) 5, Count = (short) 0 } } },
State = (com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name =
"TextFrames", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeTextFrame) { { TopLeft =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 12
}, Type = (short)
1 }, Second = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value =
(any) { (long) 17 }, Type = (short) 1 } }, BottomRight =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 13
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 16
}, Type = (short) 1 } } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE } }
+([]com.sun.star.beans.PropertyValue) { { Name = "Coordinates", Handle = (long)
0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) {
{ First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 11 }, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 15
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 10
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 14
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 15
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 13
}, Type = (short) 1 }, Second = (com.sun.star.drawing.EnhancedCustomS
hapeParameter) { Value = (any) { (long) 16 }, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 12
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 16
}, Type = (short) 1 } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "GluePoints", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) { { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 10
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 11
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 15
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Valu
e = (any) { (long) 12 }, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 16
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 10
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 16
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 13
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 16
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 14
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 15
}, Type = (short) 1 } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "Segments", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustom
ShapeSegment) { { Command = (short) 1, Count = (short) 1 }, { Command =
(short) 2, Count = (short) 4 }, { Command = (short) 4, Count = (short) 0 }, {
Command = (short) 5, Count = (short) 0 } } }, State =
(com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name = "TextFrames",
Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeTextFrame) { { TopLeft =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 12
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 17
}, Type = (short) 1 } }, BottomRight =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 13
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 16
}, Type = (short) 1 } } } } }, State = (com.sun.star.beans.Pr
opertyState) DIRECT_VALUE } }
Type
"ooxml-non-primitive"
ViewBox
@@ -2305,7 +2305,7 @@ false
MirroredY
false
Path
-([]com.sun.star.beans.PropertyValue) { { Name = "Coordinates", Handle = (long)
0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) {
{ First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 12 }, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 14
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 7
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 29
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 30
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 11
}, Type = (short) 1 }, Second = (com.sun.star.drawing.EnhancedCustomSh
apeParameter) { Value = (any) { (long) 13 }, Type = (short) 1 } } } }, State =
(com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name = "Segments", Handle
= (long) 0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeSegment)
{ { Command = (short) 1, Count = (short) 1 }, { Command = (short) 17, Count =
(short) 1 }, { Command = (short) 2, Count = (short) 1 }, { Command = (short) 4,
Count = (short) 0 }, { Command = (short) 5, Count = (short) 0 } } }, State =
(com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name = "TextFrames",
Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeTextFrame) { { TopLeft =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 23
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 24
}, Type = (short) 1 } }, BottomRight =
(com.sun.star.drawing.EnhancedCustomShapeParameter
Pair) { First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value =
(any) { (long) 25 }, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 26
}, Type = (short) 1 } } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE } }
+([]com.sun.star.beans.PropertyValue) { { Name = "Coordinates", Handle = (long)
0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) {
{ First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 12 }, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 14
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 7
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 29
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 30
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 11
}, Type = (short) 1 }, Second = (com.sun.star.drawing.EnhancedCustomSh
apeParameter) { Value = (any) { (long) 13 }, Type = (short) 1 } } } }, State =
(com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name = "GluePoints",
Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) { { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 12
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 13
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 11
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 12
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 13
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value
= (any) { (long) 11 }, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "Segments", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeSegment) { { Command = (short) 1,
Count = (short) 1 }, { Command = (short) 17, Count = (short) 1 }, { Command =
(short) 2, Count = (short) 1 }, { Command = (short) 4, Count = (short) 0 }, {
Command = (short) 5, Count = (short) 0 } } }, State =
(com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name = "TextFrames",
Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeTextFrame) { { TopLeft =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 23
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 24
}, Type = (short) 1 } }, BottomRight =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 25
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 26
}, Type = (short) 1 } } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE } }
Type
"ooxml-non-primitive"
ViewBox
@@ -2611,7 +2611,7 @@ false
MirroredY
false
Path
-([]com.sun.star.beans.PropertyValue) { { Name = "Coordinates", Handle = (long)
0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) {
{ First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 0 }, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 4
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 6
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 4
}, Type = (short) 1 } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "Segments", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeSe
gment) { { Command = (short) 1, Count = (short) 1 }, { Command = (short) 2,
Count = (short) 2 }, { Command = (short) 4, Count = (short) 0 }, { Command =
(short) 5, Count = (short) 0 } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "TextFrames", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeTextFrame) { { TopLeft =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 7
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 1 } }, BottomRight =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 1
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 } } } } }, State = (com.sun.star.beans.PropertyState
) DIRECT_VALUE } }
+([]com.sun.star.beans.PropertyValue) { { Name = "Coordinates", Handle = (long)
0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) {
{ First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 0 }, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 4
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 6
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 4
}, Type = (short) 1 } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "GluePoints", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShape
ParameterPair) { { First = (com.sun.star.drawing.EnhancedCustomShapeParameter)
{ Value = (any) { (long) 0 }, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, , { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 3
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 4
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 4
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any)
{ (long) 6 }, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 4
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 3
}, Type = (short) 1 } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "Segments", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeSegment) { { Command = (short) 1,
Count = (short) 1 }, { Command = (short) 2, Count = (short) 2 }, { Command =
(short) 4, Count = (short) 0 }, { Command = (short) 5, Count = (short) 0 } } },
State = (com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name =
"TextFrames", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeTextFrame) { { TopLeft =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing
.EnhancedCustomShapeParameter) { Value = (any) { (long) 7 }, Type = (short) 1
}, Second = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any)
{ (long) 0 }, Type = (short) 1 } }, BottomRight =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 1
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 } } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE } }
Type
"ooxml-non-primitive"
ViewBox
@@ -2985,7 +2985,7 @@ false
MirroredY
false
Path
-([]com.sun.star.beans.PropertyValue) { { Name = "Coordinates", Handle = (long)
0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) {
{ First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 0 }, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 14
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 4
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 15
}, Type = (short) 1 }, Second = (com.sun.star.drawing.EnhancedCustomShape
Parameter) { Value = (any) { (long) 14 }, Type = (short) 1 } } } }, State =
(com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name = "Segments", Handle
= (long) 0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeSegment)
{ { Command = (short) 1, Count = (short) 1 }, { Command = (short) 2, Count =
(short) 3 }, { Command = (short) 4, Count = (short) 0 }, { Command = (short) 5,
Count = (short) 0 } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "TextFrames", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeTextFrame) { { TopLeft =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 8
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 10
}, Type = (short) 1 } }, BottomRight =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCus
tomShapeParameter) { Value = (any) { (long) 11 }, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 14
}, Type = (short) 1 } } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE } }
+([]com.sun.star.beans.PropertyValue) { { Name = "Coordinates", Handle = (long)
0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) {
{ First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 0 }, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 14
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 4
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 15
}, Type = (short) 1 }, Second = (com.sun.star.drawing.EnhancedCustomShape
Parameter) { Value = (any) { (long) 14 }, Type = (short) 1 } } } }, State =
(com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name = "GluePoints",
Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) { { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 12
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 3
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 13
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 12
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 14
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value =
(any) { (long) 6 }, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 13
}, Type = (short) 1 } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "Segments", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeSegment) { { Command = (short) 1,
Count = (short) 1 }, { Command = (short) 2, Count = (short) 3 }, { Command =
(short) 4, Count = (short) 0 }, { Command = (short) 5, Count = (short) 0 } } },
State = (com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name =
"TextFrames", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeTextFrame) { { TopLeft =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 8
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 10
}, Type = (short) 1 } }, BottomRight = (com.sun.
star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 11
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 14
}, Type = (short) 1 } } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE } }
Type
"ooxml-non-primitive"
ViewBox
@@ -3002,7 +3002,7 @@ false
MirroredY
false
Path
-([]com.sun.star.beans.PropertyValue) { { Name = "Coordinates", Handle = (long)
0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) {
{ First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 0 }, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 6
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 7
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 6
}, Type = (short) 1 } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "Segments", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeSe
gment) { { Command = (short) 1, Count = (short) 1 }, { Command = (short) 2,
Count = (short) 2 }, { Command = (short) 4, Count = (short) 0 }, { Command =
(short) 5, Count = (short) 0 } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "TextFrames", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeTextFrame) { { TopLeft =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 1
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 } }, BottomRight =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 4
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 6
}, Type = (short) 1 } } } } }, State = (com.sun.star.beans.PropertyState
) DIRECT_VALUE } }
+([]com.sun.star.beans.PropertyValue) { { Name = "Coordinates", Handle = (long)
0, Value = (any) { ([]com.sun.star.drawing.EnhancedCustomShapeParameterPair) {
{ First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 0 }, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 6
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 7
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 6
}, Type = (short) 1 } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "GluePoints", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShape
ParameterPair) { { First = (com.sun.star.drawing.EnhancedCustomShapeParameter)
{ Value = (any) { (long) 2 }, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 1
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0
}, Type = (short) 0 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 6
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 6
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 7 }, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 6
}, Type = (short) 1 } }, { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 4
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 5
}, Type = (short) 1 } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE }, { Name = "Segments", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeSegment) { { Command = (short) 1,
Count = (short) 1 }, { Command = (short) 2, Count = (short) 2 }, { Command =
(short) 4, Count = (short) 0 }, { Command = (short) 5, Count = (short) 0 } } },
State = (com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name =
"TextFrames", Handle = (long) 0, Value = (any) {
([]com.sun.star.drawing.EnhancedCustomShapeTextFrame) { { TopLeft =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.E
nhancedCustomShapeParameter) { Value = (any) { (long) 1 }, Type = (short) 1 },
Second = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) {
(long) 5 }, Type = (short) 1 } }, BottomRight =
(com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 4
}, Type = (short) 1 }, Second =
(com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 6
}, Type = (short) 1 } } } } }, State = (com.sun.star.beans.PropertyState)
DIRECT_VALUE } }
Type
"ooxml-non-primitive"
ViewBox
diff --git a/sd/qa/unit/data/pptx/tdf147459.pptx
b/sd/qa/unit/data/pptx/tdf147459.pptx
new file mode 100644
index 000000000000..ef71ec94d55f
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf147459.pptx differ
diff --git a/sd/qa/unit/data/xml/n820786_0.xml
b/sd/qa/unit/data/xml/n820786_0.xml
index a7e7c40cbb3b..7c99d7806999 100644
--- a/sd/qa/unit/data/xml/n820786_0.xml
+++ b/sd/qa/unit/data/xml/n820786_0.xml
@@ -127,6 +127,7 @@
</EnhancedCustomShapeParameterPair>
</Coordinates>
</PropertyValue>
+ <PropertyValue name="GluePoints" handle="0"
propertyState="DIRECT_VALUE"/>
<PropertyValue name="Segments">
<Segments>
<EnhancedCustomShapeSegment command="1" count="1"/>
@@ -209,6 +210,7 @@
</EnhancedCustomShapeParameterPair>
</Coordinates>
</PropertyValue>
+ <PropertyValue name="GluePoints" handle="0"
propertyState="DIRECT_VALUE"/>
<PropertyValue name="Segments">
<Segments>
<EnhancedCustomShapeSegment command="1" count="1"/>
diff --git a/sd/qa/unit/data/xml/tdf109317_0.xml
b/sd/qa/unit/data/xml/tdf109317_0.xml
index f7ed3136257f..76f9ed70ff9a 100644
--- a/sd/qa/unit/data/xml/tdf109317_0.xml
+++ b/sd/qa/unit/data/xml/tdf109317_0.xml
@@ -238,6 +238,7 @@
<PropertyValue name="Type" value="ooxml-rtTriangle" handle="0"
propertyState="DIRECT_VALUE"/>
<PropertyValue name="Path">
<Path>
+ <PropertyValue name="GluePoints" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="TextFrames" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Coordinates">
<Coordinates>
@@ -293,6 +294,7 @@
<PropertyValue name="Type" value="ooxml-rtTriangle" handle="0"
propertyState="DIRECT_VALUE"/>
<PropertyValue name="Path">
<Path>
+ <PropertyValue name="GluePoints" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="TextFrames" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Coordinates">
<Coordinates>
@@ -348,6 +350,7 @@
<PropertyValue name="Type" value="ooxml-rtTriangle" handle="0"
propertyState="DIRECT_VALUE"/>
<PropertyValue name="Path">
<Path>
+ <PropertyValue name="GluePoints" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="TextFrames" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Coordinates">
<Coordinates>
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 9d479fb69437..215d668b2f3f 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -51,6 +51,7 @@
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/presentation/XCustomPresentationSupplier.hpp>
+#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
#include <stlpool.hxx>
#include <comphelper/sequenceashashmap.hxx>
@@ -79,6 +80,7 @@ public:
virtual void setUp() override;
void testDocumentLayout();
+ void testTdf147459();
void testTdf146223();
void testTdf144918();
void testTdf144917();
@@ -145,6 +147,7 @@ public:
CPPUNIT_TEST_SUITE(SdImportTest);
CPPUNIT_TEST(testDocumentLayout);
+ CPPUNIT_TEST(testTdf147459);
CPPUNIT_TEST(testTdf146223);
CPPUNIT_TEST(testTdf144918);
CPPUNIT_TEST(testTdf144917);
@@ -289,6 +292,38 @@ void SdImportTest::testDocumentLayout()
}
}
+void SdImportTest::testTdf147459()
+{
+ sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf147459.pptx"),
PPTX);
+ uno::Reference<beans::XPropertySet> xTriangleShape(getShapeFromPage(0, 0,
xDocShRef));
+ uno::Sequence<beans::PropertyValue> aProps;
+ xTriangleShape->getPropertyValue("CustomShapeGeometry") >>= aProps;
+
+ uno::Sequence<beans::PropertyValue> aPathProps;
+ for (beans::PropertyValue const& rProp : std::as_const(aProps))
+ {
+ if (rProp.Name == "Path")
+ aPathProps =
rProp.Value.get<uno::Sequence<beans::PropertyValue>>();
+ }
+
+ uno::Sequence<drawing::EnhancedCustomShapeParameterPair> seqGluePoints;
+ for (beans::PropertyValue const& rProp : std::as_const(aPathProps))
+ {
+ if (rProp.Name == "GluePoints")
+ {
+ seqGluePoints
+ =
rProp.Value.get<uno::Sequence<drawing::EnhancedCustomShapeParameterPair>>();
+ }
+ }
+
+ sal_Int32 nCountGluePoints = seqGluePoints.getLength();
+ // The triangle has 6 glue points.
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(6), nCountGluePoints);
+
+ xDocShRef->DoClose();
+}
+
void SdImportTest::testTdf146223()
{
sd::DrawDocShellRef xDocShRef
