diff options
| -rw-r--r-- | oox/source/export/shapes.cxx | 3 | ||||
| -rw-r--r-- | sd/qa/unit/data/tdf92001.odp | bin | 0 -> 11063 bytes | |||
| -rw-r--r-- | sd/qa/unit/data/xml/tdf92001_0.xml | 44 | ||||
| -rw-r--r-- | sd/qa/unit/import-tests.cxx | 1 |
4 files changed, 47 insertions, 1 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 0f2b9ed3e945..5645cca330e6 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -36,6 +36,7 @@ #include <com/sun/star/awt/FontWeight.hpp> #include <com/sun/star/awt/FontUnderline.hpp> #include <com/sun/star/awt/Gradient.hpp> +#include <com/sun/star/beans/PropertyValues.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/beans/XPropertyState.hpp> @@ -423,7 +424,7 @@ ShapeExport& ShapeExport::WriteCustomShape( Reference< XShape > xShape ) nAdjustmentValuesIndex = i; else if ( rProp.Name == "Handles" ) { - uno::Sequence<beans::PropertyValue> aHandles; + uno::Sequence<beans::PropertyValues> aHandles; rProp.Value >>= aHandles; if ( aHandles.getLength() ) bHasHandles = true; diff --git a/sd/qa/unit/data/tdf92001.odp b/sd/qa/unit/data/tdf92001.odp Binary files differnew file mode 100644 index 000000000000..886826f0b741 --- /dev/null +++ b/sd/qa/unit/data/tdf92001.odp diff --git a/sd/qa/unit/data/xml/tdf92001_0.xml b/sd/qa/unit/data/xml/tdf92001_0.xml new file mode 100644 index 000000000000..d6304e0c8d37 --- /dev/null +++ b/sd/qa/unit/data/xml/tdf92001_0.xml @@ -0,0 +1,44 @@ +<?xml version="1.0"?> +<XShapes> + <XShape positionX="4826" positionY="4826" sizeX="19557" sizeY="12953" type="com.sun.star.drawing.CustomShape" name="CustomShape 1" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" 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" fillStyle="SOLID" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="3465a4" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap width="32" height="32"/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="19558.000000" column2="0.000000" column3="4826.000000"/> + <Line2 column1="0.000000" column2="12954.000000" column3="4826.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + <CustomShapeGeometry> + <PropertyValue name="AdjustmentValues"> + <AdjustmentValues/> + </PropertyValue> + <PropertyValue name="Equations"> + <Equations/> + </PropertyValue> + <PropertyValue name="Handles"> + <Handles/> + </PropertyValue> + <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="Path"> + <Path> + <PropertyValue name="Coordinates"> + <Coordinates/> + </PropertyValue> + <PropertyValue name="Segments"> + <Segments/> + </PropertyValue> + </Path> + </PropertyValue> + <PropertyValue name="Type" value="ooxml-non-primitive" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="ViewBox"> + <ViewBox x="0" y="0" width="7040880" height="4663440"/> + </PropertyValue> + </CustomShapeGeometry> + </XShape> +</XShapes> diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 111f1d87183d..2174654085c9 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -193,6 +193,7 @@ void SdImportTest::testDocumentLayout() { "n902652.pptx", "xml/n902652_", PPTX, -1 }, { "tdf90403.pptx", "xml/tdf90403_", PPTX, -1 }, { "tdf90338.odp", "xml/tdf90338_", ODP, PPTX }, + { "tdf92001.odp", "xml/tdf92001_", ODP, PPTX }, // { "pptx/n828390.pptx", "pptx/xml/n828390_", PPTX, PPTX }, // Example }; |