core.git: svx/source

[Rosh (via logerrit)]

 svx/source/uitest/uiobject.cxx |   30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

New commits:
commit f5976b8d0b826c0273b616699d1af639beb9f2f1
Author:     Rosh <roshsid...@gmail.com>
AuthorDate: Sat Nov 30 00:29:59 2024 -0800
Commit:     Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Thu Dec 5 08:03:54 2024 +0100

    tdf#158237 Use C++20 contains() instead of find() and end()
    
    Change-Id: I54fbdebbd5287f1e832ed662986b8b3fa45fbe45
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177583
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>

diff --git a/svx/source/uitest/uiobject.cxx b/svx/source/uitest/uiobject.cxx
index 0901a86dd933..2c15932a65f0 100644
--- a/svx/source/uitest/uiobject.cxx
+++ b/svx/source/uitest/uiobject.cxx
@@ -24,24 +24,29 @@ void SvxShowCharSetUIObject::execute(const OUString& 
rAction,
 {
     if (rAction == "SELECT")
     {
-        if (rParameters.find(u"INDEX"_ustr) != rParameters.end())
+        auto itIndex = rParameters.find(u"INDEX"_ustr);
+        if (itIndex != rParameters.end())
         {
-            OUString aIndexStr = rParameters.find(u"INDEX"_ustr)->second;
+            OUString aIndexStr = itIndex->second;
 
             sal_Int32 nIndex = aIndexStr.toInt32();
             mpCharSet->OutputIndex(nIndex);
         }
-        else if (rParameters.find(u"COLUMN"_ustr) != rParameters.end() &&
-                rParameters.find(u"ROW"_ustr) != rParameters.end())
+        else
         {
-            OUString aColStr = rParameters.find(u"COLUMN"_ustr)->second;
-            OUString aRowStr = rParameters.find(u"ROW"_ustr)->second;
+            auto itColumn = rParameters.find(u"COLUMN"_ustr);
+            auto itRow = rParameters.find(u"ROW"_ustr);
+            if (itColumn != rParameters.end() && itRow != rParameters.end())
+            {
+                OUString aColStr = itColumn->second;
+                OUString aRowStr = itRow->second;
 
-            sal_Int32 nColumn = aColStr.toInt32();
-            sal_Int32 nRow = aRowStr.toInt32();
+                sal_Int32 nColumn = aColStr.toInt32();
+                sal_Int32 nRow = aRowStr.toInt32();
 
-            sal_Int32 nIndex = nColumn * COLUMN_COUNT + nRow;
-            mpCharSet->OutputIndex(nIndex);
+                sal_Int32 nIndex = nColumn * COLUMN_COUNT + nRow;
+                mpCharSet->OutputIndex(nIndex);
+            }
         }
     }
     else
@@ -70,9 +75,10 @@ void SvxNumValueSetUIObject::execute(const OUString& rAction,
 {
     if (rAction == "CHOOSE")
     {
-        if (rParameters.find(u"POS"_ustr) != rParameters.end())
+        auto itPos = rParameters.find(u"POS"_ustr);
+        if (itPos != rParameters.end())
         {
-            OUString aIndexStr = rParameters.find(u"POS"_ustr)->second;
+            OUString aIndexStr = itPos->second;
             sal_Int32 nIndex = aIndexStr.toInt32();
             mpNumValueSet->SelectItem(nIndex);
             mpNumValueSet->Select();