diff options
| author | offtkp <parisoplop@gmail.com> | 2022-08-09 23:24:58 +0300 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2022-08-19 10:24:43 +0200 |
| commit | d5472c797df5831bb95650ad8f3c0cf94512b819 (patch) | |
| tree | 8f5362278a11d87071eed147bdc7701fdb247bbc /vcl/source/graphic/UnoGraphicDescriptor.cxx | |
| parent | 45705461d4597b736c44e006360f9072eed3fe85 (diff) | |
Remove code duplication in GraphicDescriptor for WMF/EMF
GraphicFormatDetector and GraphicDescriptor have duplicate format
detection code so now GraphicDescriptor uses GraphicFormatDetector
functions instead to detect the format for WMF/EMF files and their Z
compressed counterparts WMZ/EMZ
Change-Id: Ia054c782320923aaa0c2c8bda2f33c27c3b123d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138067
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl/source/graphic/UnoGraphicDescriptor.cxx')
| -rw-r--r-- | vcl/source/graphic/UnoGraphicDescriptor.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vcl/source/graphic/UnoGraphicDescriptor.cxx b/vcl/source/graphic/UnoGraphicDescriptor.cxx index 74a99eb0a610..ca25e5c6d964 100644 --- a/vcl/source/graphic/UnoGraphicDescriptor.cxx +++ b/vcl/source/graphic/UnoGraphicDescriptor.cxx @@ -135,7 +135,9 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const OUString* pURL ) case GraphicFileFormat::PCT: pMimeType = MIMETYPE_PCT; cType = graphic::GraphicType::VECTOR; break; case GraphicFileFormat::SVM: pMimeType = MIMETYPE_SVM; cType = graphic::GraphicType::VECTOR; break; case GraphicFileFormat::WMF: pMimeType = MIMETYPE_WMF; cType = graphic::GraphicType::VECTOR; break; + case GraphicFileFormat::WMZ: pMimeType = MIMETYPE_WMF; cType = graphic::GraphicType::VECTOR; break; case GraphicFileFormat::EMF: pMimeType = MIMETYPE_EMF; cType = graphic::GraphicType::VECTOR; break; + case GraphicFileFormat::EMZ: pMimeType = MIMETYPE_EMF; cType = graphic::GraphicType::VECTOR; break; case GraphicFileFormat::SVG: pMimeType = MIMETYPE_SVG; cType = graphic::GraphicType::VECTOR; break; default: |