diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2019-06-11 13:26:50 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2019-06-12 16:54:03 +0200 |
| commit | 007bf60611e2ba5a65ffabe80dbb0e279fcb9f26 (patch) | |
| tree | a456a873569429f5a8ebeb3ca132671a5b67e3d8 /sw | |
| parent | f6e2e0d022340b1dbbf8fd16be2f4fed3a57612c (diff) | |
tdf#75659 Chart: fix empty legend at not available legend names
by using localized versions of "Unnamed Series 1" etc.
Note: OOXML files don't contain the default or fallback legend names
used by MSO in this case, so the original empty string replacement
of the missing names resulted bad chart import.
Change-Id: I2897c70d9003e1ab3241dd569de0d79821d896b1
Reviewed-on: https://gerrit.libreoffice.org/73817
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/layout/data/tdf75659.docx | bin | 0 -> 25109 bytes | |||
| -rw-r--r-- | sw/qa/extras/layout/layout.cxx | 25 |
2 files changed, 25 insertions, 0 deletions
diff --git a/sw/qa/extras/layout/data/tdf75659.docx b/sw/qa/extras/layout/data/tdf75659.docx Binary files differnew file mode 100644 index 000000000000..a3cde330f8f5 --- /dev/null +++ b/sw/qa/extras/layout/data/tdf75659.docx diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index 1175d25ef573..325c0ef49e64 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -2327,6 +2327,31 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf125335) // This failed, if the legend first label is not "Data3". The legend position is bottom. } +CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf75659) +{ + SwDoc* pDoc = createDoc("tdf75659.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); + + assertXPathContent(pXmlDoc, + "/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[17]/text", + "Unnamed Series 1"); + + assertXPathContent(pXmlDoc, + "/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[18]/text", + "Unnamed Series 2"); + + assertXPathContent(pXmlDoc, + "/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[19]/text", + "Unnamed Series 3"); + // These failed, if the legend names are empty strings. +} + CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf108021) { SwDoc* pDoc = createDoc("tdf108021.odt"); |