drawinglayer/source/tools/primitive2dxmldump.cxx | 4 ++- svx/qa/unit/data/slide-background.odp |binary svx/qa/unit/data/slide-background.png |binary svx/qa/unit/sdr.cxx | 24 +++++++++++++++++++++ svx/source/sdr/primitive2d/sdrattributecreator.cxx | 8 +++++++ 5 files changed, 35 insertions(+), 1 deletion(-)
New commits: commit b68472285854ace9a1d667c166c623b98bebf846 Author: Miklos Vajna <vmik...@collabora.com> AuthorDate: Tue Aug 3 13:39:20 2021 +0200 Commit: Tomaž Vajngerl <qui...@gmail.com> CommitDate: Sat Aug 7 01:02:35 2021 +0200 tdf#142436 svx: fix handling of linked background images Regression from commit 9fb7aaf570c03c8a26d763f1205fb8c890e8211a (Make linked graphic register into LinkedManager again, 2018-04-13), the problem was that now SvXMLImport::loadGraphicByURL() produces a Graphic that has its type set to GraphicType::Default, but when drawinglayer::primitive2d::createNewSdrFillGraphicAttribute() consumes this graphic, it expects that the type is either a bitmap or a metafile. Fix the problem by explicitly loading the image when the default-type, origin-url-set case happens: this is rendering, so no problem to load the URL and that will give us the expected graphic type. This is also meant to keep the original problem fixed, since the Graphic that is part of the doc model is unchanged. (cherry picked from commit c88ff9298b25132fc34102230cef0263f045a523) Conflicts: drawinglayer/source/tools/primitive2dxmldump.cxx Change-Id: If5bba09faa23ef35f99152d4b5d30cd9cf67ace8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120097 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <qui...@gmail.com> diff --git a/drawinglayer/source/tools/primitive2dxmldump.cxx b/drawinglayer/source/tools/primitive2dxmldump.cxx index 4b0c47f41da0..7c5e5771d9bc 100644 --- a/drawinglayer/source/tools/primitive2dxmldump.cxx +++ b/drawinglayer/source/tools/primitive2dxmldump.cxx @@ -396,7 +396,9 @@ void Primitive2dXmlDump::decomposeAndWrite( } rWriter.attribute("x", aTranslate.getX()); rWriter.attribute("y", aTranslate.getY()); - rWriter.attribute("text", rTextSimplePortionPrimitive2D.getText()); + OUString aText = rTextSimplePortionPrimitive2D.getText(); + // TODO share code with sax_fastparser::FastSaxSerializer::write(). + rWriter.attribute("text", aText.replaceAll("", "	")); rWriter.attribute("fontcolor", convertColorToString(rTextSimplePortionPrimitive2D.getFontColor())); const drawinglayer::attribute::FontAttribute& aFontAttribute = rTextSimplePortionPrimitive2D.getFontAttribute(); diff --git a/svx/qa/unit/data/slide-background.odp b/svx/qa/unit/data/slide-background.odp new file mode 100644 index 000000000000..ea62bd63903b Binary files /dev/null and b/svx/qa/unit/data/slide-background.odp differ diff --git a/svx/qa/unit/data/slide-background.png b/svx/qa/unit/data/slide-background.png new file mode 100644 index 000000000000..3a8c5ceb4262 Binary files /dev/null and b/svx/qa/unit/data/slide-background.png differ diff --git a/svx/qa/unit/sdr.cxx b/svx/qa/unit/sdr.cxx index 10f9901a0d60..e6ca7f7a87ad 100644 --- a/svx/qa/unit/sdr.cxx +++ b/svx/qa/unit/sdr.cxx @@ -118,6 +118,30 @@ CPPUNIT_TEST_FIXTURE(SdrTest, testZeroWidthTextWrap) // i.e. the text on the only shape on the slide had 12 lines, not a single one. assertXPath(pDocument, "//textsimpleportion", 1); } + +CPPUNIT_TEST_FIXTURE(SdrTest, testSlideBackground) +{ + // Given a document with a slide what has a linked background image: + test::Directories aDirectories; + OUString aURL = aDirectories.getURLFromSrc(u"svx/qa/unit/data/slide-background.odp"); + getComponent() = loadFromDesktop(aURL); + uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(getComponent(), uno::UNO_QUERY); + uno::Reference<drawing::XDrawPage> xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0), + uno::UNO_QUERY); + + // When rendering that document: + drawinglayer::primitive2d::Primitive2DContainer xPrimitiveSequence + = renderPageToPrimitives(xDrawPage); + + // Then make sure that the background has a bitmap: + drawinglayer::Primitive2dXmlDump aDumper; + xmlDocUniquePtr pDocument = aDumper.dumpAndParse(xPrimitiveSequence); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 1 + // - Actual : 0 + // i.e. the rendering did not find the bitmap. + assertXPath(pDocument, "//bitmap", 1); +} } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index 8b2fa387a836..855bc0daf573 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -58,6 +58,7 @@ #include <svx/xbtmpit.hxx> #include <svl/itempool.hxx> #include <vcl/svapp.hxx> +#include <vcl/GraphicLoader.hxx> #include <basegfx/range/b2drange.hxx> #include <svx/svx3ditems.hxx> #include <com/sun/star/drawing/ProjectionMode.hpp> @@ -656,6 +657,13 @@ namespace drawinglayer::primitive2d { Graphic aGraphic(rSet.Get(XATTR_FILLBITMAP).GetGraphicObject().GetGraphic()); + OUString aOriginURL = aGraphic.getOriginURL(); + if (aGraphic.GetType() == GraphicType::Default && !aOriginURL.isEmpty()) + { + aGraphic = vcl::graphic::loadFromURL(aGraphic.getOriginURL()); + aGraphic.setOriginURL(aOriginURL); + } + if(GraphicType::Bitmap != aGraphic.GetType() && GraphicType::GdiMetafile != aGraphic.GetType()) { // no content if not bitmap or metafile