diff options
| author | Tibor Nagy <nagy.tibor2@nisz.hu> | 2022-11-08 11:57:28 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2022-11-23 10:50:59 +0100 |
| commit | 25e9766e9b87342b6f1b29dc146d5f33e12157a7 (patch) | |
| tree | e212601f8b06d035e97e8458624162a99017cfe3 /sd | |
| parent | 175e514c93b3696faa8c331c8b8f56e832ceb4c1 (diff) | |
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 <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/data/pptx/tdf92222.pptx | bin | 0 -> 21267 bytes | |||
| -rw-r--r-- | sd/qa/unit/export-tests-ooxml3.cxx | 17 | ||||
| -rw-r--r-- | sd/source/filter/eppt/pptx-epptooxml.cxx | 6 |
3 files changed, 20 insertions, 3 deletions
diff --git a/sd/qa/unit/data/pptx/tdf92222.pptx b/sd/qa/unit/data/pptx/tdf92222.pptx Binary files differnew file mode 100644 index 000000000000..60ec3b886fe9 --- /dev/null +++ b/sd/qa/unit/data/pptx/tdf92222.pptx diff --git a/sd/qa/unit/export-tests-ooxml3.cxx b/sd/qa/unit/export-tests-ooxml3.cxx index 90cf168be5a3..bc47f1936316 100644 --- a/sd/qa/unit/export-tests-ooxml3.cxx +++ b/sd/qa/unit/export-tests-ooxml3.cxx @@ -41,6 +41,7 @@ public: { } + void testTdf92222(); void testTdf129430(); void testTdf114848(); void testTdf147586(); @@ -133,6 +134,7 @@ public: CPPUNIT_TEST_SUITE(SdOOXMLExportTest3); + CPPUNIT_TEST(testTdf92222); CPPUNIT_TEST(testTdf129430); CPPUNIT_TEST(testTdf114848); CPPUNIT_TEST(testTdf147586); @@ -229,6 +231,20 @@ public: } }; +void SdOOXMLExportTest3::testTdf92222() +{ + loadFromURL(u"pptx/tdf92222.pptx"); + save("Impress Office Open XML"); + + xmlDocUniquePtr pXmlDocTheme = parseExport("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() { loadFromURL(u"odp/tdf129430.odp"); @@ -248,6 +264,7 @@ void SdOOXMLExportTest3::testTdf114848() assertXPath(pXmlDocTheme1, "/a:theme/a:themeElements/a:clrScheme/a:dk2/a:srgbClr", "val", "1f497d"); xmlDocUniquePtr pXmlDocTheme2 = parseExport("ppt/theme/theme2.xml"); + assertXPath(pXmlDocTheme2, "/a:theme/a:themeElements/a:clrScheme/a:dk2/a:srgbClr", "val", "1f497d"); } diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index d08b399309d7..b31ea7de9824 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -2009,7 +2009,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\"/>\ @@ -2019,14 +2019,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>\ |