sd/qa/unit/data/pptx/tdf92222.pptx |binary
sd/qa/unit/export-tests-ooxml3.cxx | 19 +++++++++++++++++++
sd/source/filter/eppt/pptx-epptooxml.cxx | 6 +++---
3 files changed, 22 insertions(+), 3 deletions(-)
New commits:
commit 3c58ab7f075a0c8528f00a9f22919e598c18e092
Author: Tibor Nagy <nagy.tib...@nisz.hu>
AuthorDate: Tue Nov 8 11:57:28 2022 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Nov 25 12:27:24 2022 +0100
tdf#92222 PPTX export: fix line width of the shape in theme
Change shape line width values of minimal office theme
to the correct 0.5, 1, 1.5 pt (from 0.7, 2, 3 pt).
Change-Id: Ied7ad2e29daed9130df8b8c8d8baf5342f1c75da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142427
Tested-by: László Németh <nem...@numbertext.org>
Reviewed-by: László Németh <nem...@numbertext.org>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143285
Tested-by: Jenkins
diff --git a/sd/qa/unit/data/pptx/tdf92222.pptx
b/sd/qa/unit/data/pptx/tdf92222.pptx
new file mode 100644
index 000000000000..60ec3b886fe9
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf92222.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml3.cxx
b/sd/qa/unit/export-tests-ooxml3.cxx
index 499491d084f9..b1d66cdbed94 100644
--- a/sd/qa/unit/export-tests-ooxml3.cxx
+++ b/sd/qa/unit/export-tests-ooxml3.cxx
@@ -35,6 +35,7 @@
class SdOOXMLExportTest3 : public SdModelTestBaseXML
{
public:
+ void testTdf92222();
void testTdf129430();
void testTdf114848();
void testTdf147586();
@@ -124,6 +125,7 @@ public:
CPPUNIT_TEST_SUITE(SdOOXMLExportTest3);
+ CPPUNIT_TEST(testTdf92222);
CPPUNIT_TEST(testTdf129430);
CPPUNIT_TEST(testTdf114848);
CPPUNIT_TEST(testTdf147586);
@@ -217,6 +219,23 @@ public:
}
};
+void SdOOXMLExportTest3::testTdf92222()
+{
+ sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf92222.pptx"),
PPTX);
+ utl::TempFile tempFile;
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+ xDocShRef->DoClose();
+
+ xmlDocUniquePtr pXmlDocTheme = parseExport(tempFile,
"ppt/theme/theme1.xml");
+ assertXPath(pXmlDocTheme,
"/a:theme/a:themeElements/a:fmtScheme/a:lnStyleLst/a:ln[1]", "w",
+ "6350");
+ assertXPath(pXmlDocTheme,
"/a:theme/a:themeElements/a:fmtScheme/a:lnStyleLst/a:ln[2]", "w",
+ "12700");
+ assertXPath(pXmlDocTheme,
"/a:theme/a:themeElements/a:fmtScheme/a:lnStyleLst/a:ln[3]", "w",
+ "19050");
+}
+
void SdOOXMLExportTest3::testTdf129430()
{
sd::DrawDocShellRef xDocShRef
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index b3c56b6585e5..00e6de81885a 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1990,7 +1990,7 @@ ShapeExport&
PowerPointShapeExport::WritePlaceholderReferenceTextBody(
</a:gradFill>\
</a:fillStyleLst>\
<a:lnStyleLst>\
- <a:ln w=\"9525\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\">\
+ <a:ln w=\"6350\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\">\
<a:solidFill>\
<a:schemeClr val=\"phClr\">\
<a:shade val=\"95000\"/>\
@@ -2000,14 +2000,14 @@ ShapeExport&
PowerPointShapeExport::WritePlaceholderReferenceTextBody(
<a:prstDash val=\"solid\"/>\
<a:miter/>\
</a:ln>\
- <a:ln w=\"25400\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\">\
+ <a:ln w=\"12700\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\">\
<a:solidFill>\
<a:schemeClr val=\"phClr\"/>\
</a:solidFill>\
<a:prstDash val=\"solid\"/>\
<a:miter/>\
</a:ln>\
- <a:ln w=\"38100\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\">\
+ <a:ln w=\"19050\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\">\
<a:solidFill>\
<a:schemeClr val=\"phClr\"/>\
</a:solidFill>\
