l10ntools/source/localize.cxx | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
New commits: commit fd48da7236f26d9d8d16759546a5c860f91b82de Author: Nilesh Patra <nil...@iki.fi> AuthorDate: Mon Aug 18 04:42:39 2025 +0530 Commit: Arnaud Versini <arnaud.vers...@pm.me> CommitDate: Mon Aug 18 23:54:32 2025 +0200 tdf#147021 Replace SAL_N_ELEMENTS() macro with std::size() in localize.cxx Change-Id: I99d81d219254e225af6a804e5adc3eecbb588d1b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189835 Reviewed-by: Arnaud Versini <arnaud.vers...@pm.me> Tested-by: Jenkins diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index 96da93e139e2..29e482270c85 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -74,14 +74,14 @@ bool passesNegativeList(std::u16string_view rUrl) { "org.openoffice.hu.hunspell.dictionaries/page1.xhp"), u"/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu" }; - return !matchList(rUrl, list, SAL_N_ELEMENTS(list)); + return !matchList(rUrl, list, std::size(list)); } bool passesPositiveList(std::u16string_view rUrl) { static const std::u16string_view list[] = { u"/description.xml" }; - return matchList(rUrl, list, SAL_N_ELEMENTS(list)); + return matchList(rUrl, list, std::size(list)); } void handleCommand( @@ -302,7 +302,7 @@ void handleFilesOfDir( } bool includeProject(std::string_view rProject) { - static const char *projects[] = { + static constexpr std::string_view projects[] = { "include", "accessibility", "avmedia", @@ -353,12 +353,7 @@ bool includeProject(std::string_view rProject) { "wizards", "writerperfect", "xmlsecurity" }; - for (size_t i = 0; i != SAL_N_ELEMENTS(projects); ++i) { - if (rProject == projects[i]) { - return true; - } - } - return false; + return std::find(std::begin(projects), std::end(projects), rProject) != std::end(projects); } /// Handle one directory in the hierarchy.