summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorOmkarAcharekar <omkaracharekar12@gmail.com>2022-10-18 02:15:51 +0530
committerIlmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>2022-10-18 14:24:06 +0200
commit75e6ffe31d74ac36d8864b018008d4208a7efe73 (patch)
tree02d5d3c15e381e072bb748a4cc988dc9c08af7d0 /filter
parent0bf8a781ffec13b4fbcb96a2e9349b423a92cb1d (diff)
tdf#147021 Use std::size() instead of SAL_N_ELEMENTS() macro
Change-Id: I35c883a1b05a797e83a41698fa205796e681d7c8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141482 Tested-by: Jenkins Tested-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Diffstat (limited to 'filter')
-rw-r--r--filter/source/config/cache/typedetection.cxx2
-rw-r--r--filter/source/msfilter/countryid.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 5acaf88ed5fe..0aaa2ffa6c3d 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -284,7 +284,7 @@ int getFlatTypeRank(std::u16string_view rType)
"math_MathType_3x", // MathType equation embedded in Word doc.
};
- size_t n = SAL_N_ELEMENTS(ranks);
+ size_t n = std::size(ranks);
for (size_t i = 0; i < n; ++i)
{
diff --git a/filter/source/msfilter/countryid.cxx b/filter/source/msfilter/countryid.cxx
index 9ad504ab3272..a6f72001db17 100644
--- a/filter/source/msfilter/countryid.cxx
+++ b/filter/source/msfilter/countryid.cxx
@@ -243,7 +243,7 @@ const CountryEntry pTable[] =
{ COUNTRY_UZBEKISTAN, LANGUAGE_UZBEK_LATIN, false }
};
-const CountryEntry * const pEnd = pTable + SAL_N_ELEMENTS( pTable );
+const CountryEntry * const pEnd = pTable + std::size( pTable );
/** Predicate comparing a country ID with the member of a CountryEntry. */
struct CountryEntryPred_Country