[Libreoffice-commits] core.git: oox/source sd/qa
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Sep 11 07:56:02 UTC 2018
oox/source/export/drawingml.cxx | 6 ++++++
sd/qa/unit/data/pptx/testShapeAutofit.pptx |binary
sd/qa/unit/export-tests-ooxml2.cxx | 16 ++++++++++++++++
3 files changed, 22 insertions(+)
New commits:
commit 86b14cc8bd910651cef422a0f7408adc0fc51a17
Author: Balazs Varga <balazs.varga991 at gmail.com>
AuthorDate: Wed Sep 5 15:07:48 2018 +0200
Commit: László Németh <nemeth at numbertext.org>
CommitDate: Tue Sep 11 09:55:39 2018 +0200
tdf#119617 Fix export of Autofit property of shapes to PPTX
With this patch the "Resize shape to fit text" property
(TextAutoGrowHeight-->spAutofit/noAutofit) will be exported
correctly to PPTX format.
Change-Id: I5fa975c6390a17bad30c360b3b17aa944bbe72af
Reviewed-on: https://gerrit.libreoffice.org/60043
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth at numbertext.org>
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index eb3eb27c85d9..56caab75d8b2 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2469,6 +2469,12 @@ void DrawingML::WriteText( const Reference< XInterface >& rXIface, const OUStrin
mpFS->singleElementNS(XML_a, XML_normAutofit, XML_fontScale,
( nFontScale < MAX_SCALE_VAL && nFontScale > 0 ) ? I32S(nFontScale) : nullptr, FSEND);
}
+ else
+ {
+ bool bTextAutoGrowHeight = false;
+ GET(bTextAutoGrowHeight, TextAutoGrowHeight);
+ mpFS->singleElementNS(XML_a, (bTextAutoGrowHeight ? XML_spAutoFit : XML_noAutofit), FSEND);
+ }
}
mpFS->endElementNS((nXmlNamespace ? nXmlNamespace : XML_a), XML_bodyPr);
}
diff --git a/sd/qa/unit/data/pptx/testShapeAutofit.pptx b/sd/qa/unit/data/pptx/testShapeAutofit.pptx
new file mode 100755
index 000000000000..fd402c01c895
Binary files /dev/null and b/sd/qa/unit/data/pptx/testShapeAutofit.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx
index fa994f219d6a..c39f13a490d8 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -172,6 +172,7 @@ public:
void testTdf107608();
void testTdf111786();
void testFontScale();
+ void testShapeAutofitPPTX();
void testTdf115394();
void testTdf115394Zero();
void testTdf115005();
@@ -251,6 +252,7 @@ public:
CPPUNIT_TEST(testTdf107608);
CPPUNIT_TEST(testTdf111786);
CPPUNIT_TEST(testFontScale);
+ CPPUNIT_TEST(testShapeAutofitPPTX);
CPPUNIT_TEST(testTdf115394);
CPPUNIT_TEST(testTdf115394Zero);
CPPUNIT_TEST(testTdf115005);
@@ -1557,6 +1559,20 @@ void SdOOXMLExportTest2::testFontScale()
xDocShRef->DoClose();
}
+void SdOOXMLExportTest2::testShapeAutofitPPTX()
+{
+ sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/testShapeAutofit.pptx"), PPTX);
+ utl::TempFile tempFile;
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+ xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
+ CPPUNIT_ASSERT(pXmlDocContent);
+
+ // TextAutoGrowHeight --> "Resize shape to fit text" --> true
+ assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:sp[1]/p:txBody/a:bodyPr/a:spAutoFit", 1);
+ // TextAutoGrowHeight --> "Resize shape to fit text" --> false
+ assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:sp[2]/p:txBody/a:bodyPr/a:noAutofit", 1);
+}
+
void SdOOXMLExportTest2::testTdf115394()
{
sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf115394.pptx"), PPTX);
More information about the Libreoffice-commits
mailing list