svl/qa/unit/svl.cxx | 10 +++++----- svl/source/numbers/zformat.cxx | 2 +- svl/source/numbers/zforscan.cxx | 2 +- vcl/source/window/debugevent.cxx | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-)
New commits: commit 4fbeee65ecaa59aa156529c3b213f4f14d59036f Author: Akaki Dzidziguri <[email protected]> AuthorDate: Fri Nov 21 12:01:28 2025 +0400 Commit: Ilmari Lauhakangas <[email protected]> CommitDate: Fri Dec 12 15:21:49 2025 +0100 tdf#147021 Use std::size() instead of SAL_N_ELEMENTS in svl and vcl Change-Id: I5b4c00d58a09fb545558cf3f94139ee87020f5e2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194300 Reviewed-by: Ilmari Lauhakangas <[email protected]> Tested-by: Jenkins diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx index 54878e9451e3..9afc57d1799d 100644 --- a/svl/qa/unit/svl.cxx +++ b/svl/qa/unit/svl.cxx @@ -497,7 +497,7 @@ void Test::testFdo60915() 0x0E51, 0x0E51, 0x002F, 0x0E52, 0x0E55, 0x0E54, 0x0E52 }; - sExpected = OUString(sTemp, SAL_N_ELEMENTS(sTemp)); + sExpected = OUString(sTemp, std::size(sTemp)); checkPreviewString(aFormatter, sCode, fPreviewNumber, eLang, sExpected); } { @@ -508,7 +508,7 @@ void Test::testFdo60915() 0x0E51, 0x0E51, 0x002F, 0x0E54, 0x0E52 }; - sExpected = OUString(sTemp, SAL_N_ELEMENTS(sTemp)); + sExpected = OUString(sTemp, std::size(sTemp)); checkPreviewString(aFormatter, sCode, fPreviewNumber, eLang, sExpected); } } @@ -530,7 +530,7 @@ void Test::testI116701() 0x0044, // D 0x0022, 0x65E5, 0x0022 }; - sCode = OUString(CODE1, SAL_N_ELEMENTS(CODE1)); + sCode = OUString(CODE1, std::size(CODE1)); sal_Unicode EXPECTED[] = { 0x4E2D, 0x83EF, 0x6C11, 0x570B, @@ -541,7 +541,7 @@ void Test::testI116701() 0x0033, 0x0030, // 30 0x65E5 }; - sExpected = OUString(EXPECTED, SAL_N_ELEMENTS(EXPECTED)); + sExpected = OUString(EXPECTED, std::size(EXPECTED)); checkPreviewString(aFormatter, sCode, fPreviewNumber, eLang, sExpected); sal_Unicode CODE2[] = { @@ -552,7 +552,7 @@ void Test::testI116701() 0x0044, // D 0x0022, 0x65E5, 0x0022 }; - sCode = OUString(CODE2, SAL_N_ELEMENTS(CODE2)); + sCode = OUString(CODE2, std::size(CODE2)); checkPreviewString(aFormatter, sCode, fPreviewNumber, eLang, sExpected); } diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 65855709854a..9d617058f436 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -5692,7 +5692,7 @@ OUString SvNumberformat::ImpGetNatNumString(const SvNumberNatNum& rNum, sal_Unicode aBuf[2]; aBuf[0] = '0'; aBuf[1] = '0' + nVal; - aStr = OUString(aBuf, SAL_N_ELEMENTS(aBuf)); + aStr = OUString(aBuf, std::size(aBuf)); } else { diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx index 7f88979446c7..058e32fad980 100644 --- a/svl/source/numbers/zforscan.cxx +++ b/svl/source/numbers/zforscan.cxx @@ -119,7 +119,7 @@ static const std::u16string_view& GermanColorName(size_t i) u"GRÜN", u"CYAN", u"ROT", u"MAGENTA", u"BRAUN", u"GRAU", u"GELB", u"WEISS" }; - assert(i < SAL_N_ELEMENTS(sGermanColorNames)); + assert(i < std::size(sGermanColorNames)); return sGermanColorNames[i]; } diff --git a/vcl/source/window/debugevent.cxx b/vcl/source/window/debugevent.cxx index f9f6978f0e33..9444a3eb0afa 100644 --- a/vcl/source/window/debugevent.cxx +++ b/vcl/source/window/debugevent.cxx @@ -99,7 +99,7 @@ void DebugEventInjector::InjectMenuEvent() std::vector< SalMenuEvent > aIds; CollectMenuItemIds( pMenuBar, aIds ); - SalEvent nEvent = nEvents[ static_cast<int>(getRandom() * SAL_N_ELEMENTS( nEvents )) ]; + SalEvent nEvent = nEvents[ static_cast<int>(getRandom() * std::size( nEvents )) ]; SalMenuEvent aEvent = aIds[ getRandom() * aIds.size() ]; bool bHandled = ImplWindowFrameProc( pSysWin, nEvent, &aEvent); @@ -140,7 +140,7 @@ void DebugEventInjector::InjectTextEvent() { KEY_A, KEY_Z, 'a' } }; - size_t i = getRandom() * SAL_N_ELEMENTS( nTextCodes ); + size_t i = getRandom() * std::size( nTextCodes ); int offset = int( getRandom() * ( nTextCodes[i].nCodeEnd - nTextCodes[i].nCodeStart ) ); aKeyEvent.mnCode = nTextCodes[i].nCodeStart + offset; aKeyEvent.mnCharCode = nTextCodes[i].aCharStart + offset;
