basctl/source/basicide/scriptdocument.cxx | 6 ++---- basic/source/classes/codecompletecache.cxx | 3 +-- basic/source/uno/scriptcont.cxx | 9 +-------- canvas/source/directx/dx_config.cxx | 2 +- 4 files changed, 5 insertions(+), 15 deletions(-)
New commits: commit 520d75f9d29b6a8f43f47e232746bbe9dcdaaca1 Author: Sergey Anisimov <[email protected]> AuthorDate: Mon Oct 13 17:21:49 2025 +0300 Commit: Hossein <[email protected]> CommitDate: Wed Oct 15 00:44:52 2025 +0200 tdf#158237 - Use C++20 contains() instead of find() and end() Change-Id: I2f8497f20acd72653530d60fec738dcbd4b1af10 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192318 Reviewed-by: Mike Kaganski <[email protected]> Tested-by: Jenkins Reviewed-by: Hossein <[email protected]> diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx index 320d5cc1148c..074b07f2ff0f 100644 --- a/basctl/source/basicide/scriptdocument.cxx +++ b/basctl/source/basicide/scriptdocument.cxx @@ -1234,10 +1234,8 @@ namespace basctl sal_Int32 i = 1; while ( !bValid ) { - aObjectName = aBaseName - + OUString::number( i ); - - if ( aUsedNamesCheck.find( aObjectName ) == aUsedNamesCheck.end() ) + aObjectName = aBaseName + OUString::number( i ); + if ( !aUsedNamesCheck.contains(aObjectName) ) bValid = true; ++i; diff --git a/basic/source/classes/codecompletecache.cxx b/basic/source/classes/codecompletecache.cxx index c38d7673d142..88bea95e6672 100644 --- a/basic/source/classes/codecompletecache.cxx +++ b/basic/source/classes/codecompletecache.cxx @@ -134,8 +134,7 @@ void CodeCompleteDataCache::InsertGlobalVar( const OUString& sVarName, const OUS void CodeCompleteDataCache::InsertLocalVar( const OUString& sProcName, const OUString& sVarName, const OUString& sVarType ) { - CodeCompleteVarScopes::const_iterator aIt = aVarScopes.find( sProcName ); - if( aIt == aVarScopes.end() ) //new procedure + if( !aVarScopes.contains(sProcName) ) //new procedure { CodeCompleteVarTypes aTypes; aTypes.emplace( sVarName, sVarType ); diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index 45018e23ea5d..bf44665f222d 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -1202,14 +1202,7 @@ script::ModuleInfo SAL_CALL SfxScriptLibrary::getModuleInfo( const OUString& Mod sal_Bool SAL_CALL SfxScriptLibrary::hasModuleInfo( const OUString& ModuleName ) { - bool bRes = false; - ModuleInfoMap::iterator it = mModuleInfo.find( ModuleName ); - - if ( it != mModuleInfo.end() ) - { - bRes = true; - } - return bRes; + return mModuleInfo.contains(ModuleName); } void SAL_CALL SfxScriptLibrary::insertModuleInfo( const OUString& ModuleName, const script::ModuleInfo& ModuleInfo ) diff --git a/canvas/source/directx/dx_config.cxx b/canvas/source/directx/dx_config.cxx index 643877659edd..9f4c78a980b7 100644 --- a/canvas/source/directx/dx_config.cxx +++ b/canvas/source/directx/dx_config.cxx @@ -120,7 +120,7 @@ namespace dxcanvas bool DXCanvasItem::isDeviceUsable( const DeviceInfo& rDeviceInfo ) const { - return maValues.find(rDeviceInfo) == maValues.end(); + return !maValues.contains(rDeviceInfo); } bool DXCanvasItem::isDenylistCurrentDevice() const
