filter/qa/unit/data/shape-nographic.odp |binary
filter/qa/unit/svg.cxx | 19 +++++++++++++++++++
filter/source/svg/svgexport.cxx | 3 ++-
filter/source/svg/svgwriter.cxx | 5 ++++-
4 files changed, 25 insertions(+), 2 deletions(-)
New commits:
commit fbcdbfef8664430e15b9429187b58dede992accf
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Sep 7 17:00:44 2020 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Sep 7 18:59:05 2020 +0200
SVG export: fix failure on trying to read graphic of a 3D shape
Regression from commit 8fc1b60f62c213a0476f3acc9f89cd5eccbf335d (sw SVG
export: try to reuse original bitmap data for JPG and PNG bitmaps,
2020-02-27), which generalized the code that tries to get the original
bitmap of shapes for performance reasons. Originally this worked with
SdrGrafObj, but now we try every XShape which has a Graphic property.
Add the missing check, so shapes without a graphic property just miss
the fast path, but doesn't fail the entire SVG export.
Change-Id: I6b20083110f3269337b9df6a23bd193cc6f7d13b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102187
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/filter/qa/unit/data/shape-nographic.odp
b/filter/qa/unit/data/shape-nographic.odp
new file mode 100644
index 000000000000..43186d614986
Binary files /dev/null and b/filter/qa/unit/data/shape-nographic.odp differ
diff --git a/filter/qa/unit/svg.cxx b/filter/qa/unit/svg.cxx
index 5dcb1af0eb90..792964cb00d9 100644
--- a/filter/qa/unit/svg.cxx
+++ b/filter/qa/unit/svg.cxx
@@ -160,6 +160,25 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest,
testSemiTransparentText)
assertXPath(pXmlDoc,
"//svg:text[2]/svg:tspan/svg:tspan/svg:tspan[@fill-opacity]", 0);
}
+CPPUNIT_TEST_FIXTURE(SvgFilterTest, testShapeNographic)
+{
+ // Load a document containing a 3D shape.
+ load("shape-nographic.odp");
+
+ // Export to SVG.
+ uno::Reference<frame::XStorable> xStorable(getComponent(),
uno::UNO_QUERY_THROW);
+ SvMemoryStream aStream;
+ uno::Reference<io::XOutputStream> xOut = new
utl::OOutputStreamWrapper(aStream);
+ utl::MediaDescriptor aMediaDescriptor;
+ aMediaDescriptor["FilterName"] <<= OUString("impress_svg_Export");
+ aMediaDescriptor["OutputStream"] <<= xOut;
+
+ // Without the accompanying fix in place, this test would have failed with:
+ // An uncaught exception of type com.sun.star.io.IOException
+ // - SfxBaseModel::impl_store <private:stream> failed: 0xc10(Error Area:Io
Class:Write Code:16)
+ xStorable->storeToURL("private:stream",
aMediaDescriptor.getAsConstPropertyValueList());
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 615c60004c2b..dea16cf90d1f 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -59,6 +59,7 @@
#include <svx/svdograf.hxx>
#include <svx/svdmodel.hxx>
#include <svx/svdxcgv.hxx>
+#include <sal/log.hxx>
#include <memory>
@@ -608,7 +609,7 @@ bool SVGFilter::implExportImpressOrDraw( const Reference<
XOutputStream >& rxOSt
{
delete mpSVGDoc;
mpSVGDoc = nullptr;
- OSL_FAIL( "Exception caught" );
+ SAL_WARN("filter.svg", "Exception caught");
}
if( nullptr != pSdrModel )
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index ba6bdfd534cd..4a35b01e9dfd 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2758,7 +2758,10 @@ void GetGraphicFromXShape(const
css::uno::Reference<css::drawing::XShape>* pShap
}
uno::Reference<graphic::XGraphic> xGraphic;
- xPropertySet->getPropertyValue("Graphic") >>= xGraphic;
+ if (xPropertySet->getPropertySetInfo()->hasPropertyByName("Graphic"))
+ {
+ xPropertySet->getPropertyValue("Graphic") >>= xGraphic;
+ }
rGraphic= Graphic(xGraphic);
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
