From 4cfe46997eab3498cc519ef94c85ad2d644d3886 Mon Sep 17 00:00:00 2001 From: Regina Henschel Date: Thu, 28 Apr 2022 23:35:44 +0200 Subject: [PATCH] tdf#148714 connect first and second arc with arcTo The curved*Arrows start with two arcs, which should be connected by a line. The used commands are double V and double B respectively. Both have an implicit moveTo, so that there should be no line between. Other applications show the shapes correctly without line. But because of bug 148714 LO shows a connecting line so that the error was not earlier detected. The patch changes the segment definition so that for the second command the variant with implicit lineTo is used. This does not change rendering in LO but makes other applications rendering the shapes like LO. Change-Id: I4f799f89497e52b1a7e00d8e5345a66ce21c00a1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133586 Tested-by: Jenkins Reviewed-by: Regina Henschel --- svx/qa/unit/customshapes.cxx | 73 ++++++++++++++++++ svx/qa/unit/data/tdf148714_CurvedArrows.ppt | Bin 0 -> 99840 bytes .../EnhancedCustomShapeGeometry.cxx | 12 ++- 3 files changed, 81 insertions(+), 4 deletions(-) create mode 100644 svx/qa/unit/data/tdf148714_CurvedArrows.ppt diff --git a/svx/qa/unit/customshapes.cxx b/svx/qa/unit/customshapes.cxx index fc671384e0c8..62e7728f7556 100644 --- a/svx/qa/unit/customshapes.cxx +++ b/svx/qa/unit/customshapes.cxx @@ -39,6 +39,8 @@ #include #include +#include +#include #include #include #include @@ -1304,6 +1306,77 @@ CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf148501_OctagonBevel) nColorDistance = aExpectedColor.GetColorError(aActualColor); CPPUNIT_ASSERT_LESS(sal_uInt16(6), nColorDistance); } + +bool lcl_getShapeSegments(uno::Sequence& rSegments, + const uno::Reference& xShape) +{ + uno::Reference xShapeProps(xShape, uno::UNO_QUERY_THROW); + uno::Any anotherAny = xShapeProps->getPropertyValue("CustomShapeGeometry"); + uno::Sequence aCustomShapeGeometry; + if (!(anotherAny >>= aCustomShapeGeometry)) + return false; + uno::Sequence aPathProps; + for (beans::PropertyValue const& rProp : std::as_const(aCustomShapeGeometry)) + { + if (rProp.Name == "Path") + { + rProp.Value >>= aPathProps; + break; + } + } + + for (beans::PropertyValue const& rProp : std::as_const(aPathProps)) + { + if (rProp.Name == "Segments") + { + rProp.Value >>= rSegments; + break; + } + } + if (rSegments.getLength() > 2) + return true; + else + return false; +} + +CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf148714_CurvedArrows) +{ + // Error was, that the line between 1. and 2. arc was missing. + OUString sURL = m_directories.getURLFromSrc(sDataDirectory) + "tdf148714_CurvedArrows.ppt"; + mxComponent = loadFromDesktop(sURL, "com.sun.star.presentation.PresentationDocument"); + + for (sal_Int32 nShapeIndex = 0; nShapeIndex < 4; nShapeIndex++) + { + uno::Reference xShape(getShape(nShapeIndex)); + uno::Sequence aSegments; + CPPUNIT_ASSERT(lcl_getShapeSegments(aSegments, xShape)); + + if (nShapeIndex == 0 || nShapeIndex == 3) + { + // curvedDownArrow or curvedLeftArrow. Segments should start with VW. Without fix it was + // V with count 2, which means VV. + CPPUNIT_ASSERT_EQUAL( + sal_Int16(drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARC), + aSegments[0].Command); + CPPUNIT_ASSERT_EQUAL(sal_Int16(1), aSegments[0].Count); + CPPUNIT_ASSERT_EQUAL( + sal_Int16(drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO), + aSegments[1].Command); + CPPUNIT_ASSERT_EQUAL(sal_Int16(1), aSegments[1].Count); + } + else + { + // curvedUpArrow or curvedRightArrow. Segments should start with BA. Without fix is was + // B with count 2, which means BB. + CPPUNIT_ASSERT_EQUAL(sal_Int16(drawing::EnhancedCustomShapeSegmentCommand::ARC), + aSegments[0].Command); + CPPUNIT_ASSERT_EQUAL(sal_Int16(1), aSegments[0].Count); + CPPUNIT_ASSERT_EQUAL(sal_Int16(drawing::EnhancedCustomShapeSegmentCommand::ARCTO), + aSegments[1].Command); + CPPUNIT_ASSERT_EQUAL(sal_Int16(1), aSegments[1].Count); + } + } +} } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/qa/unit/data/tdf148714_CurvedArrows.ppt b/svx/qa/unit/data/tdf148714_CurvedArrows.ppt new file mode 100644 index 0000000000000000000000000000000000000000..23e4ed0ad3ebf4a53c5dd2aa161910feeac9d822 GIT binary patch literal 99840 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 literal 0 HcmV?d00001 diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx index 7539bfd8015e..0f999ed42209 100644 --- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx @@ -1199,7 +1199,8 @@ const SvxMSDffVertPair mso_sptCurvedRightVert[] = }; const sal_uInt16 mso_sptCurvedRightSegm[] = { - 0xa408, + 0xa404, + 0xa304, 0x0003, 0xa508, 0x6000, @@ -1309,7 +1310,8 @@ const SvxMSDffVertPair mso_sptCurvedDownVert[] = }; const sal_uInt16 mso_sptCurvedDownSegm[] = { - 0xa608, + 0xa604, + 0xa504, 0x0003, 0xa308, 0x6000, @@ -1364,7 +1366,8 @@ const SvxMSDffVertPair mso_sptCurvedUpVert[] = }; const sal_uInt16 mso_sptCurvedUpSegm[] = { - 0xa408, + 0xa404, + 0xa304, 0x0003, 0xa508, 0x6000, @@ -1470,7 +1473,8 @@ const SvxMSDffVertPair mso_sptCurvedLeftVert[] = }; const sal_uInt16 mso_sptCurvedLeftSegm[] = { - 0xa608, + 0xa604, + 0xa504, 0x0003, 0xa308, 0x6000,