From 9ff1a70edfd2cf92a65825a5c6b0a68cd79c9056 Mon Sep 17 00:00:00 2001 From: László Németh Date: Mon, 18 Jun 2018 16:48:02 +0200 Subject: tdf#103913 keep ".emf" file extension and mime type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit in documents, don't change them to wmf and image/x-wmf silently, resulting for example, dropping or rejecting modified documents by firewall packet filtering. Reviewed-on: https://gerrit.libreoffice.org/56045 Reviewed-by: László Németh Tested-by: László Németh (cherry-picked from commit 4cb1e86e5217f09e1d98e51e46803a06fb72f5ce) Change-Id: I3b8634ae022c7c026b0ed4ebc345c1c3b3f96337 Reviewed-on: https://gerrit.libreoffice.org/56080 Tested-by: Jenkins Reviewed-by: László Németh Reviewed-by: Gabor Kelemen Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- svx/source/xml/xmlgrhlp.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'svx/source/xml/xmlgrhlp.cxx') diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index a0f01b8671ac..3ebb6730b928 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -659,7 +659,12 @@ OUString SvXMLGraphicHelper::implSaveGraphic(css::uno::Reference