oox/source/drawingml/table/predefined-table-styles.cxx |  352 ++++++++---------
 1 file changed, 175 insertions(+), 177 deletions(-)

New commits:
commit 54fced70718828bb73f5485b54445501ebf4fcdc
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Thu Apr 25 20:46:31 2024 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Apr 26 12:09:27 2024 +0200

    mStyleIdMap can be static const
    
    Change-Id: I4df2b1152605c175d7959b6739ba0068539bed6b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166649
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/oox/source/drawingml/table/predefined-table-styles.cxx 
b/oox/source/drawingml/table/predefined-table-styles.cxx
index 3e821456e3b3..6ca69eb958e4 100644
--- a/oox/source/drawingml/table/predefined-table-styles.cxx
+++ b/oox/source/drawingml/table/predefined-table-styles.cxx
@@ -11,6 +11,7 @@
 #include <frozen/bits/defines.h>
 #include <frozen/bits/elsa_std.h>
 #include <frozen/unordered_map.h>
+#include <unordered_map>
 
 using namespace oox;
 using namespace oox::drawingml::table;
@@ -29,173 +30,170 @@ using namespace oox::drawingml::table;
  * and change something easily when some styles change.
  */
 
-std::map<OUString, std::pair<OUString, OUString>> mStyleIdMap;
-
 // Create style-id map for using similar attributes of the groups.
 // (style ids used from here: 
https://docs.microsoft.com/en-us/previous-versions/office/developer/office-2010/hh273476(v=office.14)?redirectedfrom=MSDN)
 // and checked all of them.
 
-static void createStyleIdMap()
-{
-    mStyleIdMap[OUString("{2D5ABB26-0587-4C30-8999-92F81FD0307C}")]
-        = std::make_pair(OUString("Themed-Style-1"), OUString(""));
-    mStyleIdMap[OUString("{3C2FFA5D-87B4-456A-9821-1D502468CF0F}")]
-        = std::make_pair(OUString("Themed-Style-1"), OUString("Accent1"));
-    mStyleIdMap[OUString("{284E427A-3D55-4303-BF80-6455036E1DE7}")]
-        = std::make_pair(OUString("Themed-Style-1"), OUString("Accent2"));
-    mStyleIdMap[OUString("{69C7853C-536D-4A76-A0AE-DD22124D55A5}")]
-        = std::make_pair(OUString("Themed-Style-1"), OUString("Accent3"));
-    mStyleIdMap[OUString("{775DCB02-9BB8-47FD-8907-85C794F793BA}")]
-        = std::make_pair(OUString("Themed-Style-1"), OUString("Accent4"));
-    mStyleIdMap[OUString("{35758FB7-9AC5-4552-8A53-C91805E547FA}")]
-        = std::make_pair(OUString("Themed-Style-1"), OUString("Accent5"));
-    mStyleIdMap[OUString("{08FB837D-C827-4EFA-A057-4D05807E0F7C}")]
-        = std::make_pair(OUString("Themed-Style-1"), OUString("Accent6"));
-
-    mStyleIdMap[OUString("{5940675A-B579-460E-94D1-54222C63F5DA}")]
-        = std::make_pair(OUString("Themed-Style-2"), OUString(""));
-    mStyleIdMap[OUString("{D113A9D2-9D6B-4929-AA2D-F23B5EE8CBE7}")]
-        = std::make_pair(OUString("Themed-Style-2"), OUString("Accent1"));
-    mStyleIdMap[OUString("{18603FDC-E32A-4AB5-989C-0864C3EAD2B8}")]
-        = std::make_pair(OUString("Themed-Style-2"), OUString("Accent2"));
-    mStyleIdMap[OUString("{306799F8-075E-4A3A-A7F6-7FBC6576F1A4}")]
-        = std::make_pair(OUString("Themed-Style-2"), OUString("Accent3"));
-    mStyleIdMap[OUString("{E269D01E-BC32-4049-B463-5C60D7B0CCD2}")]
-        = std::make_pair(OUString("Themed-Style-2"), OUString("Accent4"));
-    mStyleIdMap[OUString("{327F97BB-C833-4FB7-BDE5-3F7075034690}")]
-        = std::make_pair(OUString("Themed-Style-2"), OUString("Accent5"));
-    mStyleIdMap[OUString("{638B1855-1B75-4FBE-930C-398BA8C253C6}")]
-        = std::make_pair(OUString("Themed-Style-2"), OUString("Accent6"));
-
-    mStyleIdMap[OUString("{9D7B26C5-4107-4FEC-AEDC-1716B250A1EF}")]
-        = std::make_pair(OUString("Light-Style-1"), OUString(""));
-    mStyleIdMap[OUString("{3B4B98B0-60AC-42C2-AFA5-B58CD77FA1E5}")]
-        = std::make_pair(OUString("Light-Style-1"), OUString("Accent1"));
-    mStyleIdMap[OUString("{0E3FDE45-AF77-4B5C-9715-49D594BDF05E}")]
-        = std::make_pair(OUString("Light-Style-1"), OUString("Accent2"));
-    mStyleIdMap[OUString("{C083E6E3-FA7D-4D7B-A595-EF9225AFEA82}")]
-        = std::make_pair(OUString("Light-Style-1"), OUString("Accent3"));
-    mStyleIdMap[OUString("{D27102A9-8310-4765-A935-A1911B00CA55}")]
-        = std::make_pair(OUString("Light-Style-1"), OUString("Accent4"));
-    mStyleIdMap[OUString("{5FD0F851-EC5A-4D38-B0AD-8093EC10F338}")]
-        = std::make_pair(OUString("Light-Style-1"), OUString("Accent5"));
-    mStyleIdMap[OUString("{68D230F3-CF80-4859-8CE7-A43EE81993B5}")]
-        = std::make_pair(OUString("Light-Style-1"), OUString("Accent6"));
-
-    mStyleIdMap[OUString("{7E9639D4-E3E2-4D34-9284-5A2195B3D0D7}")]
-        = std::make_pair(OUString("Light-Style-2"), OUString(""));
-    mStyleIdMap[OUString("{69012ECD-51FC-41F1-AA8D-1B2483CD663E}")]
-        = std::make_pair(OUString("Light-Style-2"), OUString("Accent1"));
-    mStyleIdMap[OUString("{72833802-FEF1-4C79-8D5D-14CF1EAF98D9}")]
-        = std::make_pair(OUString("Light-Style-2"), OUString("Accent2"));
-    mStyleIdMap[OUString("{F2DE63D5-997A-4646-A377-4702673A728D}")]
-        = std::make_pair(OUString("Light-Style-2"), OUString("Accent3"));
-    mStyleIdMap[OUString("{17292A2E-F333-43FB-9621-5CBBE7FDCDCB}")]
-        = std::make_pair(OUString("Light-Style-2"), OUString("Accent4"));
-    mStyleIdMap[OUString("{5A111915-BE36-4E01-A7E5-04B1672EAD32}")]
-        = std::make_pair(OUString("Light-Style-2"), OUString("Accent5"));
-    mStyleIdMap[OUString("{912C8C85-51F0-491E-9774-3900AFEF0FD7}")]
-        = std::make_pair(OUString("Light-Style-2"), OUString("Accent6"));
-
-    mStyleIdMap[OUString("{616DA210-FB5B-4158-B5E0-FEB733F419BA}")]
-        = std::make_pair(OUString("Light-Style-3"), OUString(""));
-    mStyleIdMap[OUString("{BC89EF96-8CEA-46FF-86C4-4CE0E7609802}")]
-        = std::make_pair(OUString("Light-Style-3"), OUString("Accent1"));
-    mStyleIdMap[OUString("{5DA37D80-6434-44D0-A028-1B22A696006F}")]
-        = std::make_pair(OUString("Light-Style-3"), OUString("Accent2"));
-    mStyleIdMap[OUString("{8799B23B-EC83-4686-B30A-512413B5E67A}")]
-        = std::make_pair(OUString("Light-Style-3"), OUString("Accent3"));
-    mStyleIdMap[OUString("{ED083AE6-46FA-4A59-8FB0-9F97EB10719F}")]
-        = std::make_pair(OUString("Light-Style-3"), OUString("Accent4"));
-    mStyleIdMap[OUString("{BDBED569-4797-4DF1-A0F4-6AAB3CD982D8}")]
-        = std::make_pair(OUString("Light-Style-3"), OUString("Accent5"));
-    mStyleIdMap[OUString("{E8B1032C-EA38-4F05-BA0D-38AFFFC7BED3}")]
-        = std::make_pair(OUString("Light-Style-3"), OUString("Accent6"));
-
-    mStyleIdMap[OUString("{793D81CF-94F2-401A-BA57-92F5A7B2D0C5}")]
-        = std::make_pair(OUString("Medium-Style-1"), OUString(""));
-    mStyleIdMap[OUString("{B301B821-A1FF-4177-AEE7-76D212191A09}")]
-        = std::make_pair(OUString("Medium-Style-1"), OUString("Accent1"));
-    mStyleIdMap[OUString("{9DCAF9ED-07DC-4A11-8D7F-57B35C25682E}")]
-        = std::make_pair(OUString("Medium-Style-1"), OUString("Accent2"));
-    mStyleIdMap[OUString("{1FECB4D8-DB02-4DC6-A0A2-4F2EBAE1DC90}")]
-        = std::make_pair(OUString("Medium-Style-1"), OUString("Accent3"));
-    mStyleIdMap[OUString("{1E171933-4619-4E11-9A3F-F7608DF75F80}")]
-        = std::make_pair(OUString("Medium-Style-1"), OUString("Accent4"));
-    mStyleIdMap[OUString("{FABFCF23-3B69-468F-B69F-88F6DE6A72F2}")]
-        = std::make_pair(OUString("Medium-Style-1"), OUString("Accent5"));
-    mStyleIdMap[OUString("{10A1B5D5-9B99-4C35-A422-299274C87663}")]
-        = std::make_pair(OUString("Medium-Style-1"), OUString("Accent6"));
-
-    mStyleIdMap[OUString("{073A0DAA-6AF3-43AB-8588-CEC1D06C72B9}")]
-        = std::make_pair(OUString("Medium-Style-2"), OUString(""));
-    mStyleIdMap[OUString("{5C22544A-7EE6-4342-B048-85BDC9FD1C3A}")]
-        = std::make_pair(OUString("Medium-Style-2"), OUString("Accent1"));
-    mStyleIdMap[OUString("{21E4AEA4-8DFA-4A89-87EB-49C32662AFE0}")]
-        = std::make_pair(OUString("Medium-Style-2"), OUString("Accent2"));
-    mStyleIdMap[OUString("{F5AB1C69-6EDB-4FF4-983F-18BD219EF322}")]
-        = std::make_pair(OUString("Medium-Style-2"), OUString("Accent3"));
-    mStyleIdMap[OUString("{00A15C55-8517-42AA-B614-E9B94910E393}")]
-        = std::make_pair(OUString("Medium-Style-2"), OUString("Accent4"));
-    mStyleIdMap[OUString("{7DF18680-E054-41AD-8BC1-D1AEF772440D}")]
-        = std::make_pair(OUString("Medium-Style-2"), OUString("Accent5"));
-    mStyleIdMap[OUString("{93296810-A885-4BE3-A3E7-6D5BEEA58F35}")]
-        = std::make_pair(OUString("Medium-Style-2"), OUString("Accent6"));
-
-    mStyleIdMap[OUString("{8EC20E35-A176-4012-BC5E-935CFFF8708E}")]
-        = std::make_pair(OUString("Medium-Style-3"), OUString(""));
-    mStyleIdMap[OUString("{6E25E649-3F16-4E02-A733-19D2CDBF48F0}")]
-        = std::make_pair(OUString("Medium-Style-3"), OUString("Accent1"));
-    mStyleIdMap[OUString("{85BE263C-DBD7-4A20-BB59-AAB30ACAA65A}")]
-        = std::make_pair(OUString("Medium-Style-3"), OUString("Accent2"));
-    mStyleIdMap[OUString("{EB344D84-9AFB-497E-A393-DC336BA19D2E}")]
-        = std::make_pair(OUString("Medium-Style-3"), OUString("Accent3"));
-    mStyleIdMap[OUString("{EB9631B5-78F2-41C9-869B-9F39066F8104}")]
-        = std::make_pair(OUString("Medium-Style-3"), OUString("Accent4"));
-    mStyleIdMap[OUString("{74C1A8A3-306A-4EB7-A6B1-4F7E0EB9C5D6}")]
-        = std::make_pair(OUString("Medium-Style-3"), OUString("Accent5"));
-    mStyleIdMap[OUString("{2A488322-F2BA-4B5B-9748-0D474271808F}")]
-        = std::make_pair(OUString("Medium-Style-3"), OUString("Accent6"));
-
-    mStyleIdMap[OUString("{D7AC3CCA-C797-4891-BE02-D94E43425B78}")]
-        = std::make_pair(OUString("Medium-Style-4"), OUString(""));
-    mStyleIdMap[OUString("{69CF1AB2-1976-4502-BF36-3FF5EA218861}")]
-        = std::make_pair(OUString("Medium-Style-4"), OUString("Accent1"));
-    mStyleIdMap[OUString("{8A107856-5554-42FB-B03E-39F5DBC370BA}")]
-        = std::make_pair(OUString("Medium-Style-4"), OUString("Accent2"));
-    mStyleIdMap[OUString("{0505E3EF-67EA-436B-97B2-0124C06EBD24}")]
-        = std::make_pair(OUString("Medium-Style-4"), OUString("Accent3"));
-    mStyleIdMap[OUString("{C4B1156A-380E-4F78-BDF5-A606A8083BF9}")]
-        = std::make_pair(OUString("Medium-Style-4"), OUString("Accent4"));
-    mStyleIdMap[OUString("{22838BEF-8BB2-4498-84A7-C5851F593DF1}")]
-        = std::make_pair(OUString("Medium-Style-4"), OUString("Accent5"));
-    mStyleIdMap[OUString("{16D9F66E-5EB9-4882-86FB-DCBF35E3C3E4}")]
-        = std::make_pair(OUString("Medium-Style-4"), OUString("Accent6"));
-
-    mStyleIdMap[OUString("{E8034E78-7F5D-4C2E-B375-FC64B27BC917}")]
-        = std::make_pair(OUString("Dark-Style-1"), OUString(""));
-    mStyleIdMap[OUString("{125E5076-3810-47DD-B79F-674D7AD40C01}")]
-        = std::make_pair(OUString("Dark-Style-1"), OUString("Accent1"));
-    mStyleIdMap[OUString("{37CE84F3-28C3-443E-9E96-99CF82512B78}")]
-        = std::make_pair(OUString("Dark-Style-1"), OUString("Accent2"));
-    mStyleIdMap[OUString("{D03447BB-5D67-496B-8E87-E561075AD55C}")]
-        = std::make_pair(OUString("Dark-Style-1"), OUString("Accent3"));
-    mStyleIdMap[OUString("{E929F9F4-4A8F-4326-A1B4-22849713DDAB}")]
-        = std::make_pair(OUString("Dark-Style-1"), OUString("Accent4"));
-    mStyleIdMap[OUString("{8FD4443E-F989-4FC4-A0C8-D5A2AF1F390B}")]
-        = std::make_pair(OUString("Dark-Style-1"), OUString("Accent5"));
-    mStyleIdMap[OUString("{AF606853-7671-496A-8E4F-DF71F8EC918B}")]
-        = std::make_pair(OUString("Dark-Style-1"), OUString("Accent6"));
-
-    mStyleIdMap[OUString("{5202B0CA-FC54-4496-8BCA-5EF66A818D29}")]
-        = std::make_pair(OUString("Dark-Style-2"), OUString(""));
-    mStyleIdMap[OUString("{0660B408-B3CF-4A94-85FC-2B1E0A45F4A2}")]
-        = std::make_pair(OUString("Dark-Style-2"), OUString("Accent1"));
-    mStyleIdMap[OUString("{91EBBBCC-DAD2-459C-BE2E-F6DE35CF9A28}")]
-        = std::make_pair(OUString("Dark-Style-2"), OUString("Accent3"));
-    mStyleIdMap[OUString("{46F890A9-2807-4EBB-B81D-B2AA78EC7F39}")]
-        = std::make_pair(OUString("Dark-Style-2"), OUString("Accent5"));
-}
+const std::unordered_map<OUString, std::pair<OUString, OUString>> mStyleIdMap{
+    { u"{2D5ABB26-0587-4C30-8999-92F81FD0307C}"_ustr,
+      std::make_pair(u"Themed-Style-1"_ustr, u""_ustr) },
+    { u"{3C2FFA5D-87B4-456A-9821-1D502468CF0F}"_ustr,
+      std::make_pair(u"Themed-Style-1"_ustr, u"Accent1"_ustr) },
+    { u"{284E427A-3D55-4303-BF80-6455036E1DE7}"_ustr,
+      std::make_pair(u"Themed-Style-1"_ustr, u"Accent2"_ustr) },
+    { u"{69C7853C-536D-4A76-A0AE-DD22124D55A5}"_ustr,
+      std::make_pair(u"Themed-Style-1"_ustr, u"Accent3"_ustr) },
+    { u"{775DCB02-9BB8-47FD-8907-85C794F793BA}"_ustr,
+      std::make_pair(u"Themed-Style-1"_ustr, u"Accent4"_ustr) },
+    { u"{35758FB7-9AC5-4552-8A53-C91805E547FA}"_ustr,
+      std::make_pair(u"Themed-Style-1"_ustr, u"Accent5"_ustr) },
+    { u"{08FB837D-C827-4EFA-A057-4D05807E0F7C}"_ustr,
+      std::make_pair(u"Themed-Style-1"_ustr, u"Accent6"_ustr) },
+
+    { u"{5940675A-B579-460E-94D1-54222C63F5DA}"_ustr,
+      std::make_pair(u"Themed-Style-2"_ustr, u""_ustr) },
+    { u"{D113A9D2-9D6B-4929-AA2D-F23B5EE8CBE7}"_ustr,
+      std::make_pair(u"Themed-Style-2"_ustr, u"Accent1"_ustr) },
+    { u"{18603FDC-E32A-4AB5-989C-0864C3EAD2B8}"_ustr,
+      std::make_pair(u"Themed-Style-2"_ustr, u"Accent2"_ustr) },
+    { u"{306799F8-075E-4A3A-A7F6-7FBC6576F1A4}"_ustr,
+      std::make_pair(u"Themed-Style-2"_ustr, u"Accent3"_ustr) },
+    { u"{E269D01E-BC32-4049-B463-5C60D7B0CCD2}"_ustr,
+      std::make_pair(u"Themed-Style-2"_ustr, u"Accent4"_ustr) },
+    { u"{327F97BB-C833-4FB7-BDE5-3F7075034690}"_ustr,
+      std::make_pair(u"Themed-Style-2"_ustr, u"Accent5"_ustr) },
+    { u"{638B1855-1B75-4FBE-930C-398BA8C253C6}"_ustr,
+      std::make_pair(u"Themed-Style-2"_ustr, u"Accent6"_ustr) },
+
+    { u"{9D7B26C5-4107-4FEC-AEDC-1716B250A1EF}"_ustr,
+      std::make_pair(u"Light-Style-1"_ustr, u""_ustr) },
+    { u"{3B4B98B0-60AC-42C2-AFA5-B58CD77FA1E5}"_ustr,
+      std::make_pair(u"Light-Style-1"_ustr, u"Accent1"_ustr) },
+    { u"{0E3FDE45-AF77-4B5C-9715-49D594BDF05E}"_ustr,
+      std::make_pair(u"Light-Style-1"_ustr, u"Accent2"_ustr) },
+    { u"{C083E6E3-FA7D-4D7B-A595-EF9225AFEA82}"_ustr,
+      std::make_pair(u"Light-Style-1"_ustr, u"Accent3"_ustr) },
+    { u"{D27102A9-8310-4765-A935-A1911B00CA55}"_ustr,
+      std::make_pair(u"Light-Style-1"_ustr, u"Accent4"_ustr) },
+    { u"{5FD0F851-EC5A-4D38-B0AD-8093EC10F338}"_ustr,
+      std::make_pair(u"Light-Style-1"_ustr, u"Accent5"_ustr) },
+    { u"{68D230F3-CF80-4859-8CE7-A43EE81993B5}"_ustr,
+      std::make_pair(u"Light-Style-1"_ustr, u"Accent6"_ustr) },
+
+    { u"{7E9639D4-E3E2-4D34-9284-5A2195B3D0D7}"_ustr,
+      std::make_pair(u"Light-Style-2"_ustr, u""_ustr) },
+    { u"{69012ECD-51FC-41F1-AA8D-1B2483CD663E}"_ustr,
+      std::make_pair(u"Light-Style-2"_ustr, u"Accent1"_ustr) },
+    { u"{72833802-FEF1-4C79-8D5D-14CF1EAF98D9}"_ustr,
+      std::make_pair(u"Light-Style-2"_ustr, u"Accent2"_ustr) },
+    { u"{F2DE63D5-997A-4646-A377-4702673A728D}"_ustr,
+      std::make_pair(u"Light-Style-2"_ustr, u"Accent3"_ustr) },
+    { u"{17292A2E-F333-43FB-9621-5CBBE7FDCDCB}"_ustr,
+      std::make_pair(u"Light-Style-2"_ustr, u"Accent4"_ustr) },
+    { u"{5A111915-BE36-4E01-A7E5-04B1672EAD32}"_ustr,
+      std::make_pair(u"Light-Style-2"_ustr, u"Accent5"_ustr) },
+    { u"{912C8C85-51F0-491E-9774-3900AFEF0FD7}"_ustr,
+      std::make_pair(u"Light-Style-2"_ustr, u"Accent6"_ustr) },
+
+    { u"{616DA210-FB5B-4158-B5E0-FEB733F419BA}"_ustr,
+      std::make_pair(u"Light-Style-3"_ustr, u""_ustr) },
+    { u"{BC89EF96-8CEA-46FF-86C4-4CE0E7609802}"_ustr,
+      std::make_pair(u"Light-Style-3"_ustr, u"Accent1"_ustr) },
+    { u"{5DA37D80-6434-44D0-A028-1B22A696006F}"_ustr,
+      std::make_pair(u"Light-Style-3"_ustr, u"Accent2"_ustr) },
+    { u"{8799B23B-EC83-4686-B30A-512413B5E67A}"_ustr,
+      std::make_pair(u"Light-Style-3"_ustr, u"Accent3"_ustr) },
+    { u"{ED083AE6-46FA-4A59-8FB0-9F97EB10719F}"_ustr,
+      std::make_pair(u"Light-Style-3"_ustr, u"Accent4"_ustr) },
+    { u"{BDBED569-4797-4DF1-A0F4-6AAB3CD982D8}"_ustr,
+      std::make_pair(u"Light-Style-3"_ustr, u"Accent5"_ustr) },
+    { u"{E8B1032C-EA38-4F05-BA0D-38AFFFC7BED3}"_ustr,
+      std::make_pair(u"Light-Style-3"_ustr, u"Accent6"_ustr) },
+
+    { u"{793D81CF-94F2-401A-BA57-92F5A7B2D0C5}"_ustr,
+      std::make_pair(u"Medium-Style-1"_ustr, u""_ustr) },
+    { u"{B301B821-A1FF-4177-AEE7-76D212191A09}"_ustr,
+      std::make_pair(u"Medium-Style-1"_ustr, u"Accent1"_ustr) },
+    { u"{9DCAF9ED-07DC-4A11-8D7F-57B35C25682E}"_ustr,
+      std::make_pair(u"Medium-Style-1"_ustr, u"Accent2"_ustr) },
+    { u"{1FECB4D8-DB02-4DC6-A0A2-4F2EBAE1DC90}"_ustr,
+      std::make_pair(u"Medium-Style-1"_ustr, u"Accent3"_ustr) },
+    { u"{1E171933-4619-4E11-9A3F-F7608DF75F80}"_ustr,
+      std::make_pair(u"Medium-Style-1"_ustr, u"Accent4"_ustr) },
+    { u"{FABFCF23-3B69-468F-B69F-88F6DE6A72F2}"_ustr,
+      std::make_pair(u"Medium-Style-1"_ustr, u"Accent5"_ustr) },
+    { u"{10A1B5D5-9B99-4C35-A422-299274C87663}"_ustr,
+      std::make_pair(u"Medium-Style-1"_ustr, u"Accent6"_ustr) },
+
+    { u"{073A0DAA-6AF3-43AB-8588-CEC1D06C72B9}"_ustr,
+      std::make_pair(u"Medium-Style-2"_ustr, u""_ustr) },
+    { u"{5C22544A-7EE6-4342-B048-85BDC9FD1C3A}"_ustr,
+      std::make_pair(u"Medium-Style-2"_ustr, u"Accent1"_ustr) },
+    { u"{21E4AEA4-8DFA-4A89-87EB-49C32662AFE0}"_ustr,
+      std::make_pair(u"Medium-Style-2"_ustr, u"Accent2"_ustr) },
+    { u"{F5AB1C69-6EDB-4FF4-983F-18BD219EF322}"_ustr,
+      std::make_pair(u"Medium-Style-2"_ustr, u"Accent3"_ustr) },
+    { u"{00A15C55-8517-42AA-B614-E9B94910E393}"_ustr,
+      std::make_pair(u"Medium-Style-2"_ustr, u"Accent4"_ustr) },
+    { u"{7DF18680-E054-41AD-8BC1-D1AEF772440D}"_ustr,
+      std::make_pair(u"Medium-Style-2"_ustr, u"Accent5"_ustr) },
+    { u"{93296810-A885-4BE3-A3E7-6D5BEEA58F35}"_ustr,
+      std::make_pair(u"Medium-Style-2"_ustr, u"Accent6"_ustr) },
+
+    { u"{8EC20E35-A176-4012-BC5E-935CFFF8708E}"_ustr,
+      std::make_pair(u"Medium-Style-3"_ustr, u""_ustr) },
+    { u"{6E25E649-3F16-4E02-A733-19D2CDBF48F0}"_ustr,
+      std::make_pair(u"Medium-Style-3"_ustr, u"Accent1"_ustr) },
+    { u"{85BE263C-DBD7-4A20-BB59-AAB30ACAA65A}"_ustr,
+      std::make_pair(u"Medium-Style-3"_ustr, u"Accent2"_ustr) },
+    { u"{EB344D84-9AFB-497E-A393-DC336BA19D2E}"_ustr,
+      std::make_pair(u"Medium-Style-3"_ustr, u"Accent3"_ustr) },
+    { u"{EB9631B5-78F2-41C9-869B-9F39066F8104}"_ustr,
+      std::make_pair(u"Medium-Style-3"_ustr, u"Accent4"_ustr) },
+    { u"{74C1A8A3-306A-4EB7-A6B1-4F7E0EB9C5D6}"_ustr,
+      std::make_pair(u"Medium-Style-3"_ustr, u"Accent5"_ustr) },
+    { u"{2A488322-F2BA-4B5B-9748-0D474271808F}"_ustr,
+      std::make_pair(u"Medium-Style-3"_ustr, u"Accent6"_ustr) },
+
+    { u"{D7AC3CCA-C797-4891-BE02-D94E43425B78}"_ustr,
+      std::make_pair(u"Medium-Style-4"_ustr, u""_ustr) },
+    { u"{69CF1AB2-1976-4502-BF36-3FF5EA218861}"_ustr,
+      std::make_pair(u"Medium-Style-4"_ustr, u"Accent1"_ustr) },
+    { u"{8A107856-5554-42FB-B03E-39F5DBC370BA}"_ustr,
+      std::make_pair(u"Medium-Style-4"_ustr, u"Accent2"_ustr) },
+    { u"{0505E3EF-67EA-436B-97B2-0124C06EBD24}"_ustr,
+      std::make_pair(u"Medium-Style-4"_ustr, u"Accent3"_ustr) },
+    { u"{C4B1156A-380E-4F78-BDF5-A606A8083BF9}"_ustr,
+      std::make_pair(u"Medium-Style-4"_ustr, u"Accent4"_ustr) },
+    { u"{22838BEF-8BB2-4498-84A7-C5851F593DF1}"_ustr,
+      std::make_pair(u"Medium-Style-4"_ustr, u"Accent5"_ustr) },
+    { u"{16D9F66E-5EB9-4882-86FB-DCBF35E3C3E4}"_ustr,
+      std::make_pair(u"Medium-Style-4"_ustr, u"Accent6"_ustr) },
+
+    { u"{E8034E78-7F5D-4C2E-B375-FC64B27BC917}"_ustr,
+      std::make_pair(u"Dark-Style-1"_ustr, u""_ustr) },
+    { u"{125E5076-3810-47DD-B79F-674D7AD40C01}"_ustr,
+      std::make_pair(u"Dark-Style-1"_ustr, u"Accent1"_ustr) },
+    { u"{37CE84F3-28C3-443E-9E96-99CF82512B78}"_ustr,
+      std::make_pair(u"Dark-Style-1"_ustr, u"Accent2"_ustr) },
+    { u"{D03447BB-5D67-496B-8E87-E561075AD55C}"_ustr,
+      std::make_pair(u"Dark-Style-1"_ustr, u"Accent3"_ustr) },
+    { u"{E929F9F4-4A8F-4326-A1B4-22849713DDAB}"_ustr,
+      std::make_pair(u"Dark-Style-1"_ustr, u"Accent4"_ustr) },
+    { u"{8FD4443E-F989-4FC4-A0C8-D5A2AF1F390B}"_ustr,
+      std::make_pair(u"Dark-Style-1"_ustr, u"Accent5"_ustr) },
+    { u"{AF606853-7671-496A-8E4F-DF71F8EC918B}"_ustr,
+      std::make_pair(u"Dark-Style-1"_ustr, u"Accent6"_ustr) },
+
+    { u"{5202B0CA-FC54-4496-8BCA-5EF66A818D29}"_ustr,
+      std::make_pair(u"Dark-Style-2"_ustr, u""_ustr) },
+    { u"{0660B408-B3CF-4A94-85FC-2B1E0A45F4A2}"_ustr,
+      std::make_pair(u"Dark-Style-2"_ustr, u"Accent1"_ustr) },
+    { u"{91EBBBCC-DAD2-459C-BE2E-F6DE35CF9A28}"_ustr,
+      std::make_pair(u"Dark-Style-2"_ustr, u"Accent3"_ustr) },
+    { u"{46F890A9-2807-4EBB-B81D-B2AA78EC7F39}"_ustr,
+      std::make_pair(u"Dark-Style-2"_ustr, u"Accent5"_ustr) }
+};
 
 constexpr frozen::unordered_map<std::u16string_view, sal_Int32, 6> tokens{
     { u"Accent1", XML_accent1 }, { u"Accent2", XML_accent2 }, { u"Accent3", 
XML_accent3 },
@@ -227,7 +225,6 @@ void insertBorderLine(TableStylePart& aTableStylePart, 
sal_Int32 nToken,
 
 std::unique_ptr<TableStyle> CreateTableStyle(const OUString& styleId)
 {
-    createStyleIdMap();
     std::unique_ptr<TableStyle> pTableStyle;
     pTableStyle.reset(new TableStyle());
 
@@ -424,8 +421,9 @@ std::unique_ptr<TableStyle> CreateTableStyle(const 
OUString& styleId)
 
     // Start to handle all style groups.
 
-    OUString style_name = mStyleIdMap[styleId].first;
-    OUString accent_name = mStyleIdMap[styleId].second;
+    auto it = mStyleIdMap.find(styleId);
+    OUString style_name = it->second.first;
+    OUString accent_name = it->second.second;
 
     if (style_name == "Themed-Style-1")
     {
@@ -456,7 +454,7 @@ std::unique_ptr<TableStyle> CreateTableStyle(const 
OUString& styleId)
             setBorderLineType(pLastColBottomBorder, XML_solidFill);
             setBorderLineType(pLastColInsideHBorder, XML_solidFill);
 
-            sal_Int32 accent_val = resolveToken(mStyleIdMap[styleId].second);
+            sal_Int32 accent_val = 
resolveToken(mStyleIdMap.find(styleId)->second.second);
 
             wholeTblTextColor.setSchemeClr(XML_dk1);
             firstRowTextColor.setSchemeClr(XML_lt1);
@@ -521,7 +519,7 @@ std::unique_ptr<TableStyle> CreateTableStyle(const 
OUString& styleId)
             wholeTblTextColor.setSchemeClr(XML_lt1);
             firstRowTextColor.setSchemeClr(XML_lt1);
 
-            accent_val = resolveToken(mStyleIdMap[styleId].second);
+            accent_val = 
resolveToken(mStyleIdMap.find(styleId)->second.second);
 
             pTblBgFillProperties->maFillColor.setSchemeClr(accent_val);
             
pFirstRowBottomBorder->maLineFill.maFillColor.setSchemeClr(XML_lt1);
@@ -572,7 +570,7 @@ std::unique_ptr<TableStyle> CreateTableStyle(const 
OUString& styleId)
         sal_Int32 accent_val;
 
         if (!accent_name.isEmpty())
-            accent_val = resolveToken(mStyleIdMap[styleId].second);
+            accent_val = 
resolveToken(mStyleIdMap.find(styleId)->second.second);
         else
             accent_val = XML_tx1;
 
@@ -607,7 +605,7 @@ std::unique_ptr<TableStyle> CreateTableStyle(const 
OUString& styleId)
         sal_Int32 accent_val;
 
         if (!accent_name.isEmpty())
-            accent_val = resolveToken(mStyleIdMap[styleId].second);
+            accent_val = 
resolveToken(mStyleIdMap.find(styleId)->second.second);
         else
             accent_val = XML_tx1;
 
@@ -644,7 +642,7 @@ std::unique_ptr<TableStyle> CreateTableStyle(const 
OUString& styleId)
         sal_Int32 accent_val;
 
         if (!accent_name.isEmpty())
-            accent_val = resolveToken(mStyleIdMap[styleId].second);
+            accent_val = 
resolveToken(mStyleIdMap.find(styleId)->second.second);
         else
             accent_val = XML_tx1;
 
@@ -681,7 +679,7 @@ std::unique_ptr<TableStyle> CreateTableStyle(const 
OUString& styleId)
         sal_Int32 accent_val;
 
         if (!accent_name.isEmpty())
-            accent_val = resolveToken(mStyleIdMap[styleId].second);
+            accent_val = 
resolveToken(mStyleIdMap.find(styleId)->second.second);
         else
             accent_val = XML_dk1;
 
@@ -729,7 +727,7 @@ std::unique_ptr<TableStyle> CreateTableStyle(const 
OUString& styleId)
         sal_Int32 accent_val;
 
         if (!accent_name.isEmpty())
-            accent_val = resolveToken(mStyleIdMap[styleId].second);
+            accent_val = 
resolveToken(mStyleIdMap.find(styleId)->second.second);
         else
             accent_val = XML_dk1;
 
@@ -769,7 +767,7 @@ std::unique_ptr<TableStyle> CreateTableStyle(const 
OUString& styleId)
         sal_Int32 accent_val;
 
         if (!accent_name.isEmpty())
-            accent_val = resolveToken(mStyleIdMap[styleId].second);
+            accent_val = 
resolveToken(mStyleIdMap.find(styleId)->second.second);
         else
             accent_val = XML_dk1;
 
@@ -796,7 +794,7 @@ std::unique_ptr<TableStyle> CreateTableStyle(const 
OUString& styleId)
         sal_Int32 accent_val;
 
         if (!accent_name.isEmpty())
-            accent_val = resolveToken(mStyleIdMap[styleId].second);
+            accent_val = 
resolveToken(mStyleIdMap.find(styleId)->second.second);
         else
             accent_val = XML_dk1;
 
@@ -839,7 +837,7 @@ std::unique_ptr<TableStyle> CreateTableStyle(const 
OUString& styleId)
 
         if (!accent_name.isEmpty())
         {
-            accent_val = resolveToken(mStyleIdMap[styleId].second);
+            accent_val = 
resolveToken(mStyleIdMap.find(styleId)->second.second);
             transform_val = XML_shade;
         }
         else
@@ -882,7 +880,7 @@ std::unique_ptr<TableStyle> CreateTableStyle(const 
OUString& styleId)
         sal_Int32 accent_val;
 
         if (!accent_name.isEmpty())
-            accent_val = resolveToken(mStyleIdMap[styleId].second);
+            accent_val = 
resolveToken(mStyleIdMap.find(styleId)->second.second);
         else
             accent_val = XML_dk1;
 

Reply via email to