[Libreoffice-commits] core.git: i18npool/source

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Wed Oct 28 19:47:05 UTC 2020


 i18npool/source/localedata/LocaleNode.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit a6c2ba4746a0ca94b3060be714e424f4be8667bf
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Wed Oct 28 17:54:46 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Oct 28 20:46:11 2020 +0100

    std::set->o3tl::sorted_vector in LocaleNode
    
    Change-Id: I633d396bb2cbeaa6829de543fab6ce3726ad11ed
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104968
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index 93c6b461e77f..aeceec1a5d25 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -23,6 +23,7 @@
 #include <memory>
 #include <set>
 #include <vector>
+#include <o3tl/sorted_vector.hxx>
 
 #include <rtl/ustrbuf.hxx>
 #include <sal/macros.h>
@@ -37,8 +38,8 @@
 // NOTE: MUST match the Locale versionDTD attribute defined in data/locale.dtd
 #define LOCALE_VERSION_DTD "2.0.3"
 
-typedef ::std::set< OUString > NameSet;
-typedef ::std::set< sal_Int16 > ValueSet;
+typedef ::o3tl::sorted_vector< OUString > NameSet;
+typedef ::o3tl::sorted_vector< sal_Int16 > ValueSet;
 
 namespace cssi = ::com::sun::star::i18n;
 
@@ -827,7 +828,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
     if (bShowNextFreeFormatIndex)
     {
         sal_Int16 nNext = i18npool::nFirstFreeFormatIndex;
-        std::set<sal_Int16>::const_iterator it( aFormatIndexSet.find( nNext));
+        auto it = aFormatIndexSet.find( nNext);
         if (it != aFormatIndexSet.end())
         {
             // nFirstFreeFormatIndex already used, find next free including gaps.


More information about the Libreoffice-commits mailing list