diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2023-09-25 09:03:54 +0200 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2023-12-06 08:23:34 +0100 |
commit | 1db193c6c744289139b1df2af0b8defcf974b238 (patch) | |
tree | 2651e967a8fb4c72ea7b715ee48aef648b993b62 /oox/inc/drawingml/misccontexts.hxx | |
parent | fa38d98155a857908641380c7a1a5a34fafe934e (diff) |
tdf#126084 import svg image from ooxml document that use svgBlip elem.
In an OOXML document the svg image is defined in an svgBlip, which
is an OOXML extension. This change checks for the svgBlip element
and imports that instead the normal "blip" element that is still
provided as a fallback (PNG image).
Add roundtrip SVG image test for ODF and OOXML, Impress and Writer.
testGraphicBlipXLSX test failed after this change, because some
component was missing. Changed to enable use_rdb for all chart2
export tests, so issues like this won't happen anymore.
Change-Id: Idf0e754775254d7dcfd0321dfca2ed6d00c42c09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157238
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'oox/inc/drawingml/misccontexts.hxx')
-rw-r--r-- | oox/inc/drawingml/misccontexts.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/oox/inc/drawingml/misccontexts.hxx b/oox/inc/drawingml/misccontexts.hxx index c79816282ae7..1b7f05444ac7 100644 --- a/oox/inc/drawingml/misccontexts.hxx +++ b/oox/inc/drawingml/misccontexts.hxx @@ -102,7 +102,8 @@ class BlipExtensionContext final : public ::oox::core::ContextHandler2 public: explicit BlipExtensionContext( ::oox::core::ContextHandler2Helper const & rParent, - BlipFillProperties& rBlipProps ); + BlipFillProperties& rBlipProps, + model::BlipFill* pBlipFill); virtual ~BlipExtensionContext() override; virtual ::oox::core::ContextHandlerRef @@ -112,6 +113,7 @@ public: private: BlipFillProperties& mrBlipProps; + model::BlipFill* mpBlipFill; }; |