commit bfe33d42a2381bce194cc6fe15b830902f7c8443
author Tibor Nagy <nagy.tibor2@nisz.hu> Thu Nov 24 14:51:55 2022 +0100
committer László Németh <nemeth@numbertext.org> Tue Nov 29 18:15:11 2022 +0100
tree cd20b49ff4f7f37f63c1492570be7ca4c62382f8
parent 160689897cd5d46be0b4b1bdf67242d42bb72598

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 <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>

sd/qa/unit/data/pptx/tdf152186.pptx

diff --git a/sd/qa/unit/data/pptx/tdf152186.pptx b/sd/qa/unit/data/pptx/tdf152186.pptx
new file mode 100644
index 0000000..c4160f2
--- /dev/null
+++ b/sd/qa/unit/data/pptx/tdf152186.pptx
Binary files differ

sd/qa/unit/import-tests2.cxx

diff --git a/sd/qa/unit/import-tests2.cxx b/sd/qa/unit/import-tests2.cxx
index 43ea558..46d1966 100644
--- a/sd/qa/unit/import-tests2.cxx
+++ b/sd/qa/unit/import-tests2.cxx
@@ -68,6 +68,7 @@ public:
    {
    }

    void testTdf152186();
    void testTdf93868();
    void testTdf95932();
    void testTdf99030();
@@ -147,6 +148,7 @@ public:

    CPPUNIT_TEST_SUITE(SdImportTest2);

    CPPUNIT_TEST(testTdf152186);
    CPPUNIT_TEST(testTdf93868);
    CPPUNIT_TEST(testTdf95932);
    CPPUNIT_TEST(testTdf99030);
@@ -225,6 +227,21 @@ public:
    CPPUNIT_TEST_SUITE_END();
};

void SdImportTest2::testTdf152186()
{
    loadFromURL(u"pptx/tdf152186.pptx");
    saveAndReload("Impress MS PowerPoint 2007 XML");

    bool bHasShadow;
    const SdrPage* pPage = GetPage(1);
    for (size_t i = 0; i < pPage->GetObjCount(); ++i)
    {
        uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(i, 0));
        xShape->getPropertyValue("Shadow") >>= bHasShadow;
        CPPUNIT_ASSERT(!bHasShadow);
    }
}

void SdImportTest2::testTdf93868()
{
    createSdImpressDoc("pptx/tdf93868.pptx");

sd/source/filter/eppt/pptx-epptooxml.cxx

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index a9edd475..842c794 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -2035,22 +2035,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>\