Reviewed-on: https://gerrit.libreoffice.org/71684 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit f68e68a7b1a6b985f06aff92d95ce178d323e91c) Conflicts: test/data/non_shape_writer_image.svg test/data/shapes_writer.svg Change-Id: Ibb5da2d71ebd68a13b8ccc2a23f891320508f0a5