strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#158237 Use C++20 contains() instead of find() and end()

Browse source 
Change-Id: I54fbdebbd5287f1e832ed662986b8b3fa45fbe45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177583
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
This commit is contained in:
Rosh 2024-11-30 00:29:59 -08:00 committed by Stephan Bergmann
parent 112736d1ea
commit f5976b8d0b
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
svx/source/uitest/uiobject.cxx
View file

@ -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();