From bcda268cde1f8408c2066ce985acedfce3e3bc2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=BCnde=20T=C3=B3th?= Date: Mon, 3 Aug 2020 09:12:14 +0200 Subject: [PATCH] tdf#134977 Chart OOXML: fix import of custom data label MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the data series properties for the default properties of the custom data labels. Change-Id: I651fa030276dfdec13b5801c0188bfd07c498b49 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99987 Tested-by: Jenkins Tested-by: László Németh Reviewed-by: László Németh --- chart2/qa/extras/chart2export.cxx | 26 +++++++++++++++++- chart2/qa/extras/chart2import.cxx | 2 +- .../extras/data/xlsx/custom_data_label.xlsx | Bin 0 -> 13944 bytes .../drawingml/chart/seriesconverter.cxx | 1 + 4 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 chart2/qa/extras/data/xlsx/custom_data_label.xlsx diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 628bdb98b213..f9b2651a922c 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -173,6 +173,7 @@ public: void testTdf133191(); void testTdf132594(); void testTdf134255(); + void testTdf134977(); CPPUNIT_TEST_SUITE(Chart2ExportTest); CPPUNIT_TEST(testErrorBarXLSX); @@ -309,6 +310,7 @@ public: CPPUNIT_TEST(testTdf133191); CPPUNIT_TEST(testTdf132594); CPPUNIT_TEST(testTdf134255); + CPPUNIT_TEST(testTdf134977); CPPUNIT_TEST_SUITE_END(); @@ -2238,7 +2240,7 @@ void Chart2ExportTest::testCustomDataLabel() CPPUNIT_ASSERT_EQUAL(OUString("line"), aFields[5]->getString()); aFields[5]->getPropertyValue("CharHeight") >>= nFontSize; aFields[5]->getPropertyValue("CharColor") >>= nFontColor; - CPPUNIT_ASSERT_EQUAL(static_cast(13), nFontSize); + CPPUNIT_ASSERT_EQUAL(static_cast(11.97), nFontSize); CPPUNIT_ASSERT_EQUAL(static_cast(0xbf9000), nFontColor); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_NEWLINE, aFields[6]->getFieldType()); @@ -2837,6 +2839,28 @@ void Chart2ExportTest::testTdf134255() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:txPr/a:bodyPr", "wrap", "square"); } +void Chart2ExportTest::testTdf134977() +{ + load("/chart2/qa/extras/data/xlsx/", "custom_data_label.xlsx"); + + //import test + uno::Reference xChartDoc = getChartDocFromSheet(0, mxComponent); + CPPUNIT_ASSERT(xChartDoc.is()); + Reference< chart2::XDataSeries > xDataSeries = getDataSeriesFromDoc(xChartDoc, 0); + CPPUNIT_ASSERT(xDataSeries.is()); + uno::Reference xPropertySet(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW); + uno::Sequence> aFields; + float nFontSize; + xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields; + aFields[0]->getPropertyValue("CharHeight") >>= nFontSize; + CPPUNIT_ASSERT_EQUAL(static_cast(9), nFontSize); + + //export test + xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl/c:tx/c:rich/a:p/a:r/a:rPr", "sz", "900"); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index 6c982238a5b3..d502d163fc64 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -1862,7 +1862,7 @@ void Chart2ImportTest::testTdf115107() CPPUNIT_ASSERT_EQUAL(OUString("line"), aFields[5]->getString()); aFields[5]->getPropertyValue("CharHeight") >>= nFontSize; aFields[5]->getPropertyValue("CharColor") >>= nFontColor; - CPPUNIT_ASSERT_EQUAL(static_cast(13), nFontSize); + CPPUNIT_ASSERT_EQUAL(static_cast(11.97), nFontSize); CPPUNIT_ASSERT_EQUAL(static_cast(0xbf9000), nFontColor); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_NEWLINE, aFields[6]->getFieldType()); diff --git a/chart2/qa/extras/data/xlsx/custom_data_label.xlsx b/chart2/qa/extras/data/xlsx/custom_data_label.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..cc69aaf0dc66eb1151b8357fbdd4285b28ecea97 GIT binary patch literal 13944 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 b|5tRB5eEl2`yWIN87Kl!WSe6A& rxDat // Store properties oox::PropertySet aPropertySet( xCustomLabel ); + convertTextProperty( aPropertySet, getFormatter(), mrModel.mxText->mxTextBody ); pRun->getTextCharacterProperties().pushToPropSet( aPropertySet, getFilter() ); TextField* pField = nullptr;