diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2019-12-10 12:53:08 +0100 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2020-01-20 09:09:55 +0100 |
| commit | d979eb16b9144c7ed230d7b0a4d0c1474664d7d0 (patch) | |
| tree | 4fe73a6d0399417394a2371c605bcdca3188abe5 /sw | |
| parent | 2530ef4a8c381f38decc605bc9f0fbe3766826ee (diff) | |
tdf#129173 tdf#129175 Fix number format of data labels
Show the real value (cell value) of datapoints instead
of the recalculated value in case of Percent Stacked Area
chart.
Also fix: tdf#95425
Do not reset number format of data labels when open dialog
of 'Format data series' and close dialog.
Note: Inherits the data series/point label format from the
cell format and not the axis format, if we set the 'link to source data'
option to true.
Change-Id: I04e9968034a67c6bc6b92941df61d945b4292d79
Reviewed-on: https://gerrit.libreoffice.org/84819
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit e57d90cd4e51a1353eafc87bb29cfe6076704a7c)
Reviewed-on: https://gerrit.libreoffice.org/85198
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
(cherry picked from commit 9c1063ba13028244346528e307d5563d6faf949d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85276
Reviewed-by: Balazs Varga <balazs.varga991@gmail.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/layout/data/testAreaChartNumberFormat.docx | bin | 0 -> 26115 bytes | |||
| -rw-r--r-- | sw/qa/extras/layout/layout.cxx | 16 |
2 files changed, 16 insertions, 0 deletions
diff --git a/sw/qa/extras/layout/data/testAreaChartNumberFormat.docx b/sw/qa/extras/layout/data/testAreaChartNumberFormat.docx Binary files differnew file mode 100644 index 000000000000..33e1c58788a5 --- /dev/null +++ b/sw/qa/extras/layout/data/testAreaChartNumberFormat.docx diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index 80b0ecdac7f9..eaa790cb9878 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -2515,6 +2515,22 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf124796) "15"); } +CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf129173) +{ + SwDoc* pDoc = createDoc("testAreaChartNumberFormat.docx"); + SwDocShell* pShell = pDoc->GetDocShell(); + + // Dump the rendering of the first page as an XML file. + std::shared_ptr<GDIMetaFile> xMetaFile = pShell->GetPreviewMetaFile(); + MetafileXmlDump dumper; + xmlDocPtr pXmlDoc = dumpAndParse(dumper, *xMetaFile); + CPPUNIT_ASSERT(pXmlDoc); + + // Check the first data label of area chart. + assertXPathContent( + pXmlDoc, "/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[22]/text", "56"); +} + CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf116925) { SwDoc* pDoc = createDoc("tdf116925.docx"); |