diff options
author | Balazs Varga <balazs.varga991@gmail.com> | 2019-07-31 15:58:09 +0200 |
---|---|---|
committer | László Németh <nemeth@numbertext.org> | 2019-08-01 10:48:06 +0200 |
commit | 0dab9b7c83099a192ec61486e7a9fd04aecd3686 (patch) | |
tree | 1a93c618ad29a1805ed3b1d4a032012ce2589665 /sw | |
parent | a912df26c6bd9251802f853775753d20f3b3de2b (diff) |
tdf#126244 Chart view: fix rotation of complex category labels
The first level of vertical category axis labels orientation
should be horizontal, other levels should be rotated to 90°.
Also do not allow text break for complex vertical category axis
labels.
Change-Id: I01a6d9f753e767927fa71e2967dc3e6bad270565
Reviewed-on: https://gerrit.libreoffice.org/76754
Tested-by: Jenkins
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/tdf126244.docx | bin | 0 -> 25928 bytes | |||
-rw-r--r-- | sw/qa/extras/layout/layout.cxx | 21 |
2 files changed, 21 insertions, 0 deletions
diff --git a/sw/qa/extras/layout/data/tdf126244.docx b/sw/qa/extras/layout/data/tdf126244.docx Binary files differnew file mode 100644 index 000000000000..cf3b0d14a76c --- /dev/null +++ b/sw/qa/extras/layout/data/tdf126244.docx diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index 84728d8e2254..2f69230849e1 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -2295,6 +2295,27 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf122800) // This failed, if the textarray length of the first axis label not 22. } +CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf126244) +{ + SwDoc* pDoc = createDoc("tdf126244.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); + // Test the first level of vertical category axis labels orientation. The first level orientation should be horizontal. + assertXPath(pXmlDoc, "/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/font[1]", "orientation", + "0"); + // Test the second level of vertical category axis labels orientation. The second level orientation should be vertical. + assertXPath(pXmlDoc, "/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/font[5]", "orientation", + "900"); + // Test the third level of vertical category axis labels orientation. The third level orientation should be vertical. + assertXPath(pXmlDoc, "/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/font[7]", "orientation", + "900"); +} + CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf124796) { SwDoc* pDoc = createDoc("tdf124796.odt"); |