dbaccess/source/core/api/querycontainer.cxx | 4 ++-- dbaccess/source/core/dataaccess/definitioncontainer.cxx | 2 +- dbaccess/source/ui/querydesign/JoinTableView.cxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit eb8e6ddd6a4c2336c882644462aecc4359766695 Author: Bogdan Buzea <[email protected]> AuthorDate: Tue Nov 19 21:00:00 2024 +0100 Commit: Ilmari Lauhakangas <[email protected]> CommitDate: Fri Nov 29 20:49:15 2024 +0100 tdf#158237 dbaccess: use c++20 contains() instead of find() and end() Change-Id: I03e682093bff3b743b074d0d1dc68994f31ae707 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176800 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas <[email protected]> diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx index 57307c6f1214..105591202be9 100644 --- a/dbaccess/source/core/api/querycontainer.cxx +++ b/dbaccess/source/core/api/querycontainer.cxx @@ -266,7 +266,7 @@ void SAL_CALL OQueryContainer::elementRemoved( const css::container::ContainerEv _rEvent.Accessor >>= sAccessor; { OSL_ENSURE(!sAccessor.isEmpty(), "OQueryContainer::elementRemoved : invalid name !"); - OSL_ENSURE(m_aDocumentMap.find(sAccessor) != m_aDocumentMap.end(), "OQueryContainer::elementRemoved : oops... we're inconsistent with our master container !"); + OSL_ENSURE(m_aDocumentMap.contains(sAccessor), "OQueryContainer::elementRemoved : oops... we're inconsistent with our master container !"); if ( sAccessor.isEmpty() || !hasByName(sAccessor) ) return; } @@ -282,7 +282,7 @@ void SAL_CALL OQueryContainer::elementReplaced( const css::container::ContainerE { MutexGuard aGuard(m_aMutex); OSL_ENSURE(!sAccessor.isEmpty(), "OQueryContainer::elementReplaced : invalid name !"); - OSL_ENSURE(m_aDocumentMap.find(sAccessor) != m_aDocumentMap.end(), "OQueryContainer::elementReplaced : oops... we're inconsistent with our master container !"); + OSL_ENSURE(m_aDocumentMap.contains(sAccessor), "OQueryContainer::elementReplaced : oops... we're inconsistent with our master container !"); if (sAccessor.isEmpty() || !hasByName(sAccessor)) return; diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index 3dca110c3d1c..9f050d79e08b 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -670,7 +670,7 @@ void ODefinitionContainer::removeObjectListener(const Reference< XContent >& _xN bool ODefinitionContainer::checkExistence(const OUString& _rName) { - return m_aDocumentMap.find(_rName) != m_aDocumentMap.end(); + return m_aDocumentMap.contains(_rName); } } diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 246e854203e6..001a76a76d86 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -324,7 +324,7 @@ void OJoinTableView::AddTabWin(const OUString& _rComposedName, const OUString& r { m_pView->getController().getTableWindowData().push_back( pNewTabWinData); // when we already have a table with this name insert the full qualified one instead - if(m_aTableMap.find(rWinName) != m_aTableMap.end()) + if(m_aTableMap.contains(rWinName)) m_aTableMap[_rComposedName] = pNewTabWin; else m_aTableMap[rWinName] = pNewTabWin;
