diff options
| author | László Németh <nemeth@numbertext.org> | 2018-06-18 16:48:02 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-06-27 06:42:43 +0200 |
| commit | 68cf249043de1417a8e1ccea29b3c9c2895d512f (patch) | |
| tree | 6b9c88a4c0a908cc4b62c8a672e91c54c9c3e6d2 /svx/source | |
| parent | a0e375b8c3e0b765d082efe8af23c6b231c6f3d6 (diff) | |
tdf#103913 keep ".emf" file extension and mime type
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 <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
Conflicts:
svx/source/xml/xmlgrhlp.cxx
(cherry-pick from commit 4cb1e86e5217f09e1d98e51e46803a06fb72f5ce)
Change-Id: I3b8634ae022c7c026b0ed4ebc345c1c3b3f96337
Reviewed-on: https://gerrit.libreoffice.org/56084
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit c959815d55919967c9697dc8862ddec6844b7796)
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/xml/xmlgrhlp.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index b04af09f9734..64c272bbbe72 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -675,7 +675,12 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const OUString& rURLStr, sal_uInt case GfxLinkType::NativeJpg: aExtension = ".jpg"; break; case GfxLinkType::NativePng: aExtension = ".png"; break; case GfxLinkType::NativeTif: aExtension = ".tif"; break; - case GfxLinkType::NativeWmf: aExtension = ".wmf"; break; + case GfxLinkType::NativeWmf: + if (aGfxLink.IsEMF()) + aExtension = ".emf"; + else + aExtension = ".wmf"; + break; case GfxLinkType::NativeMet: aExtension = ".met"; break; case GfxLinkType::NativePct: aExtension = ".pct"; break; case GfxLinkType::NativeSvg: |