diff options
| author | Sarper Akdemir <sarper.akdemir@collabora.com> | 2023-04-25 08:48:36 +0300 |
|---|---|---|
| committer | Sarper Akdemir <sarper.akdemir@collabora.com> | 2023-04-26 21:13:31 +0200 |
| commit | 7dd994f8303a2b9396ed3848104028ff724e3bab (patch) | |
| tree | 7e1839ba37414cd3fc4dce5975834e4cc8215128 | |
| parent | tdf#136749 std::map -> unordered_map (diff) | |
| download | core-7dd994f8303a2b9396ed3848104028ff724e3bab.tar.gz core-7dd994f8303a2b9396ed3848104028ff724e3bab.zip | |
pptx export: fix export of vertical table text
The mapping (implemented in 77655fc3dca05d4bb2366e67ccea228e3886bfe2)
used on export and the accompanying roundtrip test was incorrect. This
patch fixes both.
Rotation value of
- 9000 maps to vert270
- 27000 maps to vert
Change-Id: I9a9f889a2bff0241e62ee685492034eec6d0cccf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150955
Tested-by: Jenkins
Reviewed-by: Sarper Akdemir <sarper.akdemir@collabora.com>
| -rw-r--r-- | oox/source/drawingml/drawingmltypes.cxx | 4 | ||||
| -rw-r--r-- | sd/qa/unit/export-tests-ooxml3.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/oox/source/drawingml/drawingmltypes.cxx b/oox/source/drawingml/drawingmltypes.cxx index ff8c46050c15..30fed83f4391 100644 --- a/oox/source/drawingml/drawingmltypes.cxx +++ b/oox/source/drawingml/drawingmltypes.cxx @@ -382,9 +382,9 @@ std::optional<OString> GetTextVerticalType(sal_Int32 nRotateAngle) switch (nRotateAngle) { case 9000: - return "vert"; - case 27000: return "vert270"; + case 27000: + return "vert"; default: return {}; } diff --git a/sd/qa/unit/export-tests-ooxml3.cxx b/sd/qa/unit/export-tests-ooxml3.cxx index d8d92ca54ae8..6fdf10a5bcce 100644 --- a/sd/qa/unit/export-tests-ooxml3.cxx +++ b/sd/qa/unit/export-tests-ooxml3.cxx @@ -1991,8 +1991,8 @@ CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest3, testTableCellVerticalPropertyRoundtrip) xmlDocUniquePtr pXml = parseExport("ppt/slides/slide1.xml"); - assertXPath(pXml, "(//a:tcPr)[1]", "vert", "vert270"); - assertXPath(pXml, "(//a:tcPr)[2]", "vert", "vert"); + assertXPath(pXml, "(//a:tcPr)[1]", "vert", "vert"); + assertXPath(pXml, "(//a:tcPr)[2]", "vert", "vert270"); assertXPath(pXml, "(//a:tcPr)[3]", "vert", "wordArtVert"); } |