diff options
author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-05-21 12:50:31 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2019-06-12 11:13:22 +0200 |
commit | f670f41a313fb99b1a91b3dca5065d01e0504a93 (patch) | |
tree | 20211880bb9c6e71b74a7e6956cf8cab97604b8a /chart2 | |
parent | a7c6dd2ab3f9232fc32a93ccd9a81bc6734709f7 (diff) |
tdf#122765: Legend interferes with pie chart after pptx import
Revert the commit caused this regression:
0fc41c53dfbd21e526fb0ad68a6651693c4a2ecd
The original issue does not come back with
reverting this commit.
Reviewed-on: https://gerrit.libreoffice.org/72679
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 10609749126ca76eaf12904d4cce9cc5a16d8405)
Change-Id: I666c4f92e3b70b416ec6da7a704298d207451649
Reviewed-on: https://gerrit.libreoffice.org/72767
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'chart2')
-rw-r--r-- | chart2/qa/extras/chart2import.cxx | 23 | ||||
-rw-r--r-- | chart2/qa/extras/data/pptx/tdf122765.pptx | bin | 0 -> 47625 bytes |
2 files changed, 23 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index 428f3f801a53..1de330ec62dc 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -110,6 +110,7 @@ public: void testTdf115107(); // import complex data point labels void testTdf115107_2(); // import complex data point labels in cobo charts with multiple data series void testTdf121205(); + void testTdf122765(); CPPUNIT_TEST_SUITE(Chart2ImportTest); CPPUNIT_TEST(Fdo60083); @@ -174,6 +175,7 @@ public: CPPUNIT_TEST(testTdf115107); CPPUNIT_TEST(testTdf115107_2); CPPUNIT_TEST(testTdf121205); + CPPUNIT_TEST(testTdf122765); CPPUNIT_TEST_SUITE_END(); @@ -1583,6 +1585,27 @@ void Chart2ImportTest::testTdf121205() } +void Chart2ImportTest::testTdf122765() +{ + // The horizontal position of the slices was wrong. + load("/chart2/qa/extras/data/pptx/", "tdf122765.pptx"); + Reference<chart::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_QUERY); + Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW); + Reference<drawing::XDrawPage> xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_SET_THROW); + Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), UNO_QUERY_THROW); + Reference<drawing::XShape> xSeriesSlices(getShapeByName(xShapes, "CID/D=0:CS=0:CT=0:Series=0"), + UNO_SET_THROW); + + Reference<container::XIndexAccess> xIndexAccess(xSeriesSlices, UNO_QUERY_THROW); + CPPUNIT_ASSERT_EQUAL(sal_Int32(9), xIndexAccess->getCount()); + Reference<drawing::XShape> xSlice(xIndexAccess->getByIndex(0), UNO_QUERY_THROW); + + // Check position of the first slice, all slices move together, so enough to check only one. + // Wrong poisition was around 5856. + awt::Point aSlicePosition = xSlice->getPosition(); + CPPUNIT_ASSERT_GREATER(sal_Int32(7000), aSlicePosition.X); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ImportTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/chart2/qa/extras/data/pptx/tdf122765.pptx b/chart2/qa/extras/data/pptx/tdf122765.pptx Binary files differnew file mode 100644 index 000000000000..948190c30b55 --- /dev/null +++ b/chart2/qa/extras/data/pptx/tdf122765.pptx |