jvmfwk/qa/unit/sunversion.cxx | 6 +++--- lingucomponent/source/languageguessing/guesslang.cxx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit b29cb6524b39f6a049fbe05d957f6e80c427f2d0 Author: Vaibhav Kumar Singh <[email protected]> AuthorDate: Mon Oct 6 05:25:40 2025 +0530 Commit: Ilmari Lauhakangas <[email protected]> CommitDate: Mon Oct 6 11:22:30 2025 +0200 tdf#147021 Use std::size() in place of SAL_N_ELEMENTS() macro Change-Id: I15f604da81408e74b4f78d03e99726da45f94677 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191931 Tested-by: Ilmari Lauhakangas <[email protected]> Reviewed-by: Ilmari Lauhakangas <[email protected]> Tested-by: Jenkins diff --git a/jvmfwk/qa/unit/sunversion.cxx b/jvmfwk/qa/unit/sunversion.cxx index a717dc438b90..4064d4b0f0f6 100644 --- a/jvmfwk/qa/unit/sunversion.cxx +++ b/jvmfwk/qa/unit/sunversion.cxx @@ -58,9 +58,9 @@ void TestSunVersion::testSunVersion() "1.3.1", "1.3.1_00a", "1.3.1_01", "1.3.1_01a", "1.3.2", "1.4.0", "1.5.0_01-ea", "2.0.0"}; - int num = SAL_N_ELEMENTS (versions); - int numBad = SAL_N_ELEMENTS (badVersions); - int numOrdered = SAL_N_ELEMENTS (orderedVer); + int num = std::size(versions); + int numBad = std::size(badVersions); + int numOrdered = std::size(orderedVer); //parsing test (positive) for (int i = 0; i < num; i++) { diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx index d87542b889fb..0ff6d08b0b79 100644 --- a/lingucomponent/source/languageguessing/guesslang.cxx +++ b/lingucomponent/source/languageguessing/guesslang.cxx @@ -139,7 +139,7 @@ void LangGuess_Impl::EnsureInitialized() {"ka", ""}, {"hi", ""}, {"mr", ""}, {"ne", ""}, {"sa", ""}, {"ta", ""}, {"th", ""}, {"qu", ""}, {"yi", ""} }; - sal_Int32 nNum = SAL_N_ELEMENTS(aDisable); + sal_Int32 nNum = std::size(aDisable); Sequence< Locale > aDisableSeq( nNum ); Locale *pDisableSeq = aDisableSeq.getArray(); for (sal_Int32 i = 0; i < nNum; ++i)
