diff options
| author | Regina Henschel <rb.henschel@t-online.de> | 2021-05-24 23:25:58 +0200 |
|---|---|---|
| committer | Regina Henschel <rb.henschel@t-online.de> | 2021-05-25 11:22:41 +0200 |
| commit | a312837a1a4d0b9628d5c587c8ab5ec68179a051 (patch) | |
| tree | 0dc36690a4e2bd797b98daf66cbe0fe0df05edea /oox/qa | |
| parent | 76ae0359f35baeb4f8adf1d121c0f974c9024997 (diff) | |
tdf#137314 apply conversion from vml angle unit 'fd'
Fixes wrong rotation in tdf#109129 and tdf#142432 too, but they have
further, unrelated errors.
Change-Id: I7bd56876bb42b261fe425f80cf9beb639c3ac276
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116078
Tested-by: Jenkins
Reviewed-by: Regina Henschel <rb.henschel@t-online.de>
Diffstat (limited to 'oox/qa')
| -rw-r--r-- | oox/qa/unit/data/tdf137314_vml_rotation_unit_fd.docx | bin | 0 -> 18070 bytes | |||
| -rw-r--r-- | oox/qa/unit/vml.cxx | 23 |
2 files changed, 23 insertions, 0 deletions
diff --git a/oox/qa/unit/data/tdf137314_vml_rotation_unit_fd.docx b/oox/qa/unit/data/tdf137314_vml_rotation_unit_fd.docx Binary files differnew file mode 100644 index 000000000000..17c8cabc0ce9 --- /dev/null +++ b/oox/qa/unit/data/tdf137314_vml_rotation_unit_fd.docx diff --git a/oox/qa/unit/vml.cxx b/oox/qa/unit/vml.cxx index 0306333adcb0..4045b0336c7f 100644 --- a/oox/qa/unit/vml.cxx +++ b/oox/qa/unit/vml.cxx @@ -16,6 +16,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/LineStyle.hpp> +#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -58,6 +59,28 @@ void OoxVmlTest::load(std::u16string_view rFileName) mxComponent = loadFromDesktop(aURL); } +CPPUNIT_TEST_FIXTURE(OoxVmlTest, tdf137314_vml_rotation_unit_fd) +{ + // Load a document with a 30deg rotated arc on a drawing canvas. Rotation is given + // as 1966080fd. Error was, that the vml angle unit "fd" was not converted to Degree100. + load(u"tdf137314_vml_rotation_unit_fd.docx"); + uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(getComponent(), uno::UNO_QUERY); + uno::Reference<drawing::XDrawPage> xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0), + uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xGroup(xDrawPage->getByIndex(0), uno::UNO_QUERY); + uno::Reference<drawing::XShape> xShape(xGroup->getByIndex(1), uno::UNO_QUERY); + uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY); + drawing::PolyPolygonBezierCoords aPolyPolygonBezierCoords; + xShapeProps->getPropertyValue("PolyPolygonBezier") >>= aPolyPolygonBezierCoords; + drawing::PointSequence aPolygon = aPolyPolygonBezierCoords.Coordinates[1]; + // Without fix in place, the vector was -1441|1490. + // [1] and [2] are Bezier-curve control points. + sal_Int32 nDiffX = aPolygon[3].X - aPolygon[0].X; + CPPUNIT_ASSERT_EQUAL(sal_Int32(1490), nDiffX); + sal_Int32 nDiffY = aPolygon[3].Y - aPolygon[0].Y; + CPPUNIT_ASSERT_EQUAL(sal_Int32(1441), nDiffY); +} + CPPUNIT_TEST_FIXTURE(OoxVmlTest, testSpt202ShapeType) { // Load a document with a groupshape, 2nd child is a <v:shape>, its type has o:spt set to 202 |