diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-05-19 21:03:02 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-05-24 16:29:48 +0200 |
| commit | 4fb60a73226a2717dde1cef395d9747d2bc15053 (patch) | |
| tree | 8c22869cbe2517b71f5faf4167ed1eade346fc03 /xmloff/Module_xmloff.mk | |
| parent | 619d16d73eeacba1a76d8d586ac031f948db3ae1 (diff) | |
tdf#130479 FODG import: fix handling of <draw:fill-image> in styles
Regression from the image handling rework, the problem was that the old,
URL-based code had explicit handling of mxBase64Stream, while the new,
XGraphic-based code assumed that by the time we reach the end of of the
bitmap style element, maAny already contains the graphic.
Fix the problem by improving XMLBitmapStyleContext::EndElement(), so it
loads the graphic from the base64 stream if we don't have a graphic
already.
(cherry picked from commit 96baf8c69330d50af7d31ab9838bcd0ec7c8c50b)
Change-Id: I6d90f1470a5b797fb51789901081ccd7a6fd29e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94459
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'xmloff/Module_xmloff.mk')
| -rw-r--r-- | xmloff/Module_xmloff.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/xmloff/Module_xmloff.mk b/xmloff/Module_xmloff.mk index 8b1ced43396f..16cf0f817889 100644 --- a/xmloff/Module_xmloff.mk +++ b/xmloff/Module_xmloff.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Module_add_targets,xmloff,\ $(eval $(call gb_Module_add_check_targets,xmloff,\ $(if $(MERGELIBS),, \ CppunitTest_xmloff_uxmloff) \ + CppunitTest_xmloff_style \ )) $(eval $(call gb_Module_add_subsequentcheck_targets,xmloff,\ |