diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-09-07 17:00:44 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-09-07 18:59:05 +0200 |
| commit | fbcdbfef8664430e15b9429187b58dede992accf (patch) | |
| tree | 66461e61f688ae4cae8d550d3f5aa3deb76b62cc /filter/source/svg/svgexport.cxx | |
| parent | af1e773c19db58de55939355bf0069e35d2a7789 (diff) | |
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 <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'filter/source/svg/svgexport.cxx')
| -rw-r--r-- | filter/source/svg/svgexport.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
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 ) |