tdf#147021 Use std::size() instead of SAL_N_ELEMENTS() macro

Also change some integer by std::size_t

Change-Id: I999b4dddba6ef1feb0a65aad24e97f507b577b59
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136104
Tested-by: Jenkins
Reviewed-by: Hossein <hossein@libreoffice.org>

2 files changed, 35 insertions, 36 deletions

diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx
index 13a7b32e706b..eff907f49b47 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -27,7 +27,6 @@
 #include <comphelper/extract.hxx>
 #include <o3tl/safeint.hxx>
 #include <osl/diagnose.h>
-#include <sal/macros.h>
 #include <algorithm>
 
 namespace pcr
@@ -98,7 +97,7 @@ namespace pcr
 #define DEF_INFO_4( ident, uinameres, pos, helpid, flag1, flag2, flag3, flag4 ) \
     DEF_INFO( ident, uinameres, pos, helpid, PROP_FLAG_##flag1 | PROP_FLAG_##flag2 | PROP_FLAG_##flag3 | PROP_FLAG_##flag4 )
 
-    sal_uInt16              OPropertyInfoService::s_nCount = 0;
+    std::size_t             OPropertyInfoService::s_nCount = 0;
     OPropertyInfoImpl*      OPropertyInfoService::s_pPropertyInfos = nullptr;
 
     const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo()
@@ -359,7 +358,7 @@ namespace pcr
         };
 
         s_pPropertyInfos = aPropertyInfos;
-        s_nCount = SAL_N_ELEMENTS(aPropertyInfos);
+        s_nCount = std::size(aPropertyInfos);
 
         // sort
         std::sort( s_pPropertyInfos, s_pPropertyInfos + s_nCount, PropertyInfoLessByName() );
@@ -416,126 +415,126 @@ namespace pcr
             return { "Get", "Post" };
         }
         const TranslateId* pStringItemsResId = nullptr;
-        int nElements = 0;
+        std::size_t nElements = 0;
         switch ( _nId )
         {
             case PROPERTY_ID_IMAGEPOSITION:
                 pStringItemsResId = RID_RSC_ENUM_IMAGE_POSITION;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_IMAGE_POSITION);
+                nElements = std::size(RID_RSC_ENUM_IMAGE_POSITION);
                 break;
             case PROPERTY_ID_BORDER:
                 pStringItemsResId = RID_RSC_ENUM_BORDER_TYPE;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_BORDER_TYPE);
+                nElements = std::size(RID_RSC_ENUM_BORDER_TYPE);
                 break;
             case PROPERTY_ID_ICONSIZE:
                 pStringItemsResId = RID_RSC_ENUM_ICONSIZE_TYPE;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_ICONSIZE_TYPE);
+                nElements = std::size(RID_RSC_ENUM_ICONSIZE_TYPE);
                 break;
             case PROPERTY_ID_COMMANDTYPE:
                 pStringItemsResId = RID_RSC_ENUM_COMMAND_TYPE;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_COMMAND_TYPE);
+                nElements = std::size(RID_RSC_ENUM_COMMAND_TYPE);
                 break;
             case PROPERTY_ID_LISTSOURCETYPE:
                 pStringItemsResId = RID_RSC_ENUM_LISTSOURCE_TYPE;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_LISTSOURCE_TYPE);
+                nElements = std::size(RID_RSC_ENUM_LISTSOURCE_TYPE);
                 break;
             case PROPERTY_ID_ALIGN:
                 pStringItemsResId = RID_RSC_ENUM_ALIGNMENT;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_ALIGNMENT);
+                nElements = std::size(RID_RSC_ENUM_ALIGNMENT);
                 break;
             case PROPERTY_ID_VERTICAL_ALIGN:
                 pStringItemsResId = RID_RSC_ENUM_VERTICAL_ALIGN;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_VERTICAL_ALIGN);
+                nElements = std::size(RID_RSC_ENUM_VERTICAL_ALIGN);
                 break;
             case PROPERTY_ID_BUTTONTYPE:
                 pStringItemsResId = RID_RSC_ENUM_BUTTONTYPE;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_BUTTONTYPE);
+                nElements = std::size(RID_RSC_ENUM_BUTTONTYPE);
                 break;
             case PROPERTY_ID_PUSHBUTTONTYPE:
                 pStringItemsResId = RID_RSC_ENUM_PUSHBUTTONTYPE;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_PUSHBUTTONTYPE);
+                nElements = std::size(RID_RSC_ENUM_PUSHBUTTONTYPE);
                 break;
             case PROPERTY_ID_SUBMIT_ENCODING:
                 pStringItemsResId = RID_RSC_ENUM_SUBMIT_ENCODING;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_SUBMIT_ENCODING);
+                nElements = std::size(RID_RSC_ENUM_SUBMIT_ENCODING);
                 break;
             case PROPERTY_ID_DATEFORMAT:
                 pStringItemsResId = RID_RSC_ENUM_DATEFORMAT_LIST;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_DATEFORMAT_LIST);
+                nElements = std::size(RID_RSC_ENUM_DATEFORMAT_LIST);
                 break;
             case PROPERTY_ID_TIMEFORMAT:
                 pStringItemsResId = RID_RSC_ENUM_TIMEFORMAT_LIST;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_TIMEFORMAT_LIST);
+                nElements = std::size(RID_RSC_ENUM_TIMEFORMAT_LIST);
                 break;
             case PROPERTY_ID_DEFAULT_STATE:
             case PROPERTY_ID_STATE:
                 pStringItemsResId = RID_RSC_ENUM_CHECKED;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_CHECKED);
+                nElements = std::size(RID_RSC_ENUM_CHECKED);
                 break;
             case PROPERTY_ID_CYCLE:
                 pStringItemsResId = RID_RSC_ENUM_CYCLE;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_CYCLE);
+                nElements = std::size(RID_RSC_ENUM_CYCLE);
                 break;
             case PROPERTY_ID_NAVIGATION:
                 pStringItemsResId = RID_RSC_ENUM_NAVIGATION;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_NAVIGATION);
+                nElements = std::size(RID_RSC_ENUM_NAVIGATION);
                 break;
             case PROPERTY_ID_TARGET_FRAME:
                 pStringItemsResId = RID_RSC_ENUM_SUBMIT_TARGET;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_SUBMIT_TARGET);
+                nElements = std::size(RID_RSC_ENUM_SUBMIT_TARGET);
                 break;
             case PROPERTY_ID_ORIENTATION:
                 pStringItemsResId = RID_RSC_ENUM_ORIENTATION;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_ORIENTATION);
+                nElements = std::size(RID_RSC_ENUM_ORIENTATION);
                 break;
             case PROPERTY_ID_CELL_EXCHANGE_TYPE:
                 pStringItemsResId = RID_RSC_ENUM_CELL_EXCHANGE_TYPE;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_CELL_EXCHANGE_TYPE);
+                nElements = std::size(RID_RSC_ENUM_CELL_EXCHANGE_TYPE);
                 break;
             case PROPERTY_ID_SHOW_SCROLLBARS:
                 pStringItemsResId = RID_RSC_ENUM_SCROLLBARS;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_SCROLLBARS);
+                nElements = std::size(RID_RSC_ENUM_SCROLLBARS);
                 break;
             case PROPERTY_ID_VISUALEFFECT:
                 pStringItemsResId = RID_RSC_ENUM_VISUALEFFECT;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_VISUALEFFECT);
+                nElements = std::size(RID_RSC_ENUM_VISUALEFFECT);
                 break;
             case PROPERTY_ID_TEXTTYPE:
                 pStringItemsResId = RID_RSC_ENUM_TEXTTYPE;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_TEXTTYPE);
+                nElements = std::size(RID_RSC_ENUM_TEXTTYPE);
                 break;
             case PROPERTY_ID_LINEEND_FORMAT:
                 pStringItemsResId = RID_RSC_ENUM_LINEEND_FORMAT;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_LINEEND_FORMAT);
+                nElements = std::size(RID_RSC_ENUM_LINEEND_FORMAT);
                 break;
             case PROPERTY_ID_XSD_WHITESPACES:
                 pStringItemsResId = RID_RSC_ENUM_WHITESPACE_HANDLING;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_WHITESPACE_HANDLING);
+                nElements = std::size(RID_RSC_ENUM_WHITESPACE_HANDLING);
                 break;
             case PROPERTY_ID_SELECTION_TYPE:
             case PROPERTY_ID_SELECTIONMODEL:
                 pStringItemsResId = RID_RSC_ENUM_SELECTION_TYPE;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_SELECTION_TYPE);
+                nElements = std::size(RID_RSC_ENUM_SELECTION_TYPE);
                 break;
             case PROPERTY_ID_SCALE_MODE:
                 pStringItemsResId = RID_RSC_ENUM_SCALE_MODE;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_SCALE_MODE);
+                nElements = std::size(RID_RSC_ENUM_SCALE_MODE);
                 break;
             case PROPERTY_ID_WRITING_MODE:
                 pStringItemsResId = RID_RSC_ENUM_WRITING_MODE;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_WRITING_MODE);
+                nElements = std::size(RID_RSC_ENUM_WRITING_MODE);
                 break;
             case PROPERTY_ID_WHEEL_BEHAVIOR:
                 pStringItemsResId = RID_RSC_ENUM_WHEEL_BEHAVIOR;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_WHEEL_BEHAVIOR);
+                nElements = std::size(RID_RSC_ENUM_WHEEL_BEHAVIOR);
                 break;
             case PROPERTY_ID_TEXT_ANCHOR_TYPE:
                 pStringItemsResId = RID_RSC_ENUM_TEXT_ANCHOR_TYPE;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_TEXT_ANCHOR_TYPE);
+                nElements = std::size(RID_RSC_ENUM_TEXT_ANCHOR_TYPE);
                 break;
             case PROPERTY_ID_SHEET_ANCHOR_TYPE:
                 pStringItemsResId = RID_RSC_ENUM_SHEET_ANCHOR_TYPE;
-                nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_SHEET_ANCHOR_TYPE);
+                nElements = std::size(RID_RSC_ENUM_SHEET_ANCHOR_TYPE);
                 break;
             default:
                 OSL_FAIL( "OPropertyInfoService::getPropertyEnumRepresentations: unknown enum property!" );
@@ -545,7 +544,7 @@ namespace pcr
         std::vector< OUString > aReturn;
 
         aReturn.reserve(nElements);
-        for (int i = 0; i < nElements; ++i)
+        for (std::size_t i = 0; i < nElements; ++i)
         {
             aReturn.push_back(PcrRes(pStringItemsResId[i]));
         }
@@ -591,7 +590,7 @@ namespace pcr
             getPropertyInfo();
 
         // TODO: a real structure which allows quick access by name as well as by id
-        for (sal_uInt16 i = 0; i < s_nCount; i++)
+        for (std::size_t i = 0; i < s_nCount; ++i)
             if (s_pPropertyInfos[i].nId == _nId)
                 return &s_pPropertyInfos[i];
 
diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx
index 0f7aa67d2c59..c2c297740b01 100644
--- a/extensions/source/propctrlr/formmetadata.hxx
+++ b/extensions/source/propctrlr/formmetadata.hxx
@@ -35,7 +35,7 @@ namespace pcr
     class OPropertyInfoService final
                 :public IPropertyInfoService
     {
-        static sal_uInt16               s_nCount;
+        static std::size_t              s_nCount;
         static OPropertyInfoImpl*       s_pPropertyInfos;
         // TODO: a real structure which allows quick access by name as well as by id