diff options
author | Vasily Melenchuk <Vasily.Melenchuk@cib.de> | 2017-07-21 18:40:20 +0300 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-07-26 14:44:15 +0200 |
commit | 235f16a7c50de9908ce32fd6f1347c7b888bc1b7 (patch) | |
tree | bad9243fac8c952798b8f34c22ca30952ad32e04 | |
parent | c694ce3e0b3a6832ed36b3ca683d18d740310bbd (diff) |
tdf#100491 fix DOCX import shape line with arrow marker
Line shape with arrow end markers was rendering rather thick
arrow, not connected to main line. Moreover, arrow width should
depend on actual line width.
Change-Id: I8d9a6e7f5d89a1645dcc5939ecc592e86e6fe34f
Reviewed-on: https://gerrit.libreoffice.org/40286
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 2d3b7a07c02c90d2d64a630ab84886ef3096edfc)
Reviewed-on: https://gerrit.libreoffice.org/40437
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
-rw-r--r-- | oox/source/drawingml/lineproperties.cxx | 32 | ||||
-rw-r--r-- | sd/qa/unit/data/tdf100491.pptx | bin | 0 -> 30914 bytes | |||
-rw-r--r-- | sd/qa/unit/data/xml/fdo47434_0.xml | 52 | ||||
-rw-r--r-- | sd/qa/unit/data/xml/tdf100491_0.xml | 563 | ||||
-rw-r--r-- | sd/qa/unit/import-tests.cxx | 1 |
5 files changed, 618 insertions, 30 deletions
diff --git a/oox/source/drawingml/lineproperties.cxx b/oox/source/drawingml/lineproperties.cxx index dabe5d71356b..43495e709561 100644 --- a/oox/source/drawingml/lineproperties.cxx +++ b/oox/source/drawingml/lineproperties.cxx @@ -205,14 +205,19 @@ void lclPushMarkerProperties( ShapePropertyMap& rPropMap, if( !aBuffer.isEmpty() ) { + bool bIsArrow = nArrowType == XML_arrow; sal_Int32 nLength = lclGetArrowSize( rArrowProps.moArrowLength.get( XML_med ) ); sal_Int32 nWidth = lclGetArrowSize( rArrowProps.moArrowWidth.get( XML_med ) ); sal_Int32 nNameIndex = nWidth * 3 + nLength + 1; aBuffer.append( ' ' ).append( nNameIndex ); + if (bIsArrow) + { + // Arrow marker form depends also on line width + aBuffer.append(' ').append(nLineWidth); + } OUString aMarkerName = aBuffer.makeStringAndClear(); - bool bIsArrow = nArrowType == XML_arrow; double fArrowLength = 1.0; switch( nLength ) { @@ -229,7 +234,7 @@ void lclPushMarkerProperties( ShapePropertyMap& rPropMap, } // set arrow width relative to line width sal_Int32 nBaseLineWidth = ::std::max< sal_Int32 >( nLineWidth, 70 ); - nMarkerWidth = static_cast< sal_Int32 >( fArrowWidth * nBaseLineWidth ); + nMarkerWidth = static_cast<sal_Int32>( fArrowWidth * nBaseLineWidth ); /* Test if the marker already exists in the marker table, do not create it again in this case. If markers are inserted explicitly @@ -238,7 +243,11 @@ void lclPushMarkerProperties( ShapePropertyMap& rPropMap, if( !rPropMap.hasNamedLineMarkerInTable( aMarkerName ) ) { // pass X and Y as percentage to OOX_ARROW_POINT -#define OOX_ARROW_POINT( x, y ) awt::Point( static_cast< sal_Int32 >( fArrowWidth * x ), static_cast< sal_Int32 >( fArrowLength * y ) ) +#define OOX_ARROW_POINT( x, y ) awt::Point( static_cast< sal_Int32 >( fArrowWidth * ( x ) ), static_cast< sal_Int32 >( fArrowLength * ( y ) ) ) + // tdf#100491 Arrow line marker, unlike other markers, depends on line width. + // So calculate width of half line (more convinient during drawing) taking into account + // further conversions/scaling done in OOX_ARROW_POINT macro and scaling to nMarkerWidth. + const double fArrowLineHalfWidth = ::std::max< double >( 100.0 * 0.5 * nLineWidth / nMarkerWidth, 1 ); ::std::vector< awt::Point > aPoints; OSL_ASSERT((rArrowProps.moArrowType.get() & sal_Int32(0xFFFF0000))==0); @@ -251,13 +260,16 @@ void lclPushMarkerProperties( ShapePropertyMap& rPropMap, aPoints.push_back( OOX_ARROW_POINT( 50, 0 ) ); break; case XML_arrow: - aPoints.push_back( OOX_ARROW_POINT( 50, 0 ) ); - aPoints.push_back( OOX_ARROW_POINT( 100, 91 ) ); - aPoints.push_back( OOX_ARROW_POINT( 85, 100 ) ); - aPoints.push_back( OOX_ARROW_POINT( 50, 36 ) ); - aPoints.push_back( OOX_ARROW_POINT( 15, 100 ) ); - aPoints.push_back( OOX_ARROW_POINT( 0, 91 ) ); - aPoints.push_back( OOX_ARROW_POINT( 50, 0 ) ); + aPoints.push_back( OOX_ARROW_POINT( 50, 0 ) ); + aPoints.push_back( OOX_ARROW_POINT( 100, 100 - fArrowLineHalfWidth * 1.5) ); + aPoints.push_back( OOX_ARROW_POINT( 100 - fArrowLineHalfWidth * 1.5, 100 ) ); + aPoints.push_back( OOX_ARROW_POINT( 50.0 + fArrowLineHalfWidth, 5.5 * fArrowLineHalfWidth) ); + aPoints.push_back( OOX_ARROW_POINT( 50.0 + fArrowLineHalfWidth, 100 ) ); + aPoints.push_back( OOX_ARROW_POINT( 50.0 - fArrowLineHalfWidth, 100 ) ); + aPoints.push_back( OOX_ARROW_POINT( 50.0 - fArrowLineHalfWidth, 5.5 * fArrowLineHalfWidth) ); + aPoints.push_back( OOX_ARROW_POINT( fArrowLineHalfWidth * 1.5, 100 ) ); + aPoints.push_back( OOX_ARROW_POINT( 0, 100 - fArrowLineHalfWidth * 1.5) ); + aPoints.push_back( OOX_ARROW_POINT( 50, 0 ) ); break; case XML_stealth: aPoints.push_back( OOX_ARROW_POINT( 50, 0 ) ); diff --git a/sd/qa/unit/data/tdf100491.pptx b/sd/qa/unit/data/tdf100491.pptx Binary files differnew file mode 100644 index 000000000000..d25388d236e8 --- /dev/null +++ b/sd/qa/unit/data/tdf100491.pptx diff --git a/sd/qa/unit/data/xml/fdo47434_0.xml b/sd/qa/unit/data/xml/fdo47434_0.xml index bd91804d12a7..a37b6cb91c12 100644 --- a/sd/qa/unit/data/xml/fdo47434_0.xml +++ b/sd/qa/unit/data/xml/fdo47434_0.xml @@ -10,11 +10,14 @@ <LineEnd> <pointSequence> <point positionX="225" positionY="0" polygonFlags="NORMAL"/> - <point positionX="450" positionY="409" polygonFlags="NORMAL"/> - <point positionX="382" positionY="450" polygonFlags="NORMAL"/> - <point positionX="225" positionY="162" polygonFlags="NORMAL"/> - <point positionX="67" positionY="450" polygonFlags="NORMAL"/> - <point positionX="0" positionY="409" polygonFlags="NORMAL"/> + <point positionX="450" positionY="422" polygonFlags="NORMAL"/> + <point positionX="422" positionY="450" polygonFlags="NORMAL"/> + <point positionX="243" positionY="102" polygonFlags="NORMAL"/> + <point positionX="243" positionY="450" polygonFlags="NORMAL"/> + <point positionX="206" positionY="450" polygonFlags="NORMAL"/> + <point positionX="206" positionY="102" polygonFlags="NORMAL"/> + <point positionX="27" positionY="450" polygonFlags="NORMAL"/> + <point positionX="0" positionY="422" polygonFlags="NORMAL"/> <point positionX="225" positionY="0" polygonFlags="NORMAL"/> </pointSequence> </LineEnd> @@ -70,11 +73,14 @@ <LineEnd> <pointSequence> <point positionX="225" positionY="0" polygonFlags="NORMAL"/> - <point positionX="450" positionY="409" polygonFlags="NORMAL"/> - <point positionX="382" positionY="450" polygonFlags="NORMAL"/> - <point positionX="225" positionY="162" polygonFlags="NORMAL"/> - <point positionX="67" positionY="450" polygonFlags="NORMAL"/> - <point positionX="0" positionY="409" polygonFlags="NORMAL"/> + <point positionX="450" positionY="422" polygonFlags="NORMAL"/> + <point positionX="422" positionY="450" polygonFlags="NORMAL"/> + <point positionX="243" positionY="102" polygonFlags="NORMAL"/> + <point positionX="243" positionY="450" polygonFlags="NORMAL"/> + <point positionX="206" positionY="450" polygonFlags="NORMAL"/> + <point positionX="206" positionY="102" polygonFlags="NORMAL"/> + <point positionX="27" positionY="450" polygonFlags="NORMAL"/> + <point positionX="0" positionY="422" polygonFlags="NORMAL"/> <point positionX="225" positionY="0" polygonFlags="NORMAL"/> </pointSequence> </LineEnd> @@ -130,11 +136,14 @@ <LineEnd> <pointSequence> <point positionX="225" positionY="0" polygonFlags="NORMAL"/> - <point positionX="450" positionY="409" polygonFlags="NORMAL"/> - <point positionX="382" positionY="450" polygonFlags="NORMAL"/> - <point positionX="225" positionY="162" polygonFlags="NORMAL"/> - <point positionX="67" positionY="450" polygonFlags="NORMAL"/> - <point positionX="0" positionY="409" polygonFlags="NORMAL"/> + <point positionX="450" positionY="422" polygonFlags="NORMAL"/> + <point positionX="422" positionY="450" polygonFlags="NORMAL"/> + <point positionX="243" positionY="102" polygonFlags="NORMAL"/> + <point positionX="243" positionY="450" polygonFlags="NORMAL"/> + <point positionX="206" positionY="450" polygonFlags="NORMAL"/> + <point positionX="206" positionY="102" polygonFlags="NORMAL"/> + <point positionX="27" positionY="450" polygonFlags="NORMAL"/> + <point positionX="0" positionY="422" polygonFlags="NORMAL"/> <point positionX="225" positionY="0" polygonFlags="NORMAL"/> </pointSequence> </LineEnd> @@ -190,11 +199,14 @@ <LineEnd> <pointSequence> <point positionX="225" positionY="0" polygonFlags="NORMAL"/> - <point positionX="450" positionY="409" polygonFlags="NORMAL"/> - <point positionX="382" positionY="450" polygonFlags="NORMAL"/> - <point positionX="225" positionY="162" polygonFlags="NORMAL"/> - <point positionX="67" positionY="450" polygonFlags="NORMAL"/> - <point positionX="0" positionY="409" polygonFlags="NORMAL"/> + <point positionX="450" positionY="422" polygonFlags="NORMAL"/> + <point positionX="422" positionY="450" polygonFlags="NORMAL"/> + <point positionX="243" positionY="102" polygonFlags="NORMAL"/> + <point positionX="243" positionY="450" polygonFlags="NORMAL"/> + <point positionX="206" positionY="450" polygonFlags="NORMAL"/> + <point positionX="206" positionY="102" polygonFlags="NORMAL"/> + <point positionX="27" positionY="450" polygonFlags="NORMAL"/> + <point positionX="0" positionY="422" polygonFlags="NORMAL"/> <point positionX="225" positionY="0" polygonFlags="NORMAL"/> </pointSequence> </LineEnd> diff --git a/sd/qa/unit/data/xml/tdf100491_0.xml b/sd/qa/unit/data/xml/tdf100491_0.xml new file mode 100644 index 000000000000..2f6be87e73ab --- /dev/null +++ b/sd/qa/unit/data/xml/tdf100491_0.xml @@ -0,0 +1,563 @@ +<?xml version="1.0"?> +<XShapes> + <XShape positionX="3680" positionY="2451" sizeX="6" sizeY="2990" type="com.sun.star.drawing.LineShape" name="Straight Connector 3" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart> + <pointSequence> + <point positionX="225" positionY="0" polygonFlags="NORMAL"/> + <point positionX="450" positionY="430" polygonFlags="NORMAL"/> + <point positionX="430" positionY="450" polygonFlags="NORMAL"/> + <point positionX="237" positionY="70" polygonFlags="NORMAL"/> + <point positionX="237" positionY="450" polygonFlags="NORMAL"/> + <point positionX="212" positionY="450" polygonFlags="NORMAL"/> + <point positionX="212" positionY="70" polygonFlags="NORMAL"/> + <point positionX="19" positionY="450" polygonFlags="NORMAL"/> + <point positionX="0" positionY="430" polygonFlags="NORMAL"/> + <point positionX="225" positionY="0" polygonFlags="NORMAL"/> + </pointSequence> + </LineStart> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="3686" positionY="2451"/> + <point positionX="3680" positionY="5441"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="6" positionY="0"/> + <point positionX="0" positionY="2990"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="6.000000" column2="0.000000" column3="3680.000000"/> + <Line2 column1="0.000000" column2="2990.000000" column3="2451.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="4324" positionY="2449" sizeX="5" sizeY="2990" type="com.sun.star.drawing.LineShape" name="Straight Connector 4" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart> + <pointSequence> + <point positionX="300" positionY="0" polygonFlags="NORMAL"/> + <point positionX="600" positionY="338" polygonFlags="NORMAL"/> + <point positionX="580" positionY="350" polygonFlags="NORMAL"/> + <point positionX="312" positionY="41" polygonFlags="NORMAL"/> + <point positionX="312" positionY="350" polygonFlags="NORMAL"/> + <point positionX="287" positionY="350" polygonFlags="NORMAL"/> + <point positionX="287" positionY="41" polygonFlags="NORMAL"/> + <point positionX="19" positionY="350" polygonFlags="NORMAL"/> + <point positionX="0" positionY="338" polygonFlags="NORMAL"/> + <point positionX="300" positionY="0" polygonFlags="NORMAL"/> + </pointSequence> + </LineStart> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="4329" positionY="2449"/> + <point positionX="4324" positionY="5439"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="5" positionY="0"/> + <point positionX="0" positionY="2990"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="5.000000" column2="0.000000" column3="4324.000000"/> + <Line2 column1="0.000000" column2="2990.000000" column3="2449.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="4947" positionY="2449" sizeX="5" sizeY="2990" type="com.sun.star.drawing.LineShape" name="Straight Connector 5" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart> + <pointSequence> + <point positionX="300" positionY="0" polygonFlags="NORMAL"/> + <point positionX="600" positionY="580" polygonFlags="NORMAL"/> + <point positionX="580" positionY="600" polygonFlags="NORMAL"/> + <point positionX="312" positionY="70" polygonFlags="NORMAL"/> + <point positionX="312" positionY="600" polygonFlags="NORMAL"/> + <point positionX="287" positionY="600" polygonFlags="NORMAL"/> + <point positionX="287" positionY="70" polygonFlags="NORMAL"/> + <point positionX="19" positionY="600" polygonFlags="NORMAL"/> + <point positionX="0" positionY="580" polygonFlags="NORMAL"/> + <point positionX="300" positionY="0" polygonFlags="NORMAL"/> + </pointSequence> + </LineStart> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="4952" positionY="2449"/> + <point positionX="4947" positionY="5439"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="5" positionY="0"/> + <point positionX="0" positionY="2990"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="5.000000" column2="0.000000" column3="4947.000000"/> + <Line2 column1="0.000000" column2="2990.000000" column3="2449.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="9401" positionY="2435" sizeX="5" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 6" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart> + <pointSequence> + <point positionX="225" positionY="0" polygonFlags="NORMAL"/> + <point positionX="450" positionY="374" polygonFlags="NORMAL"/> + <point positionX="374" positionY="450" polygonFlags="NORMAL"/> + <point positionX="275" positionY="275" polygonFlags="NORMAL"/> + <point positionX="275" positionY="450" polygonFlags="NORMAL"/> + <point positionX="174" positionY="450" polygonFlags="NORMAL"/> + <point positionX="174" positionY="275" polygonFlags="NORMAL"/> + <point positionX="75" positionY="450" polygonFlags="NORMAL"/> + <point positionX="0" positionY="374" polygonFlags="NORMAL"/> + <point positionX="225" positionY="0" polygonFlags="NORMAL"/> + </pointSequence> + </LineStart> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="9406" positionY="2435"/> + <point positionX="9401" positionY="5423"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="5" positionY="0"/> + <point positionX="0" positionY="2988"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="5.000000" column2="0.000000" column3="9401.000000"/> + <Line2 column1="0.000000" column2="2988.000000" column3="2435.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="10043" positionY="2433" sizeX="5" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 7" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart> + <pointSequence> + <point positionX="225" positionY="0" polygonFlags="NORMAL"/> + <point positionX="450" positionY="291" polygonFlags="NORMAL"/> + <point positionX="374" positionY="350" polygonFlags="NORMAL"/> + <point positionX="275" positionY="214" polygonFlags="NORMAL"/> + <point positionX="275" positionY="350" polygonFlags="NORMAL"/> + <point positionX="174" positionY="350" polygonFlags="NORMAL"/> + <point positionX="174" positionY="214" polygonFlags="NORMAL"/> + <point positionX="75" positionY="350" polygonFlags="NORMAL"/> + <point positionX="0" positionY="291" polygonFlags="NORMAL"/> + <point positionX="225" positionY="0" polygonFlags="NORMAL"/> + </pointSequence> + </LineStart> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="10048" positionY="2433"/> + <point positionX="10043" positionY="5421"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="5" positionY="0"/> + <point positionX="0" positionY="2988"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="5.000000" column2="0.000000" column3="10043.000000"/> + <Line2 column1="0.000000" column2="2988.000000" column3="2433.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="10669" positionY="2435" sizeX="5" sizeY="2990" type="com.sun.star.drawing.LineShape" name="Straight Connector 8" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart> + <pointSequence> + <point positionX="300" positionY="0" polygonFlags="NORMAL"/> + <point positionX="600" positionY="525" polygonFlags="NORMAL"/> + <point positionX="525" positionY="600" polygonFlags="NORMAL"/> + <point positionX="350" positionY="275" polygonFlags="NORMAL"/> + <point positionX="350" positionY="600" polygonFlags="NORMAL"/> + <point positionX="250" positionY="600" polygonFlags="NORMAL"/> + <point positionX="250" positionY="275" polygonFlags="NORMAL"/> + <point positionX="75" positionY="600" polygonFlags="NORMAL"/> + <point positionX="0" positionY="525" polygonFlags="NORMAL"/> + <point positionX="300" positionY="0" polygonFlags="NORMAL"/> + </pointSequence> + </LineStart> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="10674" positionY="2435"/> + <point positionX="10669" positionY="5425"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="5" positionY="0"/> + <point positionX="0" positionY="2990"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="5.000000" column2="0.000000" column3="10669.000000"/> + <Line2 column1="0.000000" column2="2990.000000" column3="2435.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="12466" positionY="2433" sizeX="6" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 9" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart> + <pointSequence> + <point positionX="225" positionY="0" polygonFlags="NORMAL"/> + <point positionX="450" positionY="374" polygonFlags="NORMAL"/> + <point positionX="374" positionY="450" polygonFlags="NORMAL"/> + <point positionX="275" positionY="275" polygonFlags="NORMAL"/> + <point positionX="275" positionY="450" polygonFlags="NORMAL"/> + <point positionX="174" positionY="450" polygonFlags="NORMAL"/> + <point positionX="174" positionY="275" polygonFlags="NORMAL"/> + <point positionX="75" positionY="450" polygonFlags="NORMAL"/> + <point positionX="0" positionY="374" polygonFlags="NORMAL"/> + <point positionX="225" positionY="0" polygonFlags="NORMAL"/> + </pointSequence> + </LineStart> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="12472" positionY="2433"/> + <point positionX="12466" positionY="5421"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="6" positionY="0"/> + <point positionX="0" positionY="2988"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="6.000000" column2="0.000000" column3="12466.000000"/> + <Line2 column1="0.000000" column2="2988.000000" column3="2433.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="13107" positionY="2431" sizeX="5" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 10" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart> + <pointSequence> + <point positionX="225" positionY="0" polygonFlags="NORMAL"/> + <point positionX="450" positionY="291" polygonFlags="NORMAL"/> + <point positionX="374" positionY="350" polygonFlags="NORMAL"/> + <point positionX="275" positionY="214" polygonFlags="NORMAL"/> + <point positionX="275" positionY="350" polygonFlags="NORMAL"/> + <point positionX="174" positionY="350" polygonFlags="NORMAL"/> + <point positionX="174" positionY="214" polygonFlags="NORMAL"/> + <point positionX="75" positionY="350" polygonFlags="NORMAL"/> + <point positionX="0" positionY="291" polygonFlags="NORMAL"/> + <point positionX="225" positionY="0" polygonFlags="NORMAL"/> + </pointSequence> + </LineStart> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="13112" positionY="2431"/> + <point positionX="13107" positionY="5419"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="5" positionY="0"/> + <point positionX="0" positionY="2988"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="5.000000" column2="0.000000" column3="13107.000000"/> + <Line2 column1="0.000000" column2="2988.000000" column3="2431.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="13731" positionY="2431" sizeX="5" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 11" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart> + <pointSequence> + <point positionX="300" positionY="0" polygonFlags="NORMAL"/> + <point positionX="600" positionY="525" polygonFlags="NORMAL"/> + <point positionX="525" positionY="600" polygonFlags="NORMAL"/> + <point positionX="350" positionY="275" polygonFlags="NORMAL"/> + <point positionX="350" positionY="600" polygonFlags="NORMAL"/> + <point positionX="250" positionY="600" polygonFlags="NORMAL"/> + <point positionX="250" positionY="275" polygonFlags="NORMAL"/> + <point positionX="75" positionY="600" polygonFlags="NORMAL"/> + <point positionX="0" positionY="525" polygonFlags="NORMAL"/> + <point positionX="300" positionY="0" polygonFlags="NORMAL"/> + </pointSequence> + </LineStart> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="13736" positionY="2431"/> + <point positionX="13731" positionY="5419"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="5" positionY="0"/> + <point positionX="0" positionY="2988"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="5.000000" column2="0.000000" column3="13731.000000"/> + <Line2 column1="0.000000" column2="2988.000000" column3="2431.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="15872" positionY="2431" sizeX="6" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 12" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart> + <pointSequence> + <point positionX="225" positionY="0" polygonFlags="NORMAL"/> + <point positionX="450" positionY="374" polygonFlags="NORMAL"/> + <point positionX="374" positionY="450" polygonFlags="NORMAL"/> + <point positionX="275" positionY="275" polygonFlags="NORMAL"/> + <point positionX="275" positionY="450" polygonFlags="NORMAL"/> + <point positionX="174" positionY="450" polygonFlags="NORMAL"/> + <point positionX="174" positionY="275" polygonFlags="NORMAL"/> + <point positionX="75" positionY="450" polygonFlags="NORMAL"/> + <point positionX="0" positionY="374" polygonFlags="NORMAL"/> + <point positionX="225" positionY="0" polygonFlags="NORMAL"/> + </pointSequence> + </LineStart> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="15878" positionY="2431"/> + <point positionX="15872" positionY="5419"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="6" positionY="0"/> + <point positionX="0" positionY="2988"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="6.000000" column2="0.000000" column3="15872.000000"/> + <Line2 column1="0.000000" column2="2988.000000" column3="2431.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="16513" positionY="2430" sizeX="5" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 13" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart> + <pointSequence> + <point positionX="225" positionY="0" polygonFlags="NORMAL"/> + <point positionX="450" positionY="291" polygonFlags="NORMAL"/> + <point positionX="374" positionY="350" polygonFlags="NORMAL"/> + <point positionX="275" positionY="214" polygonFlags="NORMAL"/> + <point positionX="275" positionY="350" polygonFlags="NORMAL"/> + <point positionX="174" positionY="350" polygonFlags="NORMAL"/> + <point positionX="174" positionY="214" polygonFlags="NORMAL"/> + <point positionX="75" positionY="350" polygonFlags="NORMAL"/> + <point positionX="0" positionY="291" polygonFlags="NORMAL"/> + <point positionX="225" positionY="0" polygonFlags="NORMAL"/> + </pointSequence> + </LineStart> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="16518" positionY="2430"/> + <point positionX="16513" positionY="5418"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="5" positionY="0"/> + <point positionX="0" positionY="2988"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="5.000000" column2="0.000000" column3="16513.000000"/> + <Line2 column1="0.000000" column2="2988.000000" column3="2430.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="17137" positionY="2430" sizeX="5" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 14" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart> + <pointSequence> + <point positionX="225" positionY="0" polygonFlags="NORMAL"/> + <point positionX="450" positionY="499" polygonFlags="NORMAL"/> + <point positionX="374" positionY="600" polygonFlags="NORMAL"/> + <point positionX="275" positionY="366" polygonFlags="NORMAL"/> + <point positionX="275" positionY="600" polygonFlags="NORMAL"/> + <point positionX="174" positionY="600" polygonFlags="NORMAL"/> + <point positionX="174" positionY="366" polygonFlags="NORMAL"/> + <point positionX="75" positionY="600" polygonFlags="NORMAL"/> + <point positionX="0" positionY="499" polygonFlags="NORMAL"/> + <point positionX="225" positionY="0" polygonFlags="NORMAL"/> + </pointSequence> + </LineStart> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="17142" positionY="2430"/> + <point positionX="17137" positionY="5418"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="5" positionY="0"/> + <point positionX="0" positionY="2988"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="5.000000" column2="0.000000" column3="17137.000000"/> + <Line2 column1="0.000000" column2="2988.000000" column3="2430.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="17772" positionY="2430" sizeX="5" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 15" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart> + <pointSequence> + <point positionX="175" positionY="0" polygonFlags="NORMAL"/> + <point positionX="350" positionY="274" polygonFlags="NORMAL"/> + <point positionX="274" positionY="350" polygonFlags="NORMAL"/> + <point positionX="225" positionY="275" polygonFlags="NORMAL"/> + <point positionX="225" positionY="350" polygonFlags="NORMAL"/> + <point positionX="124" positionY="350" polygonFlags="NORMAL"/> + <point positionX="124" positionY="275" polygonFlags="NORMAL"/> + <point positionX="75" positionY="350" polygonFlags="NORMAL"/> + <point positionX="0" positionY="274" polygonFlags="NORMAL"/> + <point positionX="175" positionY="0" polygonFlags="NORMAL"/> + </pointSequence> + </LineStart> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="17777" positionY="2430"/> + <point positionX="17772" positionY="5418"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="5" positionY="0"/> + <point positionX="0" positionY="2988"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="5.000000" column2="0.000000" column3="17772.000000"/> + <Line2 column1="0.000000" column2="2988.000000" column3="2430.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="6549" positionY="2438" sizeX="6" sizeY="2990" type="com.sun.star.drawing.LineShape" name="Straight Connector 16" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart> + <pointSequence> + <point positionX="225" positionY="0" polygonFlags="NORMAL"/> + <point positionX="450" positionY="443" polygonFlags="NORMAL"/> + <point positionX="443" positionY="450" polygonFlags="NORMAL"/> + <point positionX="229" positionY="24" polygonFlags="NORMAL"/> + <point positionX="229" positionY="450" polygonFlags="NORMAL"/> + <point positionX="220" positionY="450" polygonFlags="NORMAL"/> + <point positionX="220" positionY="24" polygonFlags="NORMAL"/> + <point positionX="6" positionY="450" polygonFlags="NORMAL"/> + <point positionX="0" positionY="443" polygonFlags="NORMAL"/> + <point positionX="225" positionY="0" polygonFlags="NORMAL"/> + </pointSequence> + </LineStart> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="6555" positionY="2438"/> + <point positionX="6549" positionY="5428"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="6" positionY="0"/> + <point positionX="0" positionY="2990"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="6.000000" column2="0.000000" column3="6549.000000"/> + <Line2 column1="0.000000" column2="2990.000000" column3="2438.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="7193" positionY="2435" sizeX="5" sizeY="2990" type="com.sun.star.drawing.LineShape" name="Straight Connector 17" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart> + <pointSequence> + <point positionX="300" positionY="0" polygonFlags="NORMAL"/> + <point positionX="600" positionY="344" polygonFlags="NORMAL"/> + <point positionX="591" positionY="350" polygonFlags="NORMAL"/> + <point positionX="306" positionY="19" polygonFlags="NORMAL"/> + <point positionX="306" positionY="350" polygonFlags="NORMAL"/> + <point positionX="294" positionY="350" polygonFlags="NORMAL"/> + <point positionX="294" positionY="19" polygonFlags="NORMAL"/> + <point positionX="9" positionY="350" polygonFlags="NORMAL"/> + <point positionX="0" positionY="344" polygonFlags="NORMAL"/> + <point positionX="300" positionY="0" polygonFlags="NORMAL"/> + </pointSequence> + </LineStart> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="7198" positionY="2435"/> + <point positionX="7193" positionY="5425"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="5" positionY="0"/> + <point positionX="0" positionY="2990"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="5.000000" column2="0.000000" column3="7193.000000"/> + <Line2 column1="0.000000" column2="2990.000000" column3="2435.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="7816" positionY="2435" sizeX="5" sizeY="2990" type="com.sun.star.drawing.LineShape" name="Straight Connector 18" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart> + <pointSequence> + <point positionX="300" positionY="0" polygonFlags="NORMAL"/> + <point positionX="600" positionY="591" polygonFlags="NORMAL"/> + <point positionX="591" positionY="600" polygonFlags="NORMAL"/> + <point positionX="306" positionY="33" polygonFlags="NORMAL"/> + <point positionX="306" positionY="600" polygonFlags="NORMAL"/> + <point positionX="294" positionY="600" polygonFlags="NORMAL"/> + <point positionX="294" positionY="33" polygonFlags="NORMAL"/> + <point positionX="9" positionY="600" polygonFlags="NORMAL"/> + <point positionX="0" positionY="591" polygonFlags="NORMAL"/> + <point positionX="300" positionY="0" polygonFlags="NORMAL"/> + </pointSequence> + </LineStart> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="7821" positionY="2435"/> + <point positionX="7816" positionY="5425"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="5" positionY="0"/> + <point positionX="0" positionY="2990"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="5.000000" column2="0.000000" column3="7816.000000"/> + <Line2 column1="0.000000" column2="2990.000000" column3="2435.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> +</XShapes> diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index fde285c39ef7..f8e67dabf214 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -281,6 +281,7 @@ void SdImportTest::testDocumentLayout() { "tdf90403.pptx", "xml/tdf90403_", PPTX, -1 }, { "tdf90338.odp", "xml/tdf90338_", ODP, PPTX }, { "tdf92001.odp", "xml/tdf92001_", ODP, PPTX }, + { "tdf100491.pptx", "xml/tdf100491_", PPTX, -1 }, // { "pptx/n828390.pptx", "pptx/xml/n828390_", PPTX, PPTX }, // Example }; |