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

[Stephan Bergmann (via logerrit)]

 sc/source/filter/xml/XMLStylesImportHelper.hxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c4efffba898a433cbd346f5f0e3859b3cd2a63f0
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon May 20 09:42:45 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon May 20 10:42:31 2019 +0200

    Don't invalidate iterators into ScMyStylesMap
    
    by changing it from std::unordered_map (to which it had been change from
    std::set in ecf456d067346d49d7e2a366434477fa7de06d8a "tdf#125254 Performance: A
    spreadsheet opens too slow, part3") to std::map.  CppunitTest_sc_bugfix_test had
    started to fail, at least when building against GCC trunk libstdc++ in debug
    mode (see my comment at <https://gerrit.libreoffice.org/#/c/72514/> "tdf#125254
    Performance: A spreadsheet opens too slow, part3" for details).
    
    Change-Id: I70d667fd008145107642bf780dc4ffe6acda947e
    Reviewed-on: https://gerrit.libreoffice.org/72582
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sc/source/filter/xml/XMLStylesImportHelper.hxx b/sc/source/filter/xml/XMLStylesImportHelper.hxx
index 5e3a9d1e67a7..7ec3fe99ecac 100644
--- a/sc/source/filter/xml/XMLStylesImportHelper.hxx
+++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx
@@ -27,7 +27,7 @@
 #include <list>
 #include <memory>
 #include <set>
-#include <unordered_map>
+#include <map>
 #include <vector>
 #include <boost/optional.hpp>
 
@@ -107,7 +107,7 @@ public:
 };
 
 /** map from style name to ScMyStyleRanges */
-typedef std::unordered_map<OUString, std::unique_ptr<ScMyStyleRanges>>  ScMyStylesMap;
+typedef std::map<OUString, std::unique_ptr<ScMyStyleRanges>>  ScMyStylesMap;
 
 class ScMyStylesImportHelper
 {