vcl/workben/vcldemo.cxx | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 0176752f6d9431d3b0b1e3c3d81acb2a8dca8fe0
Author: Nam Bui <ndbu...@gmail.com>
AuthorDate: Fri Mar 7 11:19:48 2025 -0500
Commit: Hossein <hoss...@libreoffice.org>
CommitDate: Wed Mar 12 01:35:32 2025 +0100
tdf#147021 Use std::size() instead of SAL_N_ELEMENTS()
Use std::size() in vcl/workben/vcldemo.cxx
Change-Id: I7a320b79ee218a32af3a1a5a52bda08fd972ad46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182756
Tested-by: Jenkins
Reviewed-by: Hossein <hoss...@libreoffice.org>
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index d5094cd9fea6..1b3964384736 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -405,7 +405,7 @@ public:
0xd8, 0xab, 0xd8, 0xa9, 0xd9, 0x8c, 0x00
};
aText = OUString(reinterpret_cast<char const *>(pTextUTF8),
- SAL_N_ELEMENTS( pTextUTF8 ) - 1,
+ std::size( pTextUTF8 ) - 1,
RTL_TEXTENCODING_UTF8);
}
else
@@ -813,11 +813,11 @@ public:
0, 0, 0, 0, 0
};
DemoRenderer::clearRects(rDev, aRegions);
- assert(aRegions.size() <= SAL_N_ELEMENTS(nStartCols));
- assert(aRegions.size() <= SAL_N_ELEMENTS(nEndCols));
- assert(aRegions.size() <= SAL_N_ELEMENTS(eStyles));
- assert(aRegions.size() <= SAL_N_ELEMENTS(nAngles));
- assert(aRegions.size() <= SAL_N_ELEMENTS(nBorders));
+ assert(aRegions.size() <= std::size(nStartCols));
+ assert(aRegions.size() <= std::size(nEndCols));
+ assert(aRegions.size() <= std::size(eStyles));
+ assert(aRegions.size() <= std::size(nAngles));
+ assert(aRegions.size() <= std::size(nBorders));
for (size_t i = 0; i < aRegions.size(); i++)
{
tools::Rectangle aSub = aRegions[i];
@@ -1201,7 +1201,7 @@ public:
"cmd/lc_basicshapes.rectangle.png",
"cmd/lc_basicshapes.round-rectangle.png"
};
- for (size_t i = 0; i < SAL_N_ELEMENTS(pNames); i++)
+ for (size_t i = 0; i < std::size(pNames); i++)
{
maIconNames.push_back(OUString::createFromAscii(pNames[i]));
maIcons.emplace_back(maIconNames[i]);
@@ -2003,7 +2003,7 @@ public:
IMPL_LINK(DemoWidgets, CursorButtonClick, Button*, pButton, void)
{
- for (size_t i=0; i<SAL_N_ELEMENTS(gvPointerData); ++i)
+ for (size_t i=0; i<std::size(gvPointerData); ++i)
{
if (mvCursorButtons[i].get() == pButton)
{
