From 6abc09926c9b55a445b906303f56c6ec7fdeabf9 Mon Sep 17 00:00:00 2001 From: Pragat Pandya Date: Sun, 8 May 2022 23:56:45 +0530 Subject: tdf#147021 Use std::size() instead of SAL_N_ELEMENTS() macro Change-Id: I54257e87da0cd66da59d820c7960c3e4b020fda3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134027 Reviewed-by: Bartosz Kosiorek Tested-by: Jenkins --- basic/source/comp/token.cxx | 2 +- basic/source/sbx/sbxscan.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'basic') diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx index 9be47bf41ba1..a060b3fd9318 100644 --- a/basic/source/comp/token.cxx +++ b/basic/source/comp/token.cxx @@ -377,7 +377,7 @@ SbiToken SbiTokenizer::Next() } // valid token? short lb = 0; - short ub = SAL_N_ELEMENTS(aTokTable_Basic)-1; + short ub = std::size(aTokTable_Basic)-1; short delta; do { diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index 82080df4a62a..ec2783b1b837 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -600,7 +600,7 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt ) const sal_Unicode aBuf[2]; aBuf[0] = '0'; aBuf[1] = '0' + nMin; - rRes = OUString(aBuf, SAL_N_ELEMENTS(aBuf)); + rRes = OUString(aBuf, std::size(aBuf)); } else { -- cgit