diff options
-rw-r--r-- | include/svx/svdoashp.hxx | 1 | ||||
-rw-r--r-- | oox/source/drawingml/customshapeproperties.cxx | 1 | ||||
-rw-r--r-- | oox/source/drawingml/shape.cxx | 15 | ||||
-rw-r--r-- | oox/source/export/drawingml.cxx | 6 | ||||
-rw-r--r-- | oox/source/token/properties.txt | 1 | ||||
-rw-r--r-- | sd/qa/unit/data/tdf109317.pptx | bin | 0 -> 39405 bytes | |||
-rw-r--r-- | sd/qa/unit/data/xml/fdo47434_0.xml | 4 | ||||
-rw-r--r-- | sd/qa/unit/data/xml/n593612_0.xml | 1 | ||||
-rw-r--r-- | sd/qa/unit/data/xml/n762695_0.xml | 8 | ||||
-rw-r--r-- | sd/qa/unit/data/xml/n762695_1.xml | 3 | ||||
-rw-r--r-- | sd/qa/unit/data/xml/n819614_0.xml | 56 | ||||
-rw-r--r-- | sd/qa/unit/data/xml/n820786_0.xml | 51 | ||||
-rw-r--r-- | sd/qa/unit/data/xml/n902652_0.xml | 3 | ||||
-rw-r--r-- | sd/qa/unit/data/xml/tdf109317_0.xml | 492 | ||||
-rw-r--r-- | sd/qa/unit/import-tests.cxx | 1 | ||||
-rw-r--r-- | svx/source/customshapes/EnhancedCustomShape2d.cxx | 5 | ||||
-rw-r--r-- | svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 9 | ||||
-rw-r--r-- | svx/source/svdraw/svdoashp.cxx | 12 |
18 files changed, 517 insertions, 152 deletions
diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index dd4d03789c51..ea222ed578de 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -140,7 +140,6 @@ public: bool IsMirroredX() const; bool IsMirroredY() const; - bool IsPostRotate() const; void SetMirroredX( const bool bMirroredX ); void SetMirroredY( const bool bMirroredY ); diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index 57aedfcd022a..303d24ee4ac9 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -149,7 +149,6 @@ void CustomShapeProperties::pushToPropSet( aPropertyMap.setProperty( PROP_MirroredX, mbMirroredX ); aPropertyMap.setProperty( PROP_MirroredY, mbMirroredY ); aPropertyMap.setProperty( PROP_TextPreRotateAngle, mnTextRotateAngle ); - aPropertyMap.setProperty( PROP_IsPostRotateAngle, true); // For OpenXML Imports Sequence< PropertyValue > aSeq = aPropertyMap.makePropertyValueSequence(); aPropSet.setProperty( PROP_CustomShapeGeometry, aSeq ); diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 021178a9a8e4..77730ecd2aff 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -498,8 +498,21 @@ Reference< XShape > const & Shape::createAndInsert( if( bUseRotationTransform && mnRotation != 0 ) { + // OOXML flips shapes before rotating them. + sal_Int32 nRotation = mnRotation; + if(bIsCustomShape) + { + if(mbFlipH) + { + nRotation = nRotation * -1 + 60000*360; + } + if(mbFlipV) + { + nRotation = nRotation * -1 + 60000*360; + } + } // rotate around object's center - aTransformation.rotate( F_PI180 * ( (double)mnRotation / 60000.0 ) ); + aTransformation.rotate( F_PI180 * ( (double)nRotation / 60000.0 ) ); } // move object back from center diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index f04c0f3273d8..0110f4c24875 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -1157,6 +1157,12 @@ void DrawingML::WriteStretch( const css::uno::Reference< css::beans::XPropertySe void DrawingML::WriteTransformation( const tools::Rectangle& rRect, sal_Int32 nXmlNamespace, bool bFlipH, bool bFlipV, sal_Int32 nRotation ) { + //OOXML flips shapes before rotating them. + if(bFlipH) + nRotation = nRotation * -1 + 60000*360; + if(bFlipV) + nRotation = nRotation * -1 + 60000*360; + mpFS->startElementNS( nXmlNamespace, XML_xfrm, XML_flipH, bFlipH ? "1" : nullptr, XML_flipV, bFlipV ? "1" : nullptr, diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt index 52909147b9e1..b32924c2be9b 100644 --- a/oox/source/token/properties.txt +++ b/oox/source/token/properties.txt @@ -262,7 +262,6 @@ IsLoaded IsNumbering IsOutlineSymbolsSet IsPlaceholderDependent -IsPostRotateAngle IsSharedFormula IsStartOfNewPage IsTextWrapped diff --git a/sd/qa/unit/data/tdf109317.pptx b/sd/qa/unit/data/tdf109317.pptx Binary files differnew file mode 100644 index 000000000000..427108069b0e --- /dev/null +++ b/sd/qa/unit/data/tdf109317.pptx diff --git a/sd/qa/unit/data/xml/fdo47434_0.xml b/sd/qa/unit/data/xml/fdo47434_0.xml index a37b6cb91c12..776797057bdc 100644 --- a/sd/qa/unit/data/xml/fdo47434_0.xml +++ b/sd/qa/unit/data/xml/fdo47434_0.xml @@ -27,7 +27,6 @@ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> <CustomShapeGeometry> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="TextPreRotateAngle" value="0" handle="0" propertyState="DIRECT_VALUE"/> @@ -90,7 +89,6 @@ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> <CustomShapeGeometry> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="TextPreRotateAngle" value="0" handle="0" propertyState="DIRECT_VALUE"/> @@ -153,7 +151,6 @@ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> <CustomShapeGeometry> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="TextPreRotateAngle" value="0" handle="0" propertyState="DIRECT_VALUE"/> @@ -216,7 +213,6 @@ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> <CustomShapeGeometry> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="TextPreRotateAngle" value="0" handle="0" propertyState="DIRECT_VALUE"/> diff --git a/sd/qa/unit/data/xml/n593612_0.xml b/sd/qa/unit/data/xml/n593612_0.xml index 5d03e5887794..b595a2bb2a97 100644 --- a/sd/qa/unit/data/xml/n593612_0.xml +++ b/sd/qa/unit/data/xml/n593612_0.xml @@ -21,7 +21,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> diff --git a/sd/qa/unit/data/xml/n762695_0.xml b/sd/qa/unit/data/xml/n762695_0.xml index 2725854df0cc..0b216210097d 100644 --- a/sd/qa/unit/data/xml/n762695_0.xml +++ b/sd/qa/unit/data/xml/n762695_0.xml @@ -108,7 +108,6 @@ </PropertyValue> <PropertyValue name="Equations" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Handles" handle="0" propertyState="DIRECT_VALUE"/> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -163,7 +162,7 @@ </PropertyValue> </CustomShapeGeometry> </XShape> - <XShape positionX="18620" positionY="6171" sizeX="1418" sizeY="1450" type="com.sun.star.drawing.CustomShape" name="Left Arrow 13" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="CENTER" 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="GRADIENT" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="17594" positionY="7175" sizeX="1418" sizeY="1450" type="com.sun.star.drawing.CustomShape" name="Left Arrow 13" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="CENTER" 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="GRADIENT" 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="b29dde" endColor="ffffff" angle="3150" border="0" xOffset="0" yOffset="0" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -172,8 +171,8 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="1003.384523" column2="-1026.011940" column3="18620.000000"/> - <Line2 column1="1003.384523" column2="1026.011940" column3="6171.000000"/> + <Line1 column1="1003.384523" column2="1026.011940" column3="17594.000000"/> + <Line2 column1="-1003.384523" column2="1026.011940" column3="7175.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> <CustomShapeGeometry> @@ -185,7 +184,6 @@ </PropertyValue> <PropertyValue name="Equations" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Handles" handle="0" propertyState="DIRECT_VALUE"/> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> diff --git a/sd/qa/unit/data/xml/n762695_1.xml b/sd/qa/unit/data/xml/n762695_1.xml index 91ab1172478b..7cf8d4d59b0b 100644 --- a/sd/qa/unit/data/xml/n762695_1.xml +++ b/sd/qa/unit/data/xml/n762695_1.xml @@ -195,7 +195,6 @@ </PropertyValue> <PropertyValue name="Equations" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Handles" handle="0" propertyState="DIRECT_VALUE"/> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -348,7 +347,6 @@ </PropertyValue> <PropertyValue name="Equations" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Handles" handle="0" propertyState="DIRECT_VALUE"/> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -501,7 +499,6 @@ </PropertyValue> <PropertyValue name="Equations" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Handles" handle="0" propertyState="DIRECT_VALUE"/> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> diff --git a/sd/qa/unit/data/xml/n819614_0.xml b/sd/qa/unit/data/xml/n819614_0.xml index aff9c324344c..368a2fafcd2b 100644 --- a/sd/qa/unit/data/xml/n819614_0.xml +++ b/sd/qa/unit/data/xml/n819614_0.xml @@ -3310,7 +3310,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -3374,7 +3373,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -3438,7 +3436,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -3502,7 +3499,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -3566,7 +3562,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -3630,7 +3625,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -3694,7 +3688,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -3758,7 +3751,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -3822,7 +3814,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -3886,7 +3877,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -3950,7 +3940,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -4014,7 +4003,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -4078,7 +4066,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -4142,7 +4129,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -4206,7 +4192,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -4270,7 +4255,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -4334,7 +4318,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -4398,7 +4381,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -4462,7 +4444,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -4526,7 +4507,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -4590,7 +4570,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -4654,7 +4633,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -4718,7 +4696,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -4782,7 +4759,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -4846,7 +4822,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -4910,7 +4885,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -4974,7 +4948,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -5038,7 +5011,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -5102,7 +5074,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -5166,7 +5137,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -5230,7 +5200,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -5294,7 +5263,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -5358,7 +5326,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -5422,7 +5389,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -5486,7 +5452,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -5550,7 +5515,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -5614,7 +5578,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -5678,7 +5641,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -5742,7 +5704,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -5806,7 +5767,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -5870,7 +5830,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -5934,7 +5893,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -5998,7 +5956,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -6062,7 +6019,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -6126,7 +6082,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -6190,7 +6145,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -6254,7 +6208,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -6318,7 +6271,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -6382,7 +6334,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -6446,7 +6397,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -6510,7 +6460,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -6574,7 +6523,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -6638,7 +6586,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -6702,7 +6649,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -6766,7 +6712,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -6830,7 +6775,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> diff --git a/sd/qa/unit/data/xml/n820786_0.xml b/sd/qa/unit/data/xml/n820786_0.xml index 7f8d44d55db1..53a8ee93610d 100644 --- a/sd/qa/unit/data/xml/n820786_0.xml +++ b/sd/qa/unit/data/xml/n820786_0.xml @@ -21,7 +21,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -87,7 +86,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -171,7 +169,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -262,7 +259,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -326,7 +322,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -390,7 +385,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -454,7 +448,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -518,7 +511,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -582,7 +574,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -646,7 +637,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -710,7 +700,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -774,7 +763,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -838,7 +826,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -902,7 +889,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -966,7 +952,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -1030,7 +1015,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -1094,7 +1078,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -1158,7 +1141,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -1222,7 +1204,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -1286,7 +1267,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -1350,7 +1330,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -1414,7 +1393,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -1478,7 +1456,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -1542,7 +1519,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -1606,7 +1582,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -1670,7 +1645,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -1734,7 +1708,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -1798,7 +1771,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -1862,7 +1834,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -1926,7 +1897,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -1990,7 +1960,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -2054,7 +2023,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -2118,7 +2086,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -2182,7 +2149,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -2246,7 +2212,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -2310,7 +2275,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -2374,7 +2338,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -2438,7 +2401,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -2502,7 +2464,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -2566,7 +2527,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -2630,7 +2590,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -2694,7 +2653,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -2758,7 +2716,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -2822,7 +2779,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -2886,7 +2842,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -2950,7 +2905,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -3014,7 +2968,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -3078,7 +3031,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -3142,7 +3094,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -3206,7 +3157,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -3270,7 +3220,6 @@ <PropertyValue name="Handles"> <Handles/> </PropertyValue> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> diff --git a/sd/qa/unit/data/xml/n902652_0.xml b/sd/qa/unit/data/xml/n902652_0.xml index de8ed91092ba..dacda959f063 100644 --- a/sd/qa/unit/data/xml/n902652_0.xml +++ b/sd/qa/unit/data/xml/n902652_0.xml @@ -21,7 +21,6 @@ </PropertyValue> <PropertyValue name="Equations" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Handles" handle="0" propertyState="DIRECT_VALUE"/> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -123,7 +122,6 @@ </PropertyValue> <PropertyValue name="Equations" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Handles" handle="0" propertyState="DIRECT_VALUE"/> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> @@ -225,7 +223,6 @@ </PropertyValue> <PropertyValue name="Equations" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Handles" handle="0" propertyState="DIRECT_VALUE"/> - <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> <PropertyValue name="Path"> diff --git a/sd/qa/unit/data/xml/tdf109317_0.xml b/sd/qa/unit/data/xml/tdf109317_0.xml new file mode 100644 index 000000000000..b3b22a42ad32 --- /dev/null +++ b/sd/qa/unit/data/xml/tdf109317_0.xml @@ -0,0 +1,492 @@ +<?xml version="1.0"?> +<XShapes> + <XShape positionX="3136" positionY="3068" sizeX="3639" sizeY="6340" type="com.sun.star.drawing.CustomShape" name="Freihandform: Form 1" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="CENTER" 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="0070c0" 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="2573.868684" column2="4483.764100" column3="3136.000000"/> + <Line2 column1="-2573.868684" column2="4483.764100" column3="3068.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + <CustomShapeGeometry> + <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="MirroredY" value="true" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="ViewBox"> + <ViewBox x="0" y="0" width="0" height="0"/> + </PropertyValue> + <PropertyValue name="Type" value="ooxml-non-primitive" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="Path"> + <Path> + <PropertyValue name="SubViewSize" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="TextFrames" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="Coordinates"> + <Coordinates> + <EnhancedCustomShapeParameterPair> + <First value="103371" type="0"/> + <Second value="22445" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="-97237" type="0"/> + <Second value="202837" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="45832" type="0"/> + <Second value="1706620" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="103371" type="0"/> + <Second value="2056518" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="160910" type="0"/> + <Second value="2406416" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="384845" type="0"/> + <Second value="2286673" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="448604" type="0"/> + <Second value="2121832" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="512363" type="0"/> + <Second value="1956991" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="342857" type="0"/> + <Second value="1258750" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="485926" type="0"/> + <Second value="1067473" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="628995" type="0"/> + <Second value="876196" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="1367669" type="0"/> + <Second value="1145228" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="1307020" type="0"/> + <Second value="974167" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="1246371" type="0"/> + <Second value="803106" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="303979" type="0"/> + <Second value="-157947" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="103371" type="0"/> + <Second value="22445" type="0"/> + </EnhancedCustomShapeParameterPair> + </Coordinates> + </PropertyValue> + <PropertyValue name="Segments"> + <Segments> + <EnhancedCustomShapeSegment command="1" count="1"/> + <EnhancedCustomShapeSegment command="3" count="5"/> + <EnhancedCustomShapeSegment command="4" count="0"/> + <EnhancedCustomShapeSegment command="5" count="0"/> + </Segments> + </PropertyValue> + </Path> + </PropertyValue> + <PropertyValue name="Equations" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="AdjustmentValues"> + <AdjustmentValues/> + </PropertyValue> + </CustomShapeGeometry> + </XShape> + <XShape positionX="12187" positionY="5984" sizeX="7764" sizeY="4016" type="com.sun.star.drawing.CustomShape" name="Freihandform: Form 2" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="CENTER" 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="0070c0" 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="5490.684156" column2="2840.447940" column3="12187.000000"/> + <Line2 column1="-5490.684156" column2="2840.447940" column3="5984.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + <CustomShapeGeometry> + <PropertyValue name="MirroredX" value="true" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="ViewBox"> + <ViewBox x="0" y="0" width="0" height="0"/> + </PropertyValue> + <PropertyValue name="Type" value="ooxml-non-primitive" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="Path"> + <Path> + <PropertyValue name="SubViewSize" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="TextFrames" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="Coordinates"> + <Coordinates> + <EnhancedCustomShapeParameterPair> + <First value="258783" type="0"/> + <Second value="126408" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="656889" type="0"/> + <Second value="61094" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="2317739" type="0"/> + <Second value="-111522" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="2675412" type="0"/> + <Second value="107747" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="3033086" type="0"/> + <Second value="327016" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="2485689" type="0"/> + <Second value="1373600" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="2404824" type="0"/> + <Second value="1442024" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="2323959" type="0"/> + <Second value="1510448" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="2543228" type="0"/> + <Second value="675359" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="2190220" type="0"/> + <Second value="518294" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="1837212" type="0"/> + <Second value="361229" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="610236" type="0"/> + <Second value="558727" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="286775" type="0"/> + <Second value="499633" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="-36686" type="0"/> + <Second value="440539" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="-139323" type="0"/> + <Second value="191722" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="258783" type="0"/> + <Second value="126408" type="0"/> + </EnhancedCustomShapeParameterPair> + </Coordinates> + </PropertyValue> + <PropertyValue name="Segments"> + <Segments> + <EnhancedCustomShapeSegment command="1" count="1"/> + <EnhancedCustomShapeSegment command="3" count="5"/> + <EnhancedCustomShapeSegment command="4" count="0"/> + <EnhancedCustomShapeSegment command="5" count="0"/> + </Segments> + </PropertyValue> + </Path> + </PropertyValue> + <PropertyValue name="Equations" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="AdjustmentValues"> + <AdjustmentValues/> + </PropertyValue> + </CustomShapeGeometry> + </XShape> + <XShape positionX="3136" positionY="13374" sizeX="3639" sizeY="5390" type="com.sun.star.drawing.CustomShape" name="Rechtwinkliges Dreieck 4" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="CENTER" 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="0070c0" 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="2573.868684" column2="3812.012657" column3="3136.000000"/> + <Line2 column1="-2573.868684" column2="3812.012657" column3="13374.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + <CustomShapeGeometry> + <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="MirroredY" value="true" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="ViewBox"> + <ViewBox x="0" y="0" width="0" height="0"/> + </PropertyValue> + <PropertyValue name="Type" value="ooxml-rtTriangle" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="Path"> + <Path> + <PropertyValue name="TextFrames" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="Coordinates"> + <Coordinates> + <EnhancedCustomShapeParameterPair> + <First value="0" type="0"/> + <Second value="4" type="1"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="0" type="0"/> + <Second value="0" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="6" type="1"/> + <Second value="4" type="1"/> + </EnhancedCustomShapeParameterPair> + </Coordinates> + </PropertyValue> + <PropertyValue name="Segments"> + <Segments> + <EnhancedCustomShapeSegment command="1" count="1"/> + <EnhancedCustomShapeSegment command="2" count="2"/> + <EnhancedCustomShapeSegment command="4" count="0"/> + <EnhancedCustomShapeSegment command="5" count="0"/> + </Segments> + </PropertyValue> + </Path> + </PropertyValue> + <PropertyValue name="Equations" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="AdjustmentValues"> + <AdjustmentValues/> + </PropertyValue> + </CustomShapeGeometry> + </XShape> + <XShape positionX="13136" positionY="11766" sizeX="3913" sizeY="5183" type="com.sun.star.drawing.CustomShape" name="Rechtwinkliges Dreieck 5" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="CENTER" 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="0070c0" 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="2767.615942" column2="3665.641554" column3="13136.000000"/> + <Line2 column1="-2767.615942" column2="3665.641554" column3="11766.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + <CustomShapeGeometry> + <PropertyValue name="MirroredX" value="true" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="MirroredY" value="false" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="ViewBox"> + <ViewBox x="0" y="0" width="0" height="0"/> + </PropertyValue> + <PropertyValue name="Type" value="ooxml-rtTriangle" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="Path"> + <Path> + <PropertyValue name="TextFrames" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="Coordinates"> + <Coordinates> + <EnhancedCustomShapeParameterPair> + <First value="0" type="0"/> + <Second value="4" type="1"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="0" type="0"/> + <Second value="0" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="6" type="1"/> + <Second value="4" type="1"/> + </EnhancedCustomShapeParameterPair> + </Coordinates> + </PropertyValue> + <PropertyValue name="Segments"> + <Segments> + <EnhancedCustomShapeSegment command="1" count="1"/> + <EnhancedCustomShapeSegment command="2" count="2"/> + <EnhancedCustomShapeSegment command="4" count="0"/> + <EnhancedCustomShapeSegment command="5" count="0"/> + </Segments> + </PropertyValue> + </Path> + </PropertyValue> + <PropertyValue name="Equations" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="AdjustmentValues"> + <AdjustmentValues/> + </PropertyValue> + </CustomShapeGeometry> + </XShape> + <XShape positionX="27418" positionY="11262" sizeX="3308" sizeY="4403" type="com.sun.star.drawing.CustomShape" name="Rechtwinkliges Dreieck 3" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="CENTER" 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="0070c0" 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="2339.816339" column2="-3114.098264" column3="27418.000000"/> + <Line2 column1="2339.816339" column2="3114.098264" column3="11262.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + <CustomShapeGeometry> + <PropertyValue name="MirroredX" value="true" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="MirroredY" value="true" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="ViewBox"> + <ViewBox x="0" y="0" width="0" height="0"/> + </PropertyValue> + <PropertyValue name="Type" value="ooxml-rtTriangle" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="Path"> + <Path> + <PropertyValue name="TextFrames" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="Coordinates"> + <Coordinates> + <EnhancedCustomShapeParameterPair> + <First value="0" type="0"/> + <Second value="4" type="1"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="0" type="0"/> + <Second value="0" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="6" type="1"/> + <Second value="4" type="1"/> + </EnhancedCustomShapeParameterPair> + </Coordinates> + </PropertyValue> + <PropertyValue name="Segments"> + <Segments> + <EnhancedCustomShapeSegment command="1" count="1"/> + <EnhancedCustomShapeSegment command="2" count="2"/> + <EnhancedCustomShapeSegment command="4" count="0"/> + <EnhancedCustomShapeSegment command="5" count="0"/> + </Segments> + </PropertyValue> + </Path> + </PropertyValue> + <PropertyValue name="Equations" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="AdjustmentValues"> + <AdjustmentValues/> + </PropertyValue> + </CustomShapeGeometry> + </XShape> + <XShape positionX="28728" positionY="762" sizeX="3186" sizeY="7824" type="com.sun.star.drawing.CustomShape" name="Freihandform: Form 6" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="CENTER" 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="0070c0" 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="2253.549312" column2="-5533.110563" column3="28728.000000"/> + <Line2 column1="2253.549312" column2="5533.110563" column3="762.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + <CustomShapeGeometry> + <PropertyValue name="MirroredX" value="true" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="MirroredY" value="true" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="ViewBox"> + <ViewBox x="0" y="0" width="0" height="0"/> + </PropertyValue> + <PropertyValue name="Type" value="ooxml-non-primitive" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="Path"> + <Path> + <PropertyValue name="SubViewSize" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="TextFrames" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="Coordinates"> + <Coordinates> + <EnhancedCustomShapeParameterPair> + <First value="1054550" type="0"/> + <Second value="60147" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="878381" type="0"/> + <Second value="-236264" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="75834" type="0"/> + <Second value="651571" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="5926" type="0"/> + <Second value="798378" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="-63982" type="0"/> + <Second value="945185" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="505071" type="0"/> + <Second value="651571" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="635100" type="0"/> + <Second value="940991" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="765129" type="0"/> + <Second value="1230411" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="714795" type="0"/> + <Second value="2262257" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="786102" type="0"/> + <Second value="2534899" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="857408" type="0"/> + <Second value="2807541" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="1015401" type="0"/> + <Second value="2983710" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="1062939" type="0"/> + <Second value="2576844" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="1110477" type="0"/> + <Second value="2169978" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="1230719" type="0"/> + <Second value="356558" type="0"/> + </EnhancedCustomShapeParameterPair> + <EnhancedCustomShapeParameterPair> + <First value="1054550" type="0"/> + <Second value="60147" type="0"/> + </EnhancedCustomShapeParameterPair> + </Coordinates> + </PropertyValue> + <PropertyValue name="Segments"> + <Segments> + <EnhancedCustomShapeSegment command="1" count="1"/> + <EnhancedCustomShapeSegment command="3" count="5"/> + <EnhancedCustomShapeSegment command="4" count="0"/> + <EnhancedCustomShapeSegment command="5" count="0"/> + </Segments> + </PropertyValue> + </Path> + </PropertyValue> + <PropertyValue name="Equations" handle="0" propertyState="DIRECT_VALUE"/> + <PropertyValue name="AdjustmentValues"> + <AdjustmentValues/> + </PropertyValue> + </CustomShapeGeometry> + </XShape> +</XShapes> diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 726df149b40e..7cf536eb3bb1 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -293,6 +293,7 @@ void SdImportTest::testDocumentLayout() { "tdf90338.odp", "xml/tdf90338_", ODP, PPTX }, { "tdf92001.odp", "xml/tdf92001_", ODP, PPTX }, { "tdf100491.pptx", "xml/tdf100491_", PPTX, -1 }, + { "tdf109317.pptx", "xml/tdf109317_", PPTX, ODP}, // { "pptx/n828390.pptx", "pptx/xml/n828390_", PPTX, PPTX }, // Example }; diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 90783f13089f..1180ffde845c 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -2386,11 +2386,6 @@ void EnhancedCustomShape2d::ApplyGluePoints( SdrObject* pObj ) } } -bool EnhancedCustomShape2d::IsPostRotate() const -{ - return dynamic_cast<const SdrObjCustomShape*>( pCustomShapeObj) != nullptr && static_cast<SdrObjCustomShape*>(pCustomShapeObj)->IsPostRotate(); -} - SdrObject* EnhancedCustomShape2d::CreateLineGeometry() { return CreateObject( true ); diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index a734d24c0c75..fc2f2dc7cb60 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -267,7 +267,6 @@ Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render() EnhancedCustomShape2d aCustomShape2d( pSdrObjCustomShape ); sal_Int32 nRotateAngle = aCustomShape2d.GetRotateAngle(); - bool bPostRotateAngle = aCustomShape2d.IsPostRotate(); bool bFlipV = aCustomShape2d.IsFlipVert(); bool bFlipH = aCustomShape2d.IsFlipHorz(); @@ -307,7 +306,7 @@ Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render() } pRenderedShape->Shear( pSdrObjCustomShape->GetSnapRect().Center(), nShearAngle, nTan, false); } - if( !bPostRotateAngle && nRotateAngle ) + if(nRotateAngle ) { double a = nRotateAngle * F_PI18000; pRenderedShape->NbcRotate( pSdrObjCustomShape->GetSnapRect().Center(), nRotateAngle, sin( a ), cos( a ) ); @@ -324,12 +323,6 @@ Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render() Point aBottom( aTop.X(), aTop.Y() + 1000 ); pRenderedShape->NbcMirror( aTop, aBottom ); } - // Specifically for pptx imports - if( bPostRotateAngle && nRotateAngle ) - { - double a = nRotateAngle * F_PI18000; - pRenderedShape->NbcRotate( pSdrObjCustomShape->GetSnapRect().Center(), nRotateAngle, sin( a ), cos( a ) ); - } pRenderedShape->NbcSetStyleSheet( pSdrObjCustomShape->GetStyleSheet(), true ); pRenderedShape->RecalcSnapRect(); } diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 2c2bd016378b..e4a945e80361 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -536,18 +536,6 @@ void SdrObjCustomShape::SetMirroredY( const bool bMirrorY ) SetMergedItem( aGeometryItem ); } - -bool SdrObjCustomShape::IsPostRotate() const -{ - const css::uno::Any* pAny; - bool bPostRotate = false; - const SdrCustomShapeGeometryItem& rGeometryItem = static_cast<const SdrCustomShapeGeometryItem&>(GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )); - pAny = rGeometryItem.GetPropertyValueByName( "IsPostRotateAngle" ); - if ( pAny ) - *pAny >>= bPostRotate; - return bPostRotate; -} - double SdrObjCustomShape::GetExtraTextRotation( const bool bPreRotation ) const { const css::uno::Any* pAny; |