dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
New commits: commit 817e7e92d4aff329f628b5ea82d34dcef39f5a66 Author: siddhi <[email protected]> AuthorDate: Wed Oct 15 09:29:37 2025 +0530 Commit: Ilmari Lauhakangas <[email protected]> CommitDate: Thu Oct 16 17:58:04 2025 +0200 tdf#158237 Use C++20 contains() instead of find() and end() replace find() and end() with contains() in SingleSelectQueryComposer.cxx Change-Id: I965108b9f733e7097ea1812092ac1b5044dadac4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192421 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas <[email protected]> diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index c8c6f7ecbd2a..b385c5fb6c70 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -888,7 +888,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) size_t nFoundSelectColumnPos = aFind - aSelectColumns->begin(); if ( aFind != aSelectColumns->end() ) { - if ( aUsedSelectColumns.find( nFoundSelectColumnPos ) != aUsedSelectColumns.end() ) + if ( aUsedSelectColumns.contains( nFoundSelectColumnPos ) ) { // we found a column name which exists twice // so we start after the first found do @@ -896,9 +896,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) aFind = ::connectivity::findRealName(++aFind,aSelectColumns->end(),sColumnName,aCaseCompare); nFoundSelectColumnPos = aFind - aSelectColumns->begin(); } - while ( ( aUsedSelectColumns.find( nFoundSelectColumnPos ) != aUsedSelectColumns.end() ) - && ( aFind != aSelectColumns->end() ) - ); + while ( aUsedSelectColumns.contains( nFoundSelectColumnPos ) && aFind != aSelectColumns->end() ); } if ( aFind != aSelectColumns->end() ) {
