From 028602a7fc0691958ade01c9bc7cd617e85203ac Mon Sep 17 00:00:00 2001
From: Xisco Fauli <xiscofauli@libreoffice.org>
Date: Wed, 2 Feb 2022 12:10:36 +0100
Subject: tdf#147119:Revert "tdf#123973 fix missing MasterPage content in
 export"

This reverts commit 87866def6bfe2ee91be34a5ce37b79d6da881617.

This also reverts commit 98d6ed2aeb22b27fddf716a372f483b89ecea841
< tdf#123973: sd_png_export_tests: Add unittest >

Change-Id: Ic3c8c70ef789b83cec0614e766a3c067cbf078fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129351
Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Jenkins
---
 sd/qa/unit/PNGExportTests.cxx     |  55 --------------------------------------
 sd/qa/unit/data/odp/tdf123973.odp | Bin 11372 -> 0 bytes
 2 files changed, 55 deletions(-)
 delete mode 100644 sd/qa/unit/data/odp/tdf123973.odp

(limited to 'sd/qa')

diff --git a/sd/qa/unit/PNGExportTests.cxx b/sd/qa/unit/PNGExportTests.cxx
index 72aa41c60023..86afd95bb267 100644
--- a/sd/qa/unit/PNGExportTests.cxx
+++ b/sd/qa/unit/PNGExportTests.cxx
@@ -167,61 +167,6 @@ CPPUNIT_TEST_FIXTURE(SdPNGExportTest, testTdf113163)
     }
 }
 
-CPPUNIT_TEST_FIXTURE(SdPNGExportTest, testTdf123973)
-{
-    mxComponent
-        = loadFromDesktop(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf123973.odp"));
-    uno::Reference<uno::XComponentContext> xContext = getComponentContext();
-    CPPUNIT_ASSERT(xContext.is());
-    uno::Reference<drawing::XGraphicExportFilter> xGraphicExporter
-        = drawing::GraphicExportFilter::create(xContext);
-
-    uno::Sequence<beans::PropertyValue> aFilterData{
-        comphelper::makePropertyValue("PixelWidth", sal_Int32(100)),
-        comphelper::makePropertyValue("PixelHeight", sal_Int32(100)),
-        comphelper::makePropertyValue("Translucent", true),
-    };
-
-    utl::TempFile aTempFile;
-    aTempFile.EnableKillingFile();
-
-    uno::Sequence<beans::PropertyValue> aDescriptor{
-        comphelper::makePropertyValue("URL", aTempFile.GetURL()),
-        comphelper::makePropertyValue("FilterName", OUString("PNG")),
-        comphelper::makePropertyValue("FilterData", aFilterData)
-    };
-
-    uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(mxComponent, uno::UNO_QUERY);
-    uno::Reference<lang::XComponent> xPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
-                                           uno::UNO_QUERY);
-    xGraphicExporter->setSourceDocument(xPage);
-    xGraphicExporter->filter(aDescriptor);
-
-    SvFileStream aFileStream(aTempFile.GetURL(), StreamMode::READ);
-    vcl::PngImageReader aPNGReader(aFileStream);
-    BitmapEx aBMPEx = aPNGReader.read();
-
-    // make sure the bitmap is not empty and correct size (PNG export->import was successful)
-    Size aSize = aBMPEx.GetSizePixel();
-    CPPUNIT_ASSERT_EQUAL(Size(100, 100), aSize);
-    Bitmap aBMP = aBMPEx.GetBitmap();
-    {
-        Bitmap::ScopedReadAccess pReadAccess(aBMP);
-        for (tools::Long nX = 1; nX < aSize.Width() - 1; ++nX)
-        {
-            for (tools::Long nY = 1; nY < aSize.Height() - 1; ++nY)
-            {
-                // Check all pixels in the image are black
-                // Without the fix in place, this test would have failed with
-                // - Expected: Color: R:0 G:0 B:0 A:0
-                // - Actual  : Color: R:255 G:255 B:255 A:0
-                const Color aColor = pReadAccess->GetColor(nX, nY);
-                CPPUNIT_ASSERT_EQUAL(COL_BLACK, aColor);
-            }
-        }
-    }
-}
-
 CPPUNIT_TEST_FIXTURE(SdPNGExportTest, testTdf93124)
 {
     mxComponent
diff --git a/sd/qa/unit/data/odp/tdf123973.odp b/sd/qa/unit/data/odp/tdf123973.odp
deleted file mode 100644
index a3bd9455efd5..000000000000
Binary files a/sd/qa/unit/data/odp/tdf123973.odp and /dev/null differ
-- 
cgit