diff options
| author | Tünde Tóth <toth.tunde@nisz.hu> | 2020-12-15 14:17:15 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2020-12-17 15:20:43 +0100 |
| commit | 4114e5304425ff54e6957ef417e96e01a4cef532 (patch) | |
| tree | cd30c1a43c3d339b7c2621ec3b12393d44f83a00 /sw | |
| parent | 8b1efde9272adb2b7e4c438eba63193249216c9c (diff) | |
tdf#136816: fix hidden legend entries in "Column and Line" charts
Regression from commit: 300e65cc47f3d6ae1563350757dbfadc080d7452
(tdf#123268 fix lost chart if all legend entries are hidden)
Change-Id: Id59cd8d681dada123feadbe7910be7fbc7ec37f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107757
Tested-by: Jenkins
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit 1eb25c11500a235aa141a327a5489f6861e60a89)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107802
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107874
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/layout/data/tdf136816.odt | bin | 0 -> 14115 bytes | |||
| -rw-r--r-- | sw/qa/extras/layout/layout.cxx | 13 |
2 files changed, 13 insertions, 0 deletions
diff --git a/sw/qa/extras/layout/data/tdf136816.odt b/sw/qa/extras/layout/data/tdf136816.odt Binary files differnew file mode 100644 index 000000000000..0b6599bea319 --- /dev/null +++ b/sw/qa/extras/layout/data/tdf136816.odt diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index acf877c323bf..27eca2137324 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -4215,6 +4215,19 @@ static SwRect lcl_getVisibleFlyObjRect(SwWrtShell* pWrtShell) return aFlyRect; } +CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf136816) +{ + SwDoc* pDoc = createDoc("tdf136816.odt"); + SwDocShell* pShell = pDoc->GetDocShell(); + // Dump the rendering of the first page as an XML file. + std::shared_ptr<GDIMetaFile> xMetaFile = pShell->GetPreviewMetaFile(); + MetafileXmlDump dumper; + xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile); + CPPUNIT_ASSERT(pXmlDoc); + // Check number of legend entries + assertXPath(pXmlDoc, "//text[contains(text(),\"Column\")]", 2); +} + CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testStableAtPageAnchoredFlyPosition) { // this doc has two page-anchored frames: one tiny on page 3 and one large on page 4. |