diff options
author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-11-02 14:50:18 +0100 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-11-03 05:51:18 +0100 |
commit | d952c0b42a452c875bd9d78870fa9d925af9220e (patch) | |
tree | 1b67be7ac14e2ab1329146127fedc0d31f3c87d5 /svtools | |
parent | bda85f9563b03bb36c7d72dc1178661b3bf23df0 (diff) |
vcl: remove sgf/sgv ancient gfx filters
Change-Id: Ib02986e5b3d54d65982836e22ebcb70eb7a0e7b3
Reviewed-on: https://gerrit.libreoffice.org/44216
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/inc/bitmaps.hlst | 4 | ||||
-rw-r--r-- | svtools/source/graphic/descriptor.cxx | 2 | ||||
-rw-r--r-- | svtools/source/graphic/descriptor.hxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/imagemgr.cxx | 10 |
4 files changed, 0 insertions, 18 deletions
diff --git a/svtools/inc/bitmaps.hlst b/svtools/inc/bitmaps.hlst index b585e616ebbd..1f31a7f22a62 100644 --- a/svtools/inc/bitmaps.hlst +++ b/svtools/inc/bitmaps.hlst @@ -39,8 +39,6 @@ #define BMP_DXF_SC "res/sx03217.png" #define BMP_MET_SC "res/sx03218.png" #define BMP_PNG_SC "res/sx03219.png" -#define BMP_SGF_SC "res/sx03220.png" -#define BMP_SGV_SC "res/sx03221.png" #define BMP_SVM_SC "res/sx03222.png" #define BMP_GLOBAL_DOC_SC "res/sx03226.png" #define BMP_DRAW_SC "res/sx03227.png" @@ -87,8 +85,6 @@ #define BMP_DXF_LC "res/lx03217.png" #define BMP_MET_LC "res/lx03218.png" #define BMP_PNG_LC "res/lx03219.png" -#define BMP_SGF_LC "res/lx03220.png" -#define BMP_SGV_LC "res/lx03221.png" #define BMP_SVM_LC "res/lx03222.png" #define BMP_GLOBAL_DOC_LC "res/lx03226.png" #define BMP_DRAW_LC "res/lx03227.png" diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx index 54254afe70b3..f89895826efd 100644 --- a/svtools/source/graphic/descriptor.cxx +++ b/svtools/source/graphic/descriptor.cxx @@ -128,10 +128,8 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const OUString* pURL ) case GraphicFileFormat::DXF: pMimeType = MIMETYPE_DXF; cType = graphic::GraphicType::VECTOR; break; case GraphicFileFormat::MET: pMimeType = MIMETYPE_MET; cType = graphic::GraphicType::VECTOR; break; case GraphicFileFormat::PCT: pMimeType = MIMETYPE_PCT; cType = graphic::GraphicType::VECTOR; break; - case GraphicFileFormat::SGF: pMimeType = MIMETYPE_SGF; 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::SGV: pMimeType = MIMETYPE_SGV; cType = graphic::GraphicType::VECTOR; break; case GraphicFileFormat::EMF: pMimeType = MIMETYPE_EMF; cType = graphic::GraphicType::VECTOR; break; case GraphicFileFormat::SVG: pMimeType = MIMETYPE_SVG; cType = graphic::GraphicType::VECTOR; break; diff --git a/svtools/source/graphic/descriptor.hxx b/svtools/source/graphic/descriptor.hxx index d831d17ab8d1..ba585702d205 100644 --- a/svtools/source/graphic/descriptor.hxx +++ b/svtools/source/graphic/descriptor.hxx @@ -45,10 +45,8 @@ #define MIMETYPE_DXF "image/vnd.dxf" #define MIMETYPE_MET "image/x-met" #define MIMETYPE_PCT "image/x-pict" -#define MIMETYPE_SGF "image/x-sgf" #define MIMETYPE_SVM "image/x-svm" #define MIMETYPE_WMF "image/x-wmf" -#define MIMETYPE_SGV "image/x-sgv" #define MIMETYPE_EMF "image/x-emf" #define MIMETYPE_SVG "image/svg+xml" #define MIMETYPE_PDF "application/pdf" diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index ad0522009475..908fb0f2d278 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -126,9 +126,7 @@ static SvtExtensionResIdMapping_Impl const ExtensionMap_Impl[] = { "sds", false, STR_DESCRIPTION_SCHART_DOC, SvImageId::NONE }, { "sdw", false, STR_DESCRIPTION_SWRITER_DOC, SvImageId::Writer }, { "sga", false, nullptr, SvImageId::NONE }, - { "sgf", true, STR_DESCRIPTION_GRAPHIC_DOC, SvImageId::SGF }, { "sgl", false, STR_DESCRIPTION_GLOBALDOC, SvImageId::GlobalDoc }, - { "sgv", true, STR_DESCRIPTION_GRAPHIC_DOC, SvImageId::SGV }, { "shtml", false, STR_DESCRIPTION_HTMLFILE, SvImageId::HTML }, { "sim", false, STR_DESCRIPTION_SIMAGE_DOC, SvImageId::SIM }, { "smf", false, STR_DESCRIPTION_SMATH_DOC, SvImageId::Math }, @@ -547,10 +545,6 @@ static Image GetImageFromList_Impl( SvImageId nImageId, bool bBig ) return Image(BitmapEx(BMP_MET_LC)); case SvImageId::PNG: return Image(BitmapEx(BMP_PNG_LC)); - case SvImageId::SGF: - return Image(BitmapEx(BMP_SGF_LC)); - case SvImageId::SGV: - return Image(BitmapEx(BMP_SGV_LC)); case SvImageId::SVM: return Image(BitmapEx(BMP_SVM_LC)); case SvImageId::GlobalDoc: @@ -651,10 +645,6 @@ static Image GetImageFromList_Impl( SvImageId nImageId, bool bBig ) return Image(BitmapEx(BMP_MET_SC)); case SvImageId::PNG: return Image(BitmapEx(BMP_PNG_SC)); - case SvImageId::SGF: - return Image(BitmapEx(BMP_SGF_SC)); - case SvImageId::SGV: - return Image(BitmapEx(BMP_SGV_SC)); case SvImageId::SVM: return Image(BitmapEx(BMP_SVM_SC)); case SvImageId::GlobalDoc: |