[Libreoffice-commits] core.git: editeng/source

[Willian Pessoa (via logerrit)]

 editeng/source/items/textitem.cxx |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit fec4d0fb9992811d1217624d8eda95eac6da4220
Author:     Willian Pessoa <wpes...@outlook.com>
AuthorDate: Thu Oct 12 17:34:10 2023 -0300
Commit:     Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
CommitDate: Thu Oct 19 14:18:59 2023 +0200

    tdf#147021 Use std::size() in editeng
    
    Change-Id: Id6496b34a3601fb021af2894fbf7f876b444145f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157895
    Tested-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
    Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>

diff --git a/editeng/source/items/textitem.cxx 
b/editeng/source/items/textitem.cxx
index e4c1cdbe14cc..813f907fb784 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -552,7 +552,7 @@ OUString SvxWeightItem::GetValueTextByPos( sal_uInt16 nPos )
         RID_SVXITEMS_WEIGHT_BLACK
     };
 
-    static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_WEIGHTS) - 1 == WEIGHT_BLACK, 
"must match");
+    static_assert(std::size(RID_SVXITEMS_WEIGHTS) - 1 == WEIGHT_BLACK, "must 
match");
     assert(nPos <= sal_uInt16(WEIGHT_BLACK) && "enum overflow!" );
     return EditResId(RID_SVXITEMS_WEIGHTS[nPos]);
 }
@@ -1123,7 +1123,7 @@ OUString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 
nPos ) const
         RID_SVXITEMS_UL_BOLDDASHDOTDOT,
         RID_SVXITEMS_UL_BOLDWAVE
     };
-    static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_UL) - 1 == LINESTYLE_BOLDWAVE, 
"must match");
+    static_assert(std::size(RID_SVXITEMS_UL) - 1 == LINESTYLE_BOLDWAVE, "must 
match");
     assert(nPos <= sal_uInt16(LINESTYLE_BOLDWAVE) && "enum overflow!");
     return EditResId(RID_SVXITEMS_UL[nPos]);
 }
@@ -1164,7 +1164,7 @@ OUString SvxOverlineItem::GetValueTextByPos( sal_uInt16 
nPos ) const
         RID_SVXITEMS_OL_BOLDDASHDOTDOT,
         RID_SVXITEMS_OL_BOLDWAVE
     };
-    static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_OL) - 1 == LINESTYLE_BOLDWAVE, 
"must match");
+    static_assert(std::size(RID_SVXITEMS_OL) - 1 == LINESTYLE_BOLDWAVE, "must 
match");
     assert(nPos <= sal_uInt16(LINESTYLE_BOLDWAVE) && "enum overflow!");
     return EditResId(RID_SVXITEMS_OL[nPos]);
 }
@@ -1229,7 +1229,7 @@ OUString SvxCrossedOutItem::GetValueTextByPos( sal_uInt16 
nPos )
         RID_SVXITEMS_STRIKEOUT_SLASH,
         RID_SVXITEMS_STRIKEOUT_X
     };
-    static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_STRIKEOUT) - 1 == STRIKEOUT_X, 
"must match");
+    static_assert(std::size(RID_SVXITEMS_STRIKEOUT) - 1 == STRIKEOUT_X, "must 
match");
     assert(nPos <= sal_uInt16(STRIKEOUT_X) && "enum overflow!");
     return EditResId(RID_SVXITEMS_STRIKEOUT[nPos]);
 }
@@ -1761,7 +1761,7 @@ OUString SvxCaseMapItem::GetValueTextByPos( sal_uInt16 
nPos )
         RID_SVXITEMS_CASEMAP_SMALLCAPS
     };
 
-    static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_CASEMAP) == 
size_t(SvxCaseMap::End), "must match");
+    static_assert(std::size(RID_SVXITEMS_CASEMAP) == size_t(SvxCaseMap::End), 
"must match");
     assert(nPos < sal_uInt16(SvxCaseMap::End) && "enum overflow!");
     return EditResId(RID_SVXITEMS_CASEMAP[nPos]);
 }
@@ -1881,7 +1881,7 @@ OUString SvxEscapementItem::GetValueTextByPos( sal_uInt16 
nPos )
         RID_SVXITEMS_ESCAPEMENT_SUB
     };
 
-    static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_ESCAPEMENT) == 
size_t(SvxEscapement::End), "must match");
+    static_assert(std::size(RID_SVXITEMS_ESCAPEMENT) == 
size_t(SvxEscapement::End), "must match");
     assert(nPos < sal_uInt16(SvxEscapement::End) && "enum overflow!");
     return EditResId(RID_SVXITEMS_ESCAPEMENT[nPos]);
 }
@@ -2554,13 +2554,13 @@ static TranslateId RID_SVXITEMS_RELIEF[] =
 
 OUString SvxCharReliefItem::GetValueTextByPos(sal_uInt16 nPos)
 {
-    assert(nPos < SAL_N_ELEMENTS(RID_SVXITEMS_RELIEF) && "enum overflow");
+    assert(nPos < std::size(RID_SVXITEMS_RELIEF) && "enum overflow");
     return EditResId(RID_SVXITEMS_RELIEF[nPos]);
 }
 
 sal_uInt16 SvxCharReliefItem::GetValueCount() const
 {
-    return SAL_N_ELEMENTS(RID_SVXITEMS_RELIEF) - 1;
+    return std::size(RID_SVXITEMS_RELIEF) - 1;
 }
 
 bool SvxCharReliefItem::GetPresentation