use more frozen

Change-Id: Ie3e6e7e947d9322f3999cf3274a6c10ea717afe2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154276
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

3 files changed, 12 insertions, 5 deletions

diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index a2adeecca076..49868d85e97a 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_Library_set_componentfile,vbaobj,sc/util/vbaobj,services))
 
 $(eval $(call gb_Library_use_externals,vbaobj,\
 	boost_headers \
+	frozen \
 	mdds_headers \
 ))
 
diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
index e53d2d004e95..dac336ad35b8 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -52,6 +52,9 @@
 #include <stylehelper.hxx>
 #include <utility>
 #include <unordered_map>
+#include <frozen/bits/defines.h>
+#include <frozen/bits/elsa_std.h>
+#include <frozen/unordered_map.h>
 
 using namespace com::sun::star;
 
@@ -101,7 +104,7 @@ void ScOrcusGlobalSettings::set_origin_date(int year, int month, int day)
 void ScOrcusGlobalSettings::set_character_set(orcus::character_set_t cs)
 {
     // Keep the entries sorted by the key.
-    static const std::unordered_map<orcus::character_set_t, rtl_TextEncoding> rules = {
+    static constexpr auto rules = frozen::make_unordered_map<orcus::character_set_t, rtl_TextEncoding>({
         { orcus::character_set_t::big5, RTL_TEXTENCODING_BIG5 },
         { orcus::character_set_t::euc_jp, RTL_TEXTENCODING_EUC_JP },
         { orcus::character_set_t::euc_kr, RTL_TEXTENCODING_EUC_KR },
@@ -145,7 +148,7 @@ void ScOrcusGlobalSettings::set_character_set(orcus::character_set_t cs)
         { orcus::character_set_t::windows_1256, RTL_TEXTENCODING_MS_1256 },
         { orcus::character_set_t::windows_1257, RTL_TEXTENCODING_MS_1257 },
         { orcus::character_set_t::windows_1258, RTL_TEXTENCODING_MS_1258 },
-    };
+    });
 
     if (auto it = rules.find(cs); it != rules.end())
         mnTextEncoding = it->second;
diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx
index 7b678d508c90..8172d4096407 100644
--- a/sc/source/ui/vba/vbainterior.cxx
+++ b/sc/source/ui/vba/vbainterior.cxx
@@ -30,6 +30,9 @@
 #include "vbapalette.hxx"
 #include <document.hxx>
 #include <utility>
+#include <frozen/bits/defines.h>
+#include <frozen/bits/elsa_std.h>
+#include <frozen/map.h>
 
 using namespace ::com::sun::star;
 using namespace ::ooo::vba;
@@ -39,7 +42,7 @@ constexpr OUStringLiteral BACKCOLOR = u"CellBackColor";
 constexpr OUStringLiteral PATTERN = u"Pattern";
 constexpr OUStringLiteral PATTERNCOLOR = u"PatternColor";
 
-static std::map< sal_Int32, sal_Int32 > aPatternMap {
+constexpr auto aPatternMap = frozen::make_map<sal_Int32, sal_Int32>({
     { xlPatternAutomatic, 0 },
     { xlPatternChecker, 9 },
     { xlPatternCrissCross, 16 },
@@ -60,7 +63,7 @@ static std::map< sal_Int32, sal_Int32 > aPatternMap {
     { xlPatternSolid, 0 },
     { xlPatternUp, 8 },
     { xlPatternVertical, 6 }
-};
+});
 
 ScVbaInterior::ScVbaInterior( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, uno::Reference< beans::XPropertySet >   xProps, ScDocument* pScDoc ) : ScVbaInterior_BASE( xParent, xContext ), m_xProps(std::move(xProps)), m_pScDoc( pScDoc )
 {
@@ -97,7 +100,7 @@ ScVbaInterior::SetMixedColor()
     {
         m_nPattern = GetAttributeData( aPattern );
     }
-    sal_Int32 nPattern = aPatternMap[ m_nPattern ];
+    sal_Int32 nPattern = aPatternMap.find( m_nPattern )->second;
     // pattern color
     uno::Any aPatternColor = GetUserDefinedAttributes( PATTERNCOLOR );
     if( aPatternColor.hasValue() )