writerfilter/source/dmapper/PropertyMap.cxx | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
New commits:
commit f504b2de4abd204d87be25ee85ac7b31521757ac
Author: Arnaud VERSINI <arnaud.vers...@pm.me>
AuthorDate: Thu Dec 28 15:13:39 2023 +0100
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun Jan 21 13:51:57 2024 +0100
writerfilter : use constexpr frozen unordered_set instead of
std::unordered_set
Change-Id: I37b4b5ec56f846b5c46faeaa5aebb88340ac3c6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161385
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx
b/writerfilter/source/dmapper/PropertyMap.cxx
index 29444d809b1e..41c25ce50816 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -20,7 +20,6 @@
#include <sal/config.h>
#include <string_view>
-#include <unordered_set>
#include "PropertyMap.hxx"
#include "TagLogger.hxx"
@@ -67,6 +66,10 @@
#include <o3tl/unit_conversion.hxx>
#include <utility>
+#include <frozen/bits/defines.h>
+#include <frozen/bits/elsa_std.h>
+#include <frozen/unordered_set.h>
+
using namespace com::sun::star;
namespace writerfilter::dmapper {
@@ -1399,12 +1402,12 @@ void
SectionPropertyMap::CreateEvenOddPageStyleCopy(DomainMapper_Impl& rDM_Impl,
const uno::Sequence<beans::Property>
propertyList(pagePropertiesInfo->getProperties());
// Ignore write-only properties.
- static const std::unordered_set<OUString> staticDenylist = {
- "FooterBackGraphicURL", "BackGraphicURL", "HeaderBackGraphicURL",
- "HeaderIsOn", "FooterIsOn",
- "HeaderIsShared", "FooterIsShared", "FirstIsShared",
- "HeaderText", "HeaderTextLeft", "HeaderTextFirst",
- "FooterText", "FooterTextLeft", "FooterTextFirst" };
+ static constexpr frozen::unordered_set<std::u16string_view, 14>
staticDenylist = {
+ u"FooterBackGraphicURL", u"BackGraphicURL", u"HeaderBackGraphicURL",
+ u"HeaderIsOn", u"FooterIsOn",
+ u"HeaderIsShared", u"FooterIsShared", u"FirstIsShared",
+ u"HeaderText", u"HeaderTextLeft", u"HeaderTextFirst",
+ u"FooterText", u"FooterTextLeft", u"FooterTextFirst" };
for (const auto& rProperty : propertyList)
{
