diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2020-10-24 11:56:03 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2020-10-25 09:56:06 +0100 |
| commit | bb23417ce4d5e757f497c07ddc24f87d91f60310 (patch) | |
| tree | d3a700423bff6d55f7ff5ada0ffa992ded4b9ae9 /svtools | |
| parent | f0b282b6edc6317b3768f85de5debbfba7bb0c2b (diff) | |
Replace list by vector in svtools/sampletext
Change-Id: I5ccff96e6369ff602e049dbaab1612574b729a4b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104750
Tested-by: Jenkins
Reviewed-by: DaeHyun Sung <sungdh86+git@gmail.com>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/misc/sampletext.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx index bf3b128b68fe..1cd48482bc62 100644 --- a/svtools/source/misc/sampletext.cxx +++ b/svtools/source/misc/sampletext.cxx @@ -14,7 +14,7 @@ #include <i18nutil/unicode.hxx> #include <sal/log.hxx> #include <com/sun/star/i18n/ScriptType.hpp> -#include <list> +#include <vector> #include <map> // This should only be used when a commonly used font incorrectly declares its @@ -1216,7 +1216,7 @@ namespace } } -const std::map<UScriptCode, std::list<OUString>> distCjkMap = +const std::map<UScriptCode, std::vector<OUString>> distCjkMap = { { USCRIPT_KOREAN, { " KR", "Korean"} }, // Korean { USCRIPT_JAPANESE, {" JP", "Japanese"} } , // Japanese @@ -1273,10 +1273,10 @@ namespace // for the last time, Check the ISO code strings or font specific strings const OUString &rName = rDevice.GetFont().GetFamilyName(); - std::map<UScriptCode, std::list<OUString>>::const_iterator distCjkMapIt; + std::map<UScriptCode, std::vector<OUString>>::const_iterator distCjkMapIt; for (distCjkMapIt = distCjkMap.begin(); distCjkMapIt != distCjkMap.end(); ++distCjkMapIt) { - std::list<OUString> cjkCodeList = distCjkMapIt->second; - std::list<OUString>::const_iterator cjkPtr; + std::vector<OUString> cjkCodeList = distCjkMapIt->second; + std::vector<OUString>::const_iterator cjkPtr; for (cjkPtr = cjkCodeList.begin(); cjkPtr != cjkCodeList.end(); ++cjkPtr) { if (rName.indexOf(*cjkPtr) > 0) { return distCjkMapIt->first; |