core.git: sw/source

[Rosh (via logerrit)]

 sw/source/ui/fldui/fldref.cxx |   30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

New commits:
commit ece03018cb6e0bcc6bf56b1a703c29f04df88eed
Author:     Rosh <roshsid...@gmail.com>
AuthorDate: Thu Nov 28 00:16:13 2024 -0800
Commit:     Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
CommitDate: Mon Dec 2 09:27:44 2024 +0100

    tdf#147021 - Use std::size() instead of SAL_N_ELEMENTS() macro
    
    Change-Id: I08c84cd3fdc1a1606bbfedbbf5a4987f923cefa8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177467
    Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
    Tested-by: Jenkins

diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 9001aa634bc8..ef88650962f0 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -929,42 +929,42 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId)
     {
         for (sal_uInt16 i = 0; i < nSize; i++)
         {
-            OUString sId(OUString::number(GetFieldMgr().GetFormatId( 
nFieldType, i + SAL_N_ELEMENTS(FMT_REF_ARY))));
+            OUString sId(OUString::number(GetFieldMgr().GetFormatId( 
nFieldType, i + std::size(FMT_REF_ARY))));
             m_xFormatLB->append(sId, 
SwResId(FMT_REF_WITH_LOWERCASE_HU_ARTICLE) + GetFieldMgr().GetFormatStr( 
nFieldType, i ));
         }
         nExtraSize += nSize;
 
         if ( bAddCrossRefFormats )
         {
-            sal_uInt16 nFormat = FMT_REF_NUMBER_IDX + 
SAL_N_ELEMENTS(FMT_REF_ARY);
+            sal_uInt16 nFormat = FMT_REF_NUMBER_IDX + std::size(FMT_REF_ARY);
             OUString 
sId(OUString::number(GetFieldMgr().GetFormatId(nFieldType, nFormat)));
-            m_xFormatLB->append(sId, 
SwResId(FMT_REF_WITH_LOWERCASE_HU_ARTICLE) + GetFieldMgr().GetFormatStr( 
nFieldType, nFormat % SAL_N_ELEMENTS(FMT_REF_ARY)));
-            nFormat = FMT_REF_NUMBER_NO_CONTEXT_IDX + 
SAL_N_ELEMENTS(FMT_REF_ARY);
+            m_xFormatLB->append(sId, 
SwResId(FMT_REF_WITH_LOWERCASE_HU_ARTICLE) + GetFieldMgr().GetFormatStr( 
nFieldType, nFormat % std::size(FMT_REF_ARY)));
+            nFormat = FMT_REF_NUMBER_NO_CONTEXT_IDX + std::size(FMT_REF_ARY);
             sId = OUString::number(GetFieldMgr().GetFormatId(nFieldType, 
nFormat));
-            m_xFormatLB->append(sId, 
SwResId(FMT_REF_WITH_LOWERCASE_HU_ARTICLE) + GetFieldMgr().GetFormatStr( 
nFieldType, nFormat % SAL_N_ELEMENTS(FMT_REF_ARY)));
-            nFormat = FMT_REF_NUMBER_FULL_CONTEXT_IDX + 
SAL_N_ELEMENTS(FMT_REF_ARY);
+            m_xFormatLB->append(sId, 
SwResId(FMT_REF_WITH_LOWERCASE_HU_ARTICLE) + GetFieldMgr().GetFormatStr( 
nFieldType, nFormat % std::size(FMT_REF_ARY)));
+            nFormat = FMT_REF_NUMBER_FULL_CONTEXT_IDX + std::size(FMT_REF_ARY);
             sId = OUString::number(GetFieldMgr().GetFormatId(nFieldType, 
nFormat));
-            m_xFormatLB->append(sId, 
SwResId(FMT_REF_WITH_LOWERCASE_HU_ARTICLE) + GetFieldMgr().GetFormatStr( 
nFieldType, nFormat % SAL_N_ELEMENTS(FMT_REF_ARY)));
+            m_xFormatLB->append(sId, 
SwResId(FMT_REF_WITH_LOWERCASE_HU_ARTICLE) + GetFieldMgr().GetFormatStr( 
nFieldType, nFormat % std::size(FMT_REF_ARY)));
             nExtraSize += 3;
         }
         // uppercase article
         for (sal_uInt16 i = 0; i < nSize; i++)
         {
-            OUString sId(OUString::number(GetFieldMgr().GetFormatId( 
nFieldType, i + 2 * SAL_N_ELEMENTS(FMT_REF_ARY))));
+            OUString sId(OUString::number(GetFieldMgr().GetFormatId( 
nFieldType, i + 2 * std::size(FMT_REF_ARY))));
             m_xFormatLB->append(sId, 
SwResId(FMT_REF_WITH_UPPERCASE_HU_ARTICLE) + GetFieldMgr().GetFormatStr( 
nFieldType, i ));
         }
         nExtraSize += nSize;
         if ( bAddCrossRefFormats )
         {
-            sal_uInt16 nFormat = FMT_REF_NUMBER_IDX + 2 * 
SAL_N_ELEMENTS(FMT_REF_ARY);
+            sal_uInt16 nFormat = FMT_REF_NUMBER_IDX + 2 * 
std::size(FMT_REF_ARY);
             OUString 
sId(OUString::number(GetFieldMgr().GetFormatId(nFieldType, nFormat)));
-            m_xFormatLB->append(sId, 
SwResId(FMT_REF_WITH_UPPERCASE_HU_ARTICLE) + GetFieldMgr().GetFormatStr( 
nFieldType, nFormat % SAL_N_ELEMENTS(FMT_REF_ARY)));
-            nFormat = FMT_REF_NUMBER_NO_CONTEXT_IDX + 2 * 
SAL_N_ELEMENTS(FMT_REF_ARY);
+            m_xFormatLB->append(sId, 
SwResId(FMT_REF_WITH_UPPERCASE_HU_ARTICLE) + GetFieldMgr().GetFormatStr( 
nFieldType, nFormat % std::size(FMT_REF_ARY)));
+            nFormat = FMT_REF_NUMBER_NO_CONTEXT_IDX + 2 * 
std::size(FMT_REF_ARY);
             sId = OUString::number(GetFieldMgr().GetFormatId(nFieldType, 
nFormat));
-            m_xFormatLB->append(sId, 
SwResId(FMT_REF_WITH_UPPERCASE_HU_ARTICLE) + GetFieldMgr().GetFormatStr( 
nFieldType, nFormat % SAL_N_ELEMENTS(FMT_REF_ARY)));
-            nFormat = FMT_REF_NUMBER_FULL_CONTEXT_IDX + 2 * 
SAL_N_ELEMENTS(FMT_REF_ARY);
+            m_xFormatLB->append(sId, 
SwResId(FMT_REF_WITH_UPPERCASE_HU_ARTICLE) + GetFieldMgr().GetFormatStr( 
nFieldType, nFormat % std::size(FMT_REF_ARY)));
+            nFormat = FMT_REF_NUMBER_FULL_CONTEXT_IDX + 2 * 
std::size(FMT_REF_ARY);
             sId = OUString::number(GetFieldMgr().GetFormatId(nFieldType, 
nFormat));
-            m_xFormatLB->append(sId, 
SwResId(FMT_REF_WITH_UPPERCASE_HU_ARTICLE) + GetFieldMgr().GetFormatStr( 
nFieldType, nFormat % SAL_N_ELEMENTS(FMT_REF_ARY)));
+            m_xFormatLB->append(sId, 
SwResId(FMT_REF_WITH_UPPERCASE_HU_ARTICLE) + GetFieldMgr().GetFormatStr( 
nFieldType, nFormat % std::size(FMT_REF_ARY)));
             nExtraSize += 3;
         }
     }
@@ -977,7 +977,7 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId)
         if (!IsFieldEdit())
             m_xFormatLB->select_text(sOldSel);
         else
-            
m_xFormatLB->select_text(SwResId(FMT_REF_ARY[GetCurField()->GetFormat() % 
SAL_N_ELEMENTS(FMT_REF_ARY)]));
+            
m_xFormatLB->select_text(SwResId(FMT_REF_ARY[GetCurField()->GetFormat() % 
std::size(FMT_REF_ARY)]));
 
         if (m_xFormatLB->get_selected_index() == -1)
         {