core.git: starmath/source

[Simon Chenery (via logerrit)]

 starmath/source/smmod.cxx |   64 ++++++++++++++++++----------------------------
 1 file changed, 26 insertions(+), 38 deletions(-)

New commits:
commit 1d78c4993c33bb505939243e3d5873f94e12219c
Author:     Simon Chenery <simon_chen...@yahoo.com>
AuthorDate: Tue Feb 25 20:08:11 2025 +0100
Commit:     Hossein <hoss...@libreoffice.org>
CommitDate: Thu Mar 13 14:40:40 2025 +0100

    tdf#147021 avoid use of SAL_N_ELEMENTS macro
    
    Replaced loops with std::find_if calls to avoid use of the
    SAL_N_ELEMENTS macro in smmod.cxx.
    
    Change-Id: I561d8a4ae66dc5ad342009ee8af3c9db87688d97
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182194
    Tested-by: Jenkins
    Reviewed-by: Hossein   <hoss...@libreoffice.org>

diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index 40ac13415e72..2f1aba8daf51 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -43,68 +43,56 @@ OUString SmResId(TranslateId aId) { return 
Translate::get(aId, SmModule::get()->
 
 OUString SmLocalizedSymbolData::GetUiSymbolName( std::u16string_view 
rExportName )
 {
-    OUString aRes;
-
-    for (size_t i = 0; i < SAL_N_ELEMENTS(RID_UI_SYMBOL_NAMES); ++i)
+    auto it = std::find_if(std::begin(RID_UI_SYMBOL_NAMES), 
std::end(RID_UI_SYMBOL_NAMES),
+        [&rExportName](const auto& rUISymbolTranslateId)
+        { return o3tl::equalsAscii(rExportName, rUISymbolTranslateId.getId()); 
});
+    if (it != std::end(RID_UI_SYMBOL_NAMES))
     {
-        if (o3tl::equalsAscii(rExportName, RID_UI_SYMBOL_NAMES[i].getId()))
-        {
-            aRes = SmResId(RID_UI_SYMBOL_NAMES[i]);
-            break;
-        }
+        return SmResId(*it);
     }
 
-    return aRes;
+    return {};
 }
 
 OUString SmLocalizedSymbolData::GetExportSymbolName( std::u16string_view 
rUiName )
 {
-    OUString aRes;
-
-    for (size_t i = 0; i < SAL_N_ELEMENTS(RID_UI_SYMBOL_NAMES); ++i)
+    auto it = std::find_if(std::begin(RID_UI_SYMBOL_NAMES), 
std::end(RID_UI_SYMBOL_NAMES),
+        [&rUiName](const auto& rUISymbolTranslateId)
+        { return rUiName == SmResId(rUISymbolTranslateId); });
+    if (it != std::end(RID_UI_SYMBOL_NAMES))
     {
-        if (rUiName == SmResId(RID_UI_SYMBOL_NAMES[i]))
-        {
-            const char *pKey = RID_UI_SYMBOL_NAMES[i].getId();
-            aRes = OUString(pKey, strlen(pKey), RTL_TEXTENCODING_UTF8);
-            break;
-        }
+        const char *pKey = it->getId();
+        return OUString(pKey, strlen(pKey), RTL_TEXTENCODING_UTF8);
     }
 
-    return aRes;
+    return {};
 }
 
 OUString SmLocalizedSymbolData::GetUiSymbolSetName( std::u16string_view 
rExportName )
 {
-    OUString aRes;
-
-    for (size_t i = 0; i < SAL_N_ELEMENTS(RID_UI_SYMBOLSET_NAMES); ++i)
+    auto it = std::find_if(std::begin(RID_UI_SYMBOLSET_NAMES), 
std::end(RID_UI_SYMBOLSET_NAMES),
+        [&rExportName](const auto& rUISymbolSetTranslateId)
+        { return o3tl::equalsAscii(rExportName, 
rUISymbolSetTranslateId.getId()); });
+    if (it != std::end(RID_UI_SYMBOLSET_NAMES))
     {
-        if (o3tl::equalsAscii(rExportName, RID_UI_SYMBOLSET_NAMES[i].getId()))
-        {
-            aRes = SmResId(RID_UI_SYMBOLSET_NAMES[i]);
-            break;
-        }
+        return SmResId(*it);
     }
 
-    return aRes;
+    return {};
 }
 
 OUString SmLocalizedSymbolData::GetExportSymbolSetName( std::u16string_view 
rUiName )
 {
-    OUString aRes;
-
-    for (size_t i = 0; i < SAL_N_ELEMENTS(RID_UI_SYMBOLSET_NAMES); ++i)
+    auto it = std::find_if(std::begin(RID_UI_SYMBOLSET_NAMES), 
std::end(RID_UI_SYMBOLSET_NAMES),
+        [&rUiName](const auto& rUISymbolSetTranslateId)
+        { return rUiName == SmResId(rUISymbolSetTranslateId); });
+    if (it != std::end(RID_UI_SYMBOLSET_NAMES))
     {
-        if (rUiName == SmResId(RID_UI_SYMBOLSET_NAMES[i]))
-        {
-            const char *pKey = RID_UI_SYMBOLSET_NAMES[i].getId();
-            aRes = OUString(pKey, strlen(pKey), RTL_TEXTENCODING_UTF8);
-            break;
-        }
+        const char *pKey = it->getId();
+        return OUString(pKey, strlen(pKey), RTL_TEXTENCODING_UTF8);
     }
 
-    return aRes;
+    return {};
 }
 
 SFX_IMPL_INTERFACE(SmModule, SfxModule)