From fc1e5202cbfb36b28b0e597811f39895c19ae6ba Mon Sep 17 00:00:00 2001 From: Tibor Nagy Date: Fri, 19 Nov 2021 12:36:42 +0100 Subject: tdf#129430 PPTX export: fix workaround for "At least" line spacing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to avoid bad overlapping lines. PPTX does not have the option "At least", so line spacing with this setting is converted to fixed line spacing. Improve this workaround to use single line spacing, if the "At least" value is lower than the size of the characters, like "At least" is handled by Impress. Change-Id: I29b41225d48fd9a447e7f6ef3a8a7cc7ba9ef354 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125553 Tested-by: László Németh Reviewed-by: László Németh --- sd/qa/unit/data/odp/tdf129430.odp | Bin 0 -> 10697 bytes sd/qa/unit/export-tests-ooxml3.cxx | 15 +++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 sd/qa/unit/data/odp/tdf129430.odp (limited to 'sd') diff --git a/sd/qa/unit/data/odp/tdf129430.odp b/sd/qa/unit/data/odp/tdf129430.odp new file mode 100644 index 000000000000..f5304f75cf26 Binary files /dev/null and b/sd/qa/unit/data/odp/tdf129430.odp differ diff --git a/sd/qa/unit/export-tests-ooxml3.cxx b/sd/qa/unit/export-tests-ooxml3.cxx index 900716e20093..375922511661 100644 --- a/sd/qa/unit/export-tests-ooxml3.cxx +++ b/sd/qa/unit/export-tests-ooxml3.cxx @@ -51,6 +51,7 @@ class SdOOXMLExportTest3 : public SdModelTestBaseXML { public: + void testTdf129430(); void testTdf114848(); void testTdf68759(); void testTdf127901(); @@ -125,6 +126,7 @@ public: CPPUNIT_TEST_SUITE(SdOOXMLExportTest3); + CPPUNIT_TEST(testTdf129430); CPPUNIT_TEST(testTdf114848); CPPUNIT_TEST(testTdf68759); CPPUNIT_TEST(testTdf127901); @@ -203,6 +205,19 @@ public: } }; +void SdOOXMLExportTest3::testTdf129430() +{ + sd::DrawDocShellRef xDocShRef + = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf129430.odp"), ODP); + utl::TempFile tempFile; + xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); + xDocShRef->DoClose(); + + xmlDocUniquePtr pXmlDoc1 = parseExport(tempFile, "ppt/slides/slide1.xml"); + assertXPath(pXmlDoc1, "/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:p[2]/a:pPr/a:lnSpc/a:spcPct", + "val", "100000"); +} + void SdOOXMLExportTest3::testTdf114848() { ::sd::DrawDocShellRef xDocShRef -- cgit v1.2.3