diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-10-19 15:53:45 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-10-20 10:39:28 +0200 |
| commit | 06eb767c39d8e426aaaa98ce8497d0d3fb867c2b (patch) | |
| tree | 547cb76e71712f79b1f97bccd5dde201d1cf6d2d | |
| parent | 07a70e84f21ef2a69d8b7a69a1bd3844a0c362f5 (diff) | |
Turn LanguageTag::ScriptType into scoped enum
...to avoid -Werror,-Wshadow from Clang trunk with
<https://reviews.llvm.org/D52400> "Improve -Wshadow warnings with enumerators",
warning about shadowing of UNKNOWN in e.g. enum ESCHER_BlibType in
include/filter/msfilter/escherex.hxx
Change-Id: Id6608474e76730be4c439f480c31f661b8b5748e
Reviewed-on: https://gerrit.libreoffice.org/62013
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | i18nlangtag/source/languagetag/languagetag.cxx | 2 | ||||
| -rw-r--r-- | include/i18nlangtag/languagetag.hxx | 2 | ||||
| -rw-r--r-- | svtools/source/misc/langtab.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx index ba3d82cce475..c0e27492f912 100644 --- a/i18nlangtag/source/languagetag/languagetag.cxx +++ b/i18nlangtag/source/languagetag/languagetag.cxx @@ -673,7 +673,7 @@ LanguageTag::ScriptType LanguageTag::getOnTheFlyScriptType( LanguageType nRegist if (itID != rMapLangID.end()) return (*itID).second->getScriptType(); else - return UNKNOWN; + return ScriptType::UNKNOWN; } diff --git a/include/i18nlangtag/languagetag.hxx b/include/i18nlangtag/languagetag.hxx index 9f3dc877d9de..08fc60dac933 100644 --- a/include/i18nlangtag/languagetag.hxx +++ b/include/i18nlangtag/languagetag.hxx @@ -62,7 +62,7 @@ public: These need to correspond to the ExtraLanguages.ScriptType template property in officecfg/registry/schema/org/openoffice/VCL.xcs */ - enum ScriptType + enum class ScriptType { UNKNOWN = 0, WESTERN = 1, // Copies css::i18n::ScriptType for strong types diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index da486b63b90c..5ba340c2efc3 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -186,7 +186,7 @@ SvtLanguageTableImpl::SvtLanguageTableImpl() { LanguageTag aLang(rBcp47); LanguageType nLangType = aLang.getLanguageType(); - if (nType <= LanguageTag::ScriptType::RTL && nType > LanguageTag::ScriptType::UNKNOWN) + if (nType <= sal_Int32(LanguageTag::ScriptType::RTL) && nType > sal_Int32(LanguageTag::ScriptType::UNKNOWN)) aLang.setScriptType(LanguageTag::ScriptType(nType)); sal_uInt32 nPos = FindIndex(nLangType); if (nPos == RESARRAY_INDEX_NOTFOUND) |