oox/source/drawingml/drawingmltypes.cxx | 4 ++-- sd/qa/unit/export-tests-ooxml3.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 217294dccc072c86ca288674ff498396d303e68b Author: Sarper Akdemir <[email protected]> AuthorDate: Tue Apr 25 08:48:36 2023 +0300 Commit: Andras Timar <[email protected]> CommitDate: Tue Apr 25 10:05:34 2023 +0200 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/+/150924 Reviewed-by: Andras Timar <[email protected]> Tested-by: Andras Timar <[email protected]> diff --git a/oox/source/drawingml/drawingmltypes.cxx b/oox/source/drawingml/drawingmltypes.cxx index 94d50587942a..d361ae67a3c8 100644 --- a/oox/source/drawingml/drawingmltypes.cxx +++ b/oox/source/drawingml/drawingmltypes.cxx @@ -380,9 +380,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 d9da7ea8b395..41ff90b74b31 100644 --- a/sd/qa/unit/export-tests-ooxml3.cxx +++ b/sd/qa/unit/export-tests-ooxml3.cxx @@ -2100,8 +2100,8 @@ CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest3, testTableCellVerticalPropertyRoundtrip) xmlDocUniquePtr pXml = parseExport(tempFile, "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"); }
