diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-24 11:18:07 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-25 12:26:09 +0000 |
| commit | 0788f65f4643d2e10cd13277725247010dc4425e (patch) | |
| tree | 7032d0be490715381d98e176aea421855a720cc4 /vcl | |
| parent | 591a9129451234a60a88849f8ce01af3c7c5b9b6 (diff) | |
convert ImageType to scoped enum
and drop duplicate definition in framework.
Change-Id: I6cb95241e659ad58429bffeaaf2f95b07ad12df6
Reviewed-on: https://gerrit.libreoffice.org/25400
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/bitmap/CommandImageResolver.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/bitmap/CommandImageResolver.cxx b/vcl/source/bitmap/CommandImageResolver.cxx index f9143b072025..90a5044e00d4 100644 --- a/vcl/source/bitmap/CommandImageResolver.cxx +++ b/vcl/source/bitmap/CommandImageResolver.cxx @@ -21,7 +21,7 @@ namespace vcl namespace { -const char* ImageType_Prefixes[ImageType_COUNT] = +static const o3tl::enumarray<ImageType, const char*> ImageType_Prefixes = { "cmd/sc_", "cmd/lc_" @@ -121,7 +121,7 @@ bool CommandImageResolver::hasImage(const OUString& rCommandURL) return pIterator != m_aCommandToImageNameMap.end(); } -ImageList* CommandImageResolver::getImageList(sal_Int16 nImageType) +ImageList* CommandImageResolver::getImageList(ImageType nImageType) { const OUString sIconTheme = Application::GetSettings().GetStyleSettings().DetermineIconTheme(); @@ -144,7 +144,7 @@ ImageList* CommandImageResolver::getImageList(sal_Int16 nImageType) return m_pImageList[nImageType]; } -Image CommandImageResolver::getImageFromCommandURL(sal_Int16 nImageType, const OUString& rCommandURL) +Image CommandImageResolver::getImageFromCommandURL(ImageType nImageType, const OUString& rCommandURL) { CommandToImageNameMap::const_iterator pIterator = m_aCommandToImageNameMap.find(rCommandURL); if (pIterator != m_aCommandToImageNameMap.end()) |