sd/qa/unit/data/pptx/tdf152186.pptx |binary
sd/qa/unit/import-tests2.cxx | 21 +++++++++++++++++++++
sd/source/filter/eppt/pptx-epptooxml.cxx | 16 ++--------------
3 files changed, 23 insertions(+), 14 deletions(-)
New commits:
commit 21044e1469e95d30422c498ad0119d0ce76a6acd
Author: Tibor Nagy <nagy.tib...@nisz.hu>
AuthorDate: Thu Nov 24 14:51:55 2022 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Dec 5 13:24:10 2022 +0000
tdf#152186 PPTX export: fix shadow of the shape in theme
Placeholder line styles defined extra effectStyle, resulting
bad export with shadows.
Follow-up to commit 25e9766e9b87342b6f1b29dc146d5f33e12157a7
(tdf#92222 PPTX export: fix line width of the shape in theme)
Change-Id: I02f1edea84b50dbb9b0e0a59b6062a29894afde4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143233
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/+/143479
Tested-by: Jenkins
diff --git a/sd/qa/unit/data/pptx/tdf152186.pptx
b/sd/qa/unit/data/pptx/tdf152186.pptx
new file mode 100644
index 000000000000..c4160f2091a4
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf152186.pptx differ
diff --git a/sd/qa/unit/import-tests2.cxx b/sd/qa/unit/import-tests2.cxx
index 1f73fc022a41..969eb250fb80 100644
--- a/sd/qa/unit/import-tests2.cxx
+++ b/sd/qa/unit/import-tests2.cxx
@@ -66,6 +66,7 @@ class SdImportTest2 : public SdModelTestBase
public:
virtual void setUp() override;
+ void testTdf152186();
void testTdf93868();
void testTdf95932();
void testTdf99030();
@@ -143,6 +144,7 @@ public:
CPPUNIT_TEST_SUITE(SdImportTest2);
+ CPPUNIT_TEST(testTdf152186);
CPPUNIT_TEST(testTdf93868);
CPPUNIT_TEST(testTdf95932);
CPPUNIT_TEST(testTdf99030);
@@ -224,6 +226,25 @@ void SdImportTest2::setUp()
mxDesktop.set(frame::Desktop::create(getComponentContext()));
}
+void SdImportTest2::testTdf152186()
+{
+ sd::DrawDocShellRef xDocShRef
+ =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf152186.pptx"),
PPTX);
+
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX);
+
+ bool bHasShadow;
+ const SdrPage* pPage = GetPage(1, xDocShRef);
+ for (size_t i = 0; i < pPage->GetObjCount(); ++i)
+ {
+ uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(i, 0,
xDocShRef));
+ xShape->getPropertyValue("Shadow") >>= bHasShadow;
+ CPPUNIT_ASSERT(!bHasShadow);
+ }
+
+ xDocShRef->DoClose();
+}
+
void SdImportTest2::testTdf93868()
{
sd::DrawDocShellRef xDocShRef
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 81b00cafea10..6a338a6a6fab 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -2016,22 +2016,10 @@ ShapeExport&
PowerPointShapeExport::WritePlaceholderReferenceTextBody(
</a:lnStyleLst>\
<a:effectStyleLst>\
<a:effectStyle>\
- <a:effectLst>\
- <a:outerShdw blurRad=\"40000\" dist=\"20000\" dir=\"5400000\"
rotWithShape=\"0\">\
- <a:srgbClr val=\"000000\">\
- <a:alpha val=\"38000\"/>\
- </a:srgbClr>\
- </a:outerShdw>\
- </a:effectLst>\
+ <a:effectLst/>\
</a:effectStyle>\
<a:effectStyle>\
- <a:effectLst>\
- <a:outerShdw blurRad=\"40000\" dist=\"23000\" dir=\"5400000\"
rotWithShape=\"0\">\
- <a:srgbClr val=\"000000\">\
- <a:alpha val=\"35000\"/>\
- </a:srgbClr>\
- </a:outerShdw>\
- </a:effectLst>\
+ <a:effectLst/>\
</a:effectStyle>\
<a:effectStyle>\
<a:effectLst>\
