diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-30 10:24:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-31 06:26:25 +0000 |
| commit | fe6ac2d11a6f870094bd630759f998d8ed9272e3 (patch) | |
| tree | 6012c260e7926a2cdd01e586f83add8af1ec327e /svtools | |
| parent | 0b23eec200c8c12db5778405df44f4bf8e38e4ad (diff) | |
Convert GfxLinkType to scoped enum
Change-Id: Iae074ef0927a55f1fbf401cb66f4f183213f547c
Reviewed-on: https://gerrit.libreoffice.org/25656
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/graphic/descriptor.cxx | 16 | ||||
| -rw-r--r-- | svtools/source/graphic/grfcache.cxx | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx index 9e320ea4783d..3606681177f1 100644 --- a/svtools/source/graphic/descriptor.cxx +++ b/svtools/source/graphic/descriptor.cxx @@ -324,19 +324,19 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** switch( mpGraphic->GetLink().GetType() ) { - case GFX_LINK_TYPE_NATIVE_GIF: pMimeType = MIMETYPE_GIF; break; + case GfxLinkType::NativeGif: pMimeType = MIMETYPE_GIF; break; // #i15508# added BMP type for better exports (checked, works) - case GFX_LINK_TYPE_NATIVE_BMP: pMimeType = MIMETYPE_BMP; break; + case GfxLinkType::NativeBmp: pMimeType = MIMETYPE_BMP; break; - case GFX_LINK_TYPE_NATIVE_JPG: pMimeType = MIMETYPE_JPG; break; - case GFX_LINK_TYPE_NATIVE_PNG: pMimeType = MIMETYPE_PNG; break; - case GFX_LINK_TYPE_NATIVE_WMF: pMimeType = MIMETYPE_WMF; break; - case GFX_LINK_TYPE_NATIVE_MET: pMimeType = MIMETYPE_MET; break; - case GFX_LINK_TYPE_NATIVE_PCT: pMimeType = MIMETYPE_PCT; break; + case GfxLinkType::NativeJpg: pMimeType = MIMETYPE_JPG; break; + case GfxLinkType::NativePng: pMimeType = MIMETYPE_PNG; break; + case GfxLinkType::NativeWmf: pMimeType = MIMETYPE_WMF; break; + case GfxLinkType::NativeMet: pMimeType = MIMETYPE_MET; break; + case GfxLinkType::NativePct: pMimeType = MIMETYPE_PCT; break; // added Svg mimetype support - case GFX_LINK_TYPE_NATIVE_SVG: pMimeType = MIMETYPE_SVG; break; + case GfxLinkType::NativeSvg: pMimeType = MIMETYPE_SVG; break; default: pMimeType = nullptr; diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx index 3a37dbb03983..fa3f9bf70a71 100644 --- a/svtools/source/graphic/grfcache.cxx +++ b/svtools/source/graphic/grfcache.cxx @@ -275,7 +275,7 @@ void GraphicCacheEntry::ImplFillSubstitute( Graphic& rSubstitute ) const GraphicType eOldType = rSubstitute.GetType(); const bool bDefaultType = ( rSubstitute.GetType() == GraphicType::Default ); - if( rSubstitute.IsLink() && ( GFX_LINK_TYPE_NONE == maGfxLink.GetType() ) ) + if( rSubstitute.IsLink() && ( GfxLinkType::NONE == maGfxLink.GetType() ) ) maGfxLink = rSubstitute.GetLink(); if(maSvgData.get()) @@ -306,7 +306,7 @@ void GraphicCacheEntry::ImplFillSubstitute( Graphic& rSubstitute ) rSubstitute.SetAnimationNotifyHdl( aAnimationNotifyHdl ); } - if( GFX_LINK_TYPE_NONE != maGfxLink.GetType() ) + if( GfxLinkType::NONE != maGfxLink.GetType() ) { rSubstitute.SetLink( maGfxLink ); } |