diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index fd0c261c1878..fe08797c4830 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -89,6 +89,7 @@ $(eval $(call gb_Library_use_libraries,sw,\ $(eval $(call gb_Library_use_externals,sw,\ boost_headers \ + frozen \ icui18n \ icuuc \ icu_headers \ diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index fb229e586ca9..b78be39a98e9 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -22,6 +22,10 @@ #include #include +#include +#include +#include + #include #include #include @@ -2252,7 +2256,7 @@ SwXText::convertToSwTable( { try { - static const std::initializer_list vDenylist = { + constexpr auto vDenylist = frozen::make_unordered_set({ u"BottomBorder", u"CharAutoKerning", u"CharFontName", @@ -2289,8 +2293,8 @@ SwXText::convertToSwTable( u"ParaRightBorder", u"ParaRightBorderDistance", u"ParaRightBorderComplexColor", - }; - if (std::find(vDenylist.begin(), vDenylist.end(), rTableProperty.Name) == vDenylist.end()) + }); + if (vDenylist.find(rTableProperty.Name) == vDenylist.end()) { xRet->setPropertyValue(rTableProperty.Name, rTableProperty.Value); }