bridges/source/net_uno/net_data.cxx | 4
filter/source/msfilter/msvbahelper.cxx | 6
oox/source/drawingml/clrscheme.cxx | 6
oox/source/drawingml/color.cxx | 42 ++---
oox/source/drawingml/colorchoicecontext.cxx | 12 -
oox/source/drawingml/misccontexts.cxx | 6
oox/source/drawingml/table/predefined-table-styles.cxx | 11 -
oox/source/export/ThemeExport.cxx | 139 ++++++++---------
oox/source/ppt/presentationfragmenthandler.cxx | 6
oox/source/token/relationship.cxx | 7
vcl/source/window/builder.cxx | 4
writerperfect/source/writer/exp/xmlimp.cxx | 4
12 files changed, 125 insertions(+), 122 deletions(-)
New commits:
commit fde922c6ba44e680c70d1740c645509e31382c18
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Jun 25 17:14:18 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Jun 26 11:46:30 2025 +0200
use frozen::make_unordered_map so no need to specify the count
Change-Id: I4b486ab84d317ed5a7d8a0b2f3b2ca8537ac2975
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186986
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Tested-by: Jenkins
diff --git a/bridges/source/net_uno/net_data.cxx
b/bridges/source/net_uno/net_data.cxx
index 3e2f73a12bc5..9a6bfc805dad 100644
--- a/bridges/source/net_uno/net_data.cxx
+++ b/bridges/source/net_uno/net_data.cxx
@@ -23,7 +23,7 @@ namespace
{
size_t net_sizeof(typelib_TypeClass eTypeClass)
{
- static constexpr frozen::unordered_map<typelib_TypeClass, size_t, 19>
s_sizes{
+ static constexpr auto s_sizes =
frozen::make_unordered_map<typelib_TypeClass, size_t>({
{ typelib_TypeClass_BOOLEAN, sizeof(sal_Bool) },
{ typelib_TypeClass_BYTE, sizeof(sal_Int8) },
{ typelib_TypeClass_CHAR, sizeof(sal_Unicode) },
@@ -43,7 +43,7 @@ size_t net_sizeof(typelib_TypeClass eTypeClass)
{ typelib_TypeClass_INTERFACE, sizeof(IntPtr) },
{ typelib_TypeClass_EXCEPTION, sizeof(IntPtr) },
{ typelib_TypeClass_STRUCT, sizeof(IntPtr) },
- };
+ });
return s_sizes.at(eTypeClass);
}
diff --git a/filter/source/msfilter/msvbahelper.cxx
b/filter/source/msfilter/msvbahelper.cxx
index fd6e616f1a3d..a4500ef08231 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -649,8 +649,8 @@ static sal_uInt16 parseChar( sal_Unicode c )
namespace
{
-constexpr frozen::unordered_map<std::u16string_view, sal_uInt16, 34> s_KeyCodes
-{
+constexpr auto s_KeyCodes = frozen::make_unordered_map<std::u16string_view,
sal_uInt16>
+({
{ u"BACKSPACE", KEY_BACKSPACE },
{ u"BS", KEY_BACKSPACE },
{ u"DELETE", KEY_DELETE },
@@ -685,7 +685,7 @@ constexpr frozen::unordered_map<std::u16string_view,
sal_uInt16, 34> s_KeyCodes
{ u"F13", KEY_F13 },
{ u"F14", KEY_F14 },
{ u"F15", KEY_F15 }
-};
+});
} // end anonymous namespace
diff --git a/oox/source/drawingml/clrscheme.cxx
b/oox/source/drawingml/clrscheme.cxx
index 7a0b12fe3f0c..c35fd7277f3b 100644
--- a/oox/source/drawingml/clrscheme.cxx
+++ b/oox/source/drawingml/clrscheme.cxx
@@ -38,8 +38,8 @@ namespace oox::drawingml {
namespace
{
-constexpr frozen::unordered_map<PredefinedClrSchemeId, std::u16string_view,
12> constPredefinedClrNames
-{
+constexpr auto constPredefinedClrNames =
frozen::make_unordered_map<PredefinedClrSchemeId, std::u16string_view>
+({
{ dk1, u"dk1" },
{ lt1, u"lt1" },
{ dk2, u"dk2" },
@@ -52,7 +52,7 @@ constexpr frozen::unordered_map<PredefinedClrSchemeId,
std::u16string_view, 12>
{ accent6, u"accent6" },
{ hlink, u"hlink" },
{ folHlink, u"folHlink" }
-};
+});
} // end anonymous namespace
diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx
index 586fde2065cc..063bfc7534a6 100644
--- a/oox/source/drawingml/color.cxx
+++ b/oox/source/drawingml/color.cxx
@@ -37,8 +37,8 @@ namespace
{
// predefined colors in DrawingML (map XML token identifiers to RGB values)
-constexpr frozen::unordered_map<sal_Int32, ::Color, 140> constDmlColors
-{
+constexpr auto constDmlColors = frozen::make_unordered_map<sal_Int32, ::Color>
+({
{XML_aliceBlue, ::Color(0xF0F8FF)}, {XML_antiqueWhite,
::Color(0xFAEBD7)},
{XML_aqua, ::Color(0x00FFFF)}, {XML_aquamarine,
::Color(0x7FFFD4)},
{XML_azure, ::Color(0xF0FFFF)}, {XML_beige,
::Color(0xF5F5DC)},
@@ -109,7 +109,7 @@ constexpr frozen::unordered_map<sal_Int32, ::Color, 140>
constDmlColors
{XML_violet, ::Color(0xEE82EE)}, {XML_wheat,
::Color(0xF5DEB3)},
{XML_white, ::Color(0xFFFFFF)}, {XML_whiteSmoke,
::Color(0xF5F5F5)},
{XML_yellow, ::Color(0xFFFF00)}, {XML_yellowGreen,
::Color(0x9ACD32)}
-};
+});
constexpr ::Color lookupDmlColor(sal_Int32 nToken)
{
@@ -119,8 +119,8 @@ constexpr ::Color lookupDmlColor(sal_Int32 nToken)
return iterator->second;
}
-constexpr frozen::unordered_map<sal_Int32, ::Color, 16> constVmlColors
-{
+constexpr auto constVmlColors = frozen::make_unordered_map<sal_Int32, ::Color>
+({
{XML_aqua, ::Color(0x00FFFF)}, {XML_black,
::Color(0x000000)},
{XML_blue, ::Color(0x0000FF)}, {XML_fuchsia,
::Color(0xFF00FF)},
{XML_gray, ::Color(0x808080)}, {XML_green,
::Color(0x008000)},
@@ -129,7 +129,7 @@ constexpr frozen::unordered_map<sal_Int32, ::Color, 16>
constVmlColors
{XML_purple, ::Color(0x800080)}, {XML_red,
::Color(0xFF0000)},
{XML_silver, ::Color(0xC0C0C0)}, {XML_teal,
::Color(0x008080)},
{XML_white, ::Color(0xFFFFFF)}, {XML_yellow,
::Color(0xFFFF00)}
-};
+});
constexpr ::Color lookupVmlColor(sal_Int32 nToken)
{
@@ -139,8 +139,8 @@ constexpr ::Color lookupVmlColor(sal_Int32 nToken)
return iterator->second;
}
-constexpr frozen::unordered_map<sal_Int32, ::Color, 16> constHighlightColors
-{
+constexpr auto constHighlightColors = frozen::make_unordered_map<sal_Int32,
::Color>
+({
// tdf#131841 Predefined color for OOXML highlight.
{XML_black, ::Color(0x000000)}, {XML_blue,
::Color(0x0000FF)},
{XML_cyan, ::Color(0x00FFFF)}, {XML_darkBlue,
::Color(0x00008B)},
@@ -150,7 +150,7 @@ constexpr frozen::unordered_map<sal_Int32, ::Color, 16>
constHighlightColors
{XML_green, ::Color(0x00FF00)}, {XML_lightGray,
::Color(0xD3D3D3)},
{XML_magenta, ::Color(0xFF00FF)}, {XML_red,
::Color(0xFF0000)},
{XML_white, ::Color(0xFFFFFF)}, {XML_yellow,
::Color(0xFFFF00)}
-};
+});
constexpr ::Color lookupHighlightColor(sal_Int32 nToken)
{
@@ -209,8 +209,8 @@ void lclOffValue( sal_Int32& ornValue, sal_Int32 nOff,
sal_Int32 nMax = MAX_PERC
ornValue = getLimitedValue< sal_Int32, sal_Int32 >( ornValue + nOff, 0,
nMax );
}
-constexpr frozen::unordered_map<std::u16string_view, model::ThemeColorType,
26> constSchemeColorNameToIndex
-{
+constexpr auto constSchemeColorNameToIndex =
frozen::make_unordered_map<std::u16string_view, model::ThemeColorType>
+({
{ u"dk1", model::ThemeColorType::Dark1 },
{ u"lt1", model::ThemeColorType::Light1 },
{ u"dk2", model::ThemeColorType::Dark2 },
@@ -237,10 +237,10 @@ constexpr frozen::unordered_map<std::u16string_view,
model::ThemeColorType, 26>
{ u"background2", model::ThemeColorType::Light2 },
{ u"hyperlink", model::ThemeColorType::Hyperlink },
{ u"followedHyperlink", model::ThemeColorType::FollowedHyperlink }
-};
+});
-constexpr frozen::unordered_map<sal_Int32, model::ThemeColorType, 26>
constThemeColorTokenMap
-{
+constexpr auto constThemeColorTokenMap = frozen::make_unordered_map<sal_Int32,
model::ThemeColorType>
+({
{ XML_dk1, model::ThemeColorType::Dark1 },
{ XML_lt1, model::ThemeColorType::Light1 },
{ XML_dk2, model::ThemeColorType::Dark2 },
@@ -267,7 +267,7 @@ constexpr frozen::unordered_map<sal_Int32,
model::ThemeColorType, 26> constTheme
{ XML_background2, model::ThemeColorType::Light2 },
{ XML_hyperlink, model::ThemeColorType::Hyperlink },
{ XML_followedHyperlink, model::ThemeColorType::FollowedHyperlink },
-};
+});
} // end anonymous namespace
@@ -476,11 +476,13 @@ void Color::clearTransformations()
clearTransparence();
}
-constexpr frozen::unordered_map<std::u16string_view, sal_Int32, 12>
constColorMapTokenMap
- = { { u"bg1", XML_bg1 }, { u"tx1", XML_tx1 }, { u"bg2",
XML_bg2 },
- { u"tx2", XML_tx2 }, { u"accent1", XML_accent1 }, {
u"accent2", XML_accent2 },
- { u"accent3", XML_accent3 }, { u"accent4", XML_accent4 }, {
u"accent5", XML_accent5 },
- { u"accent6", XML_accent6 }, { u"hlink", XML_hlink }, {
u"folHlink", XML_folHlink } };
+constexpr auto constColorMapTokenMap =
frozen::make_unordered_map<std::u16string_view, sal_Int32>
+({
+ { u"bg1", XML_bg1 }, { u"tx1", XML_tx1 }, { u"bg2",
XML_bg2 },
+ { u"tx2", XML_tx2 }, { u"accent1", XML_accent1 }, { u"accent2",
XML_accent2 },
+ { u"accent3", XML_accent3 }, { u"accent4", XML_accent4 }, { u"accent5",
XML_accent5 },
+ { u"accent6", XML_accent6 }, { u"hlink", XML_hlink }, { u"folHlink",
XML_folHlink }
+});
sal_Int32 Color::getColorMapToken(std::u16string_view sName)
{
diff --git a/oox/source/drawingml/colorchoicecontext.cxx
b/oox/source/drawingml/colorchoicecontext.cxx
index 4db601aed01a..714fbc073d78 100644
--- a/oox/source/drawingml/colorchoicecontext.cxx
+++ b/oox/source/drawingml/colorchoicecontext.cxx
@@ -33,8 +33,8 @@ namespace oox::drawingml {
namespace
{
-constexpr frozen::unordered_map<sal_Int32, model::SystemColorType, 30>
constSystemColorMap
-{
+constexpr auto constSystemColorMap = frozen::make_unordered_map<sal_Int32,
model::SystemColorType>
+({
{ XML_scrollBar, model::SystemColorType::ScrollBar },
{ XML_background, model::SystemColorType::Background },
{ XML_activeCaption, model::SystemColorType::ActiveCaption },
@@ -65,10 +65,10 @@ constexpr frozen::unordered_map<sal_Int32,
model::SystemColorType, 30> constSyst
{ XML_gradientInactiveCaption,
model::SystemColorType::GradientInactiveCaption },
{ XML_menuHighlight, model::SystemColorType::MenuHighlight },
{ XML_menuBar, model::SystemColorType::MenuBar }
-};
+});
-constexpr frozen::unordered_map<sal_Int32, model::TransformationType, 28>
constTransformTypeMap
-{
+constexpr auto constTransformTypeMap = frozen::make_unordered_map<sal_Int32,
model::TransformationType>
+({
{ XML_alpha, model::TransformationType::Alpha },
{ XML_alphaMod, model::TransformationType::AlphaMod },
{ XML_alphaOff, model::TransformationType::AlphaOff },
@@ -97,7 +97,7 @@ constexpr frozen::unordered_map<sal_Int32,
model::TransformationType, 28> constT
{ XML_gray, model::TransformationType::Gray },
{ XML_inv, model::TransformationType::Inv },
{ XML_invGamma, model::TransformationType::InvGamma }
-};
+});
}
diff --git a/oox/source/drawingml/misccontexts.cxx
b/oox/source/drawingml/misccontexts.cxx
index 53548c9b5bd4..0883596d2ca8 100644
--- a/oox/source/drawingml/misccontexts.cxx
+++ b/oox/source/drawingml/misccontexts.cxx
@@ -146,8 +146,8 @@ ContextHandlerRef GradientFillContext::onCreateContext(
namespace
{
-constexpr frozen::unordered_map<sal_Int32, model::PatternPreset, 54>
constPatternPresetMap
-{
+constexpr auto constPatternPresetMap = frozen::make_unordered_map<sal_Int32,
model::PatternPreset>
+({
{ XML_pct5, model::PatternPreset::Percent_5 },
{ XML_pct10, model::PatternPreset::Percent_10 },
{ XML_pct20, model::PatternPreset::Percent_20 },
@@ -202,7 +202,7 @@ constexpr frozen::unordered_map<sal_Int32,
model::PatternPreset, 54> constPatter
{ XML_wave, model::PatternPreset::Wave },
{ XML_trellis, model::PatternPreset::Trellis },
{ XML_zigZag, model::PatternPreset::ZigZag }
-};
+});
} // end anonymous namespace
PatternFillContext::PatternFillContext(ContextHandler2Helper const & rParent,
diff --git a/oox/source/drawingml/table/predefined-table-styles.cxx
b/oox/source/drawingml/table/predefined-table-styles.cxx
index 9011b5c8c628..95d166fd3694 100644
--- a/oox/source/drawingml/table/predefined-table-styles.cxx
+++ b/oox/source/drawingml/table/predefined-table-styles.cxx
@@ -195,10 +195,13 @@ const std::unordered_map<OUString, std::pair<OUString,
OUString>> mStyleIdMap{
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 },
- { u"Accent4", XML_accent4 }, { u"Accent5", XML_accent5 }, { u"Accent6",
XML_accent6 }
-};
+constexpr auto tokens
+ = frozen::make_unordered_map<std::u16string_view, sal_Int32>({ {
u"Accent1", XML_accent1 },
+ {
u"Accent2", XML_accent2 },
+ {
u"Accent3", XML_accent3 },
+ {
u"Accent4", XML_accent4 },
+ {
u"Accent5", XML_accent5 },
+ {
u"Accent6", XML_accent6 } });
sal_Int32 resolveToken(OUString const& rString)
{
diff --git a/oox/source/export/ThemeExport.cxx
b/oox/source/export/ThemeExport.cxx
index 400e9a09db39..51d1943ade1b 100644
--- a/oox/source/export/ThemeExport.cxx
+++ b/oox/source/export/ThemeExport.cxx
@@ -148,76 +148,75 @@ bool ThemeExport::writeFontScheme(model::FontScheme
const& rFontScheme)
namespace
{
-constexpr frozen::unordered_map<model::TransformationType, sal_Int32, 4>
constTransformTypeTokenMap{
- { model::TransformationType::Tint, XML_tint },
- { model::TransformationType::Shade, XML_shade },
- { model::TransformationType::LumMod, XML_lumMod },
- { model::TransformationType::LumOff, XML_lumOff },
-};
-
-constexpr frozen::unordered_map<model::ThemeColorType, const char*, 12>
constThemeColorTypeTokenMap{
- { model::ThemeColorType::Dark1, "dk1" },
- { model::ThemeColorType::Light1, "lt1" },
- { model::ThemeColorType::Dark2, "dk2" },
- { model::ThemeColorType::Light2, "lt2" },
- { model::ThemeColorType::Accent1, "accent1" },
- { model::ThemeColorType::Accent2, "accent2" },
- { model::ThemeColorType::Accent3, "accent3" },
- { model::ThemeColorType::Accent4, "accent4" },
- { model::ThemeColorType::Accent5, "accent5" },
- { model::ThemeColorType::Accent6, "accent6" },
- { model::ThemeColorType::Hyperlink, "hlink" },
- { model::ThemeColorType::FollowedHyperlink, "folHlink" }
-};
-
-constexpr frozen::unordered_map<model::SystemColorType, const char*, 30>
- constSystemColorTypeTokenMap{
- { model::SystemColorType::DarkShadow3D, "3dDkShadow" },
- { model::SystemColorType::Light3D, "3dLight" },
- { model::SystemColorType::ActiveBorder, "activeBorder" },
- { model::SystemColorType::ActiveCaption, "activeCaption" },
- { model::SystemColorType::AppWorkspace, "appWorkspace" },
- { model::SystemColorType::Background, "background" },
- { model::SystemColorType::ButtonFace, "btnFace" },
- { model::SystemColorType::ButtonHighlight, "btnHighlight" },
- { model::SystemColorType::ButtonShadow, "btnShadow" },
- { model::SystemColorType::ButtonText, "btnText" },
- { model::SystemColorType::CaptionText, "captionText" },
- { model::SystemColorType::GradientActiveCaption,
"gradientActiveCaption" },
- { model::SystemColorType::GradientInactiveCaption,
"gradientInactiveCaption" },
- { model::SystemColorType::GrayText, "grayText" },
- { model::SystemColorType::Highlight, "highlight" },
- { model::SystemColorType::HighlightText, "highlightText" },
- { model::SystemColorType::HotLight, "hotLight" },
- { model::SystemColorType::InactiveBorder, "inactiveBorder" },
- { model::SystemColorType::InactiveCaption, "inactiveCaption" },
- { model::SystemColorType::InactiveCaptionText, "inactiveCaptionText" },
- { model::SystemColorType::InfoBack, "infoBk" },
- { model::SystemColorType::InfoText, "infoText" },
- { model::SystemColorType::Menu, "menu" },
- { model::SystemColorType::MenuBar, "menuBar" },
- { model::SystemColorType::MenuHighlight, "menuHighlight" },
- { model::SystemColorType::MenuText, "menuText" },
- { model::SystemColorType::ScrollBar, "scrollBar" },
- { model::SystemColorType::Window, "window" },
- { model::SystemColorType::WindowFrame, "windowFrame" },
- { model::SystemColorType::WindowText, "windowText" }
- };
-
-constexpr frozen::unordered_map<sal_Int32, model::ThemeColorType, 12>
constTokenMap{
- { XML_dk1, model::ThemeColorType::Dark1 },
- { XML_lt1, model::ThemeColorType::Light1 },
- { XML_dk2, model::ThemeColorType::Dark2 },
- { XML_lt2, model::ThemeColorType::Light2 },
- { XML_accent1, model::ThemeColorType::Accent1 },
- { XML_accent2, model::ThemeColorType::Accent2 },
- { XML_accent3, model::ThemeColorType::Accent3 },
- { XML_accent4, model::ThemeColorType::Accent4 },
- { XML_accent5, model::ThemeColorType::Accent5 },
- { XML_accent6, model::ThemeColorType::Accent6 },
- { XML_hlink, model::ThemeColorType::Hyperlink },
- { XML_folHlink, model::ThemeColorType::FollowedHyperlink }
-};
+constexpr auto constTransformTypeTokenMap
+ = frozen::make_unordered_map<model::TransformationType, sal_Int32>({
+ { model::TransformationType::Tint, XML_tint },
+ { model::TransformationType::Shade, XML_shade },
+ { model::TransformationType::LumMod, XML_lumMod },
+ { model::TransformationType::LumOff, XML_lumOff },
+ });
+
+constexpr auto constThemeColorTypeTokenMap
+ = frozen::make_unordered_map<model::ThemeColorType, const char*>(
+ { { model::ThemeColorType::Dark1, "dk1" },
+ { model::ThemeColorType::Light1, "lt1" },
+ { model::ThemeColorType::Dark2, "dk2" },
+ { model::ThemeColorType::Light2, "lt2" },
+ { model::ThemeColorType::Accent1, "accent1" },
+ { model::ThemeColorType::Accent2, "accent2" },
+ { model::ThemeColorType::Accent3, "accent3" },
+ { model::ThemeColorType::Accent4, "accent4" },
+ { model::ThemeColorType::Accent5, "accent5" },
+ { model::ThemeColorType::Accent6, "accent6" },
+ { model::ThemeColorType::Hyperlink, "hlink" },
+ { model::ThemeColorType::FollowedHyperlink, "folHlink" } });
+
+constexpr auto constSystemColorTypeTokenMap
+ = frozen::make_unordered_map<model::SystemColorType, const char*>(
+ { { model::SystemColorType::DarkShadow3D, "3dDkShadow" },
+ { model::SystemColorType::Light3D, "3dLight" },
+ { model::SystemColorType::ActiveBorder, "activeBorder" },
+ { model::SystemColorType::ActiveCaption, "activeCaption" },
+ { model::SystemColorType::AppWorkspace, "appWorkspace" },
+ { model::SystemColorType::Background, "background" },
+ { model::SystemColorType::ButtonFace, "btnFace" },
+ { model::SystemColorType::ButtonHighlight, "btnHighlight" },
+ { model::SystemColorType::ButtonShadow, "btnShadow" },
+ { model::SystemColorType::ButtonText, "btnText" },
+ { model::SystemColorType::CaptionText, "captionText" },
+ { model::SystemColorType::GradientActiveCaption,
"gradientActiveCaption" },
+ { model::SystemColorType::GradientInactiveCaption,
"gradientInactiveCaption" },
+ { model::SystemColorType::GrayText, "grayText" },
+ { model::SystemColorType::Highlight, "highlight" },
+ { model::SystemColorType::HighlightText, "highlightText" },
+ { model::SystemColorType::HotLight, "hotLight" },
+ { model::SystemColorType::InactiveBorder, "inactiveBorder" },
+ { model::SystemColorType::InactiveCaption, "inactiveCaption" },
+ { model::SystemColorType::InactiveCaptionText, "inactiveCaptionText"
},
+ { model::SystemColorType::InfoBack, "infoBk" },
+ { model::SystemColorType::InfoText, "infoText" },
+ { model::SystemColorType::Menu, "menu" },
+ { model::SystemColorType::MenuBar, "menuBar" },
+ { model::SystemColorType::MenuHighlight, "menuHighlight" },
+ { model::SystemColorType::MenuText, "menuText" },
+ { model::SystemColorType::ScrollBar, "scrollBar" },
+ { model::SystemColorType::Window, "window" },
+ { model::SystemColorType::WindowFrame, "windowFrame" },
+ { model::SystemColorType::WindowText, "windowText" } });
+
+constexpr auto constTokenMap = frozen::make_unordered_map<sal_Int32,
model::ThemeColorType>(
+ { { XML_dk1, model::ThemeColorType::Dark1 },
+ { XML_lt1, model::ThemeColorType::Light1 },
+ { XML_dk2, model::ThemeColorType::Dark2 },
+ { XML_lt2, model::ThemeColorType::Light2 },
+ { XML_accent1, model::ThemeColorType::Accent1 },
+ { XML_accent2, model::ThemeColorType::Accent2 },
+ { XML_accent3, model::ThemeColorType::Accent3 },
+ { XML_accent4, model::ThemeColorType::Accent4 },
+ { XML_accent5, model::ThemeColorType::Accent5 },
+ { XML_accent6, model::ThemeColorType::Accent6 },
+ { XML_hlink, model::ThemeColorType::Hyperlink },
+ { XML_folHlink, model::ThemeColorType::FollowedHyperlink } });
} // end anonymous ns
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx
b/oox/source/ppt/presentationfragmenthandler.cxx
index aee89e1c4dce..f5b2d40eea0e 100644
--- a/oox/source/ppt/presentationfragmenthandler.cxx
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
@@ -85,8 +85,8 @@ namespace oox::ppt
namespace
{
-constexpr frozen::unordered_map<PredefinedClrSchemeId, sal_Int32, 12>
constPredefinedClrTokens
-{
+constexpr auto constPredefinedClrTokens =
frozen::make_unordered_map<PredefinedClrSchemeId, sal_Int32>
+({
{ dk1, XML_dk1 },
{ lt1, XML_lt1 },
{ dk2, XML_dk2 },
@@ -99,7 +99,7 @@ constexpr frozen::unordered_map<PredefinedClrSchemeId,
sal_Int32, 12> constPrede
{ accent6, XML_accent6 },
{ hlink, XML_hlink },
{ folHlink, XML_folHlink }
-};
+});
sal_Int32 getPredefinedClrTokens(PredefinedClrSchemeId eID)
{
diff --git a/oox/source/token/relationship.cxx
b/oox/source/token/relationship.cxx
index a0f48de4ce7b..4fe25b80d0b3 100644
--- a/oox/source/token/relationship.cxx
+++ b/oox/source/token/relationship.cxx
@@ -20,11 +20,10 @@ namespace oox
namespace
{
-constexpr frozen::unordered_map<Relationship, std::u16string_view,
- static_cast<sal_Int32>(Relationship::NUM_ENTRIES)>
constRelationshipMap
-{
+constexpr auto constRelationshipMap = frozen::make_unordered_map<Relationship,
std::u16string_view>
+({
#include "relationship.inc"
-};
+});
} // end anonymous ns
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index b9d56812cad8..3f47d02c2e65 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2132,7 +2132,7 @@ namespace BuilderUtils
{
using namespace com::sun::star::accessibility;
- static constexpr frozen::unordered_map<std::u16string_view, sal_Int16,
123> aAtkRoleToAccessibleRole = {
+ static constexpr auto aAtkRoleToAccessibleRole =
frozen::make_unordered_map<std::u16string_view, sal_Int16>({
/* This is in atkobject.h's AtkRole order */
{ u"invalid", AccessibleRole::UNKNOWN },
{ u"accelerator label", AccessibleRole::UNKNOWN },
@@ -2257,7 +2257,7 @@ namespace BuilderUtils
{ u"subscript", AccessibleRole::UNKNOWN },
{ u"superscript", AccessibleRole::UNKNOWN },
{ u"footnote", AccessibleRole::FOOTNOTE },
- };
+ });
auto it = aAtkRoleToAccessibleRole.find(roleName);
if (it == aAtkRoleToAccessibleRole.end())
diff --git a/writerperfect/source/writer/exp/xmlimp.cxx
b/writerperfect/source/writer/exp/xmlimp.cxx
index 473899fae40c..8ae7719aef63 100644
--- a/writerperfect/source/writer/exp/xmlimp.cxx
+++ b/writerperfect/source/writer/exp/xmlimp.cxx
@@ -45,12 +45,12 @@ namespace
/// Looks up mime type for a given image extension.
OUString GetMimeType(std::u16string_view rExtension)
{
- static constexpr frozen::unordered_map<std::u16string_view, OUString, 4>
vMimeTypes = {
+ static const auto vMimeTypes =
frozen::make_unordered_map<std::u16string_view, OUString>({
{ u"gif", u"image/gif"_ustr },
{ u"jpg", u"image/jpeg"_ustr },
{ u"png", u"image/png"_ustr },
{ u"svg", u"image/svg+xml"_ustr },
- };
+ });
auto it = vMimeTypes.find(rExtension);
return it == vMimeTypes.end() ? OUString() : it->second;
