vcl/source/gdi/WidgetDefinitionReader.cxx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
New commits: commit c1a3a0958f523b81c3e4bd804e5f3edba968dad4 Author: Arnaud Versini <[email protected]> AuthorDate: Sun Dec 28 17:13:15 2025 +0100 Commit: Arnaud Versini <[email protected]> CommitDate: Mon Dec 29 12:05:25 2025 +0100 Use std::unordered_map instead of frozen one for non const usage. This partially reverts f6f971ab7cec3c3dc0fd6734cfe47c4805789520. See https://gerrit.libreoffice.org/c/core/+/188086 for context. Change-Id: I15edd635028698ba0c269dfeb9f4c5e8773dcef3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196268 Tested-by: Jenkins Reviewed-by: Arnaud Versini <[email protected]> diff --git a/vcl/source/gdi/WidgetDefinitionReader.cxx b/vcl/source/gdi/WidgetDefinitionReader.cxx index 42326393b0a6..786c4280896e 100644 --- a/vcl/source/gdi/WidgetDefinitionReader.cxx +++ b/vcl/source/gdi/WidgetDefinitionReader.cxx @@ -12,7 +12,9 @@ #include <frozen/bits/elsa_std.h> #include <frozen/unordered_map.h> +#include <unordered_map> #include <utility> + #include <widgetdraw/WidgetDefinitionReader.hxx> #include <sal/config.h> @@ -341,7 +343,7 @@ bool WidgetDefinitionReader::read(WidgetDefinition& rWidgetDefinition) rWidgetDefinition.mpStyle = std::make_shared<WidgetDefinitionStyle>(); - auto aStyleColorMap = frozen::make_unordered_map<std::string_view, Color*>({ + std::unordered_map<std::string_view, Color*> aStyleColorMap = { { "faceColor", &rWidgetDefinition.mpStyle->maFaceColor }, { "checkedColor", &rWidgetDefinition.mpStyle->maCheckedColor }, { "lightColor", &rWidgetDefinition.mpStyle->maLightColor }, @@ -396,11 +398,11 @@ bool WidgetDefinitionReader::read(WidgetDefinition& rWidgetDefinition) { "linkColor", &rWidgetDefinition.mpStyle->maLinkColor }, { "visitedLinkColor", &rWidgetDefinition.mpStyle->maVisitedLinkColor }, { "toolTextColor", &rWidgetDefinition.mpStyle->maToolTextColor }, - }); + }; rWidgetDefinition.mpSettings = std::make_shared<WidgetDefinitionSettings>(); - auto aSettingMap = frozen::make_unordered_map<std::string_view, OString*>({ + std::unordered_map<std::string_view, OString*> aSettingMap = { { "noActiveTabTextRaise", &rWidgetDefinition.mpSettings->msNoActiveTabTextRaise }, { "centeredTabs", &rWidgetDefinition.mpSettings->msCenteredTabs }, { "listBoxEntryMargin", &rWidgetDefinition.mpSettings->msListBoxEntryMargin }, @@ -411,7 +413,7 @@ bool WidgetDefinitionReader::read(WidgetDefinition& rWidgetDefinition) &rWidgetDefinition.mpSettings->msListBoxPreviewDefaultLogicWidth }, { "listBoxPreviewDefaultLogicHeight", &rWidgetDefinition.mpSettings->msListBoxPreviewDefaultLogicHeight }, - }); + }; SvFileStream aFileStream(m_rDefinitionFile, StreamMode::READ);
