diff options
| author | Tünde Tóth <toth.tunde@nisz.hu> | 2021-06-02 11:51:13 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2021-06-10 15:03:52 +0200 |
| commit | 6185d1ff0130b3d178d5e50eeb6944ab70db41f9 (patch) | |
| tree | 6a8275b5fe29ab70ffd91a72eec42525a3795af3 | |
| parent | loplugin:unnecessaryreturn FontTable::addEmbeddedFont (diff) | |
| download | core-6185d1ff0130b3d178d5e50eeb6944ab70db41f9.tar.gz core-6185d1ff0130b3d178d5e50eeb6944ab70db41f9.zip | |
tdf#140623 Chart OOXML import: set text overlap to false
of category axis label unless the rotation is 0 in xml.
Regression from commit: 21620f9d2f50e66dffc45a5afb539edb8d54434c
(tdf#138194 Chart OOXML import: set text break to true)
Change-Id: I18db7483f49c84a83760200037f8858a3b471994
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116575
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
| -rw-r--r-- | oox/source/drawingml/chart/axisconverter.cxx | 10 | ||||
| -rw-r--r-- | sw/qa/extras/layout/data/tdf122225.docx | bin | 42192 -> 25656 bytes | |||
| -rw-r--r-- | sw/qa/extras/layout/layout2.cxx | 16 |
3 files changed, 17 insertions, 9 deletions
diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx index 1a8e23024612..7aa141c0f798 100644 --- a/oox/source/drawingml/chart/axisconverter.cxx +++ b/oox/source/drawingml/chart/axisconverter.cxx @@ -271,10 +271,12 @@ void AxisConverter::convertFromModel(const Reference<XCoordinateSystem>& rxCoord } else { - // do not overlap text when the rotation is undefined in xml - bool bTextOverlap - = mrModel.mxTextProp.is() - && mrModel.mxTextProp->getTextProperties().moRotation.has(); + // do not overlap text unless the rotation is 0 in xml + bool bTextOverlap = false; + if (mrModel.mxTextProp.is() + && mrModel.mxTextProp->getTextProperties().moRotation.has()) + bTextOverlap + = mrModel.mxTextProp->getTextProperties().moRotation.get() == 0; aAxisProp.setProperty(PROP_TextOverlap, bTextOverlap); /* do not break text into several lines unless the rotation is 0 degree, or the rotation is 90 degree and the inner size of the chart is not fixed, diff --git a/sw/qa/extras/layout/data/tdf122225.docx b/sw/qa/extras/layout/data/tdf122225.docx Binary files differindex 2b2b24a5548d..e4f0cc35f0e8 100644 --- a/sw/qa/extras/layout/data/tdf122225.docx +++ b/sw/qa/extras/layout/data/tdf122225.docx diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx index 27488737e536..3b14e16ac943 100644 --- a/sw/qa/extras/layout/layout2.cxx +++ b/sw/qa/extras/layout/layout2.cxx @@ -409,7 +409,6 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf131707) assertXPath(pXmlDoc, "//body/tab/row[3]/cell[2]/txt/anchored/fly/infos/bounds", "top", "2185"); } -#if HAVE_MORE_FONTS CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf122225) { SwDoc* pDoc = createDoc("tdf122225.docx"); @@ -421,12 +420,19 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf122225) xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile); CPPUNIT_ASSERT(pXmlDoc); - assertXPathContent(pXmlDoc, - "/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[8]/text", - "Advanced Diploma"); + // Bug 122225 - FILEOPEN DOCX Textbox of Column chart legend reduces and text of legend disappears + const sal_Int32 nLegendLabelLines + = getXPathContent(pXmlDoc, "count(//text[contains(text(),\"Advanced Diploma\")])") + .toInt32(); // This failed, if the legend label is not "Advanced Diploma". + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), nLegendLabelLines); + + // Bug 140623 - Fileopen DOCX: Text Orientation of X-Axis 0 instead of 45 degrees + const sal_Int32 nThirdLabelLines + = getXPathContent(pXmlDoc, "count(//text[contains(text(),\"Hispanic\")])").toInt32(); + // This failed, if the third X axis label broke to multiple lines. + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), nThirdLabelLines); } -#endif CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf125335) { |