[Libreoffice-commits] core.git: formula/source framework/source

[Adam Seskunas (via logerrit)]

 formula/source/ui/dlg/parawin.cxx                    |    2 +-
 framework/source/fwe/classes/addonsoptions.cxx       |    2 +-
 framework/source/uielement/controlmenucontroller.cxx |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b1b002c293ddf38be125dc9083f41eb27452c450
Author:     Adam Seskunas <adamsesku...@gmail.com>
AuthorDate: Thu Aug 31 14:14:03 2023 -0700
Commit:     Hossein <hoss...@libreoffice.org>
CommitDate: Mon Sep 4 15:50:51 2023 +0200

    tdf#147021 use std::size instead of SAL_N_ELEMENTS
    
    Change-Id: Ibc6c83f950890ac9b7a754cc49973736fa81dcb8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156364
    Tested-by: Jenkins
    Reviewed-by: Hossein <hoss...@libreoffice.org>

diff --git a/formula/source/ui/dlg/parawin.cxx 
b/formula/source/ui/dlg/parawin.cxx
index f09c0e51ec01..bcc1c2d1a962 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -496,7 +496,7 @@ IMPL_LINK( ParaWin, GetFxHdl, ArgInput&, rPtr, void )
 {
     sal_uInt16 nOffset = GetSliderPos();
     nEdFocus=NOT_FOUND;
-    for (size_t nPos=0; nPos < SAL_N_ELEMENTS(aArgInput); ++nPos)
+    for (size_t nPos=0; nPos < std::size(aArgInput); ++nPos)
     {
         if(&rPtr == &aArgInput[nPos])
         {
diff --git a/framework/source/fwe/classes/addonsoptions.cxx 
b/framework/source/fwe/classes/addonsoptions.cxx
index d35b9a34c69e..cd384c737aa7 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -1594,7 +1594,7 @@ void AddonsOptions_Impl::ReadAndAssociateImages( const 
OUString& aURL, const OUS
 
     // Loop to create the two possible image names and try to read the bitmap 
files
     static const char* aExtArray[] = { "_16", "_26" };
-    for ( size_t i = 0; i < SAL_N_ELEMENTS(aExtArray); i++ )
+    for ( size_t i = 0; i < std::size(aExtArray); i++ )
     {
         OUStringBuffer aFileURL( aImageURL );
         aFileURL.appendAscii( aExtArray[i] );
diff --git a/framework/source/uielement/controlmenucontroller.cxx 
b/framework/source/uielement/controlmenucontroller.cxx
index afbf3ec9258d..b6dd84e069ce 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -188,7 +188,7 @@ void 
ControlMenuController::updateImagesPopupMenu(Reference<awt::XPopupMenu> con
 {
     if (!rPopupMenu)
         return;
-    for (size_t i=0; i < SAL_N_ELEMENTS(aCommands); ++i)
+    for (size_t i=0; i < std::size(aCommands); ++i)
     {
         sal_Int16 nItemId = i + 1;
         if (m_bShowMenuImages)