dev/null |binary sd/qa/unit/PNGExportTests.cxx | 55 ------------------------------ svx/source/unodraw/UnoGraphicExporter.cxx | 4 ++ 3 files changed, 4 insertions(+), 55 deletions(-)
New commits: commit 028602a7fc0691958ade01c9bc7cd617e85203ac Author: Xisco Fauli <[email protected]> AuthorDate: Wed Feb 2 12:10:36 2022 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Feb 3 11:11:05 2022 +0100 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 <[email protected]> Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins 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 diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index a91f16ab64f7..7626579502e7 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -691,6 +691,10 @@ bool GraphicExporter::GetGraphic( ExportSettings const & rSettings, Graphic& aGr pView->SetPageVisible( false ); pView->ShowSdrPage( pPage ); + // tdf#96922 completely deactivate EditView PageVisualization, including + // PageBackground (formerly 'wiese'). + pView->SetPagePaintingAllowed(false); + const Point aNewOrg( pPage->GetLeftBorder(), pPage->GetUpperBorder() ); aNewSize = Size( aSize.Width() - pPage->GetLeftBorder() - pPage->GetRightBorder(), aSize.Height() - pPage->GetUpperBorder() - pPage->GetLowerBorder() );
