From dc63cc326ee5757124cef45e470d290e6e32002e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 13 Jul 2017 09:56:52 +0200 Subject: use more OUString::operator== in dbaccess..filter Change-Id: Ib7b4f2b2403ce766a7db2f6ffc118468e7677776 Reviewed-on: https://gerrit.libreoffice.org/39889 Tested-by: Jenkins Reviewed-by: Noel Grandin --- dbaccess/source/core/dataaccess/ContentHelper.cxx | 2 +- dbaccess/source/core/dataaccess/definitioncontainer.cxx | 2 +- dbaccess/source/core/dataaccess/documentcontainer.cxx | 2 +- dbaccess/source/core/dataaccess/documentdefinition.cxx | 4 ++-- dbaccess/source/inc/apitools.hxx | 2 +- dbaccess/source/shared/registrationhelper.cxx | 4 ++-- dbaccess/source/ui/browser/brwctrlr.cxx | 4 ++-- dbaccess/source/ui/browser/genericcontroller.cxx | 2 +- dbaccess/source/ui/control/dbtreelistbox.cxx | 2 +- dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 2 +- dbaccess/source/ui/misc/WCopyTable.cxx | 2 +- dbaccess/source/ui/misc/stringlistitem.cxx | 2 +- dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 4 ++-- 13 files changed, 17 insertions(+), 17 deletions(-) (limited to 'dbaccess/source') diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index 58b6bb46640e..47c71bcef2e2 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -586,7 +586,7 @@ void SAL_CALL OContentHelper::setParent( const Reference< XInterface >& _xParent void OContentHelper::impl_rename_throw(const OUString& _sNewName,bool _bNotify ) { osl::ClearableGuard< osl::Mutex > aGuard(m_aMutex); - if ( _sNewName.equals( m_pImpl->m_aProps.aTitle ) ) + if ( _sNewName == m_pImpl->m_aProps.aTitle ) return; try { diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index ec1f266dca92..3c3f3089365a 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -497,7 +497,7 @@ namespace { OUString sCurrentName; OSL_VERIFY( xProps->getPropertyValue( PROPERTY_NAME ) >>= sCurrentName ); - if ( sCurrentName.equals( _rName ) ) + if ( sCurrentName == _rName ) return true; } } diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index 6e69a851bcc5..b30ee9adef0d 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -730,7 +730,7 @@ void SAL_CALL ODocumentContainer::rename( const OUString& newName ) try { osl::ClearableGuard< osl::Mutex > aGuard(m_aMutex); - if ( newName.equals( m_pImpl->m_aProps.aTitle ) ) + if ( newName == m_pImpl->m_aProps.aTitle ) return; sal_Int32 nHandle = PROPERTY_ID_NAME; diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index e16edc795661..d117a3fc0ca6 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -369,7 +369,7 @@ OUString ODocumentDefinition::GetDocumentServiceFromMediaType( const OUString& _ if ( ( xObjConfig->getByName( aClassIDs[nInd] ) >>= xObjectProps ) && xObjectProps.is() && ( xObjectProps->getByName("ObjectDocumentServiceName") >>= aEntryDocName ) - && aEntryDocName.equals( sResult ) ) + && aEntryDocName == sResult ) { _rClassId = comphelper::MimeConfigurationHelper::GetSequenceClassIDRepresentation(aClassIDs[nInd]); break; @@ -1916,7 +1916,7 @@ void SAL_CALL ODocumentDefinition::rename( const OUString& _rNewName ) try { ::osl::ResettableMutexGuard aGuard(m_aMutex); - if ( _rNewName.equals( m_pImpl->m_aProps.aTitle ) ) + if ( _rNewName == m_pImpl->m_aProps.aTitle ) return; // document definitions are organized in a hierarchical way, so reject names diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx index f8ff269f15dd..d03fdb0d453b 100644 --- a/dbaccess/source/inc/apitools.hxx +++ b/dbaccess/source/inc/apitools.hxx @@ -81,7 +81,7 @@ public: css::uno::Sequence< OUString > aSupported(getSupportedServiceNames()); \ const OUString* pSupported = aSupported.getConstArray(); \ for (sal_Int32 i=0; iequals(_rServiceName)) \ + if (*pSupported == _rServiceName) \ return true; \ \ return false; \ diff --git a/dbaccess/source/shared/registrationhelper.cxx b/dbaccess/source/shared/registrationhelper.cxx index 26e3cc3f16dc..2c9fbc1f1042 100644 --- a/dbaccess/source/shared/registrationhelper.cxx +++ b/dbaccess/source/shared/registrationhelper.cxx @@ -85,7 +85,7 @@ void OModuleRegistration::revokeComponent(const OUString& _rImplementationName) const OUString* pImplNames = s_pImplementationNames->getConstArray(); for (sal_Int32 i=0; iequals(_rImplementationName)) + if (*pImplNames == _rImplementationName) { removeElementAt(*s_pImplementationNames, i); removeElementAt(*s_pSupportedServices, i); @@ -133,7 +133,7 @@ uno::Reference< uno::XInterface > OModuleRegistration::getComponentFactory( for (sal_Int32 i=0; iequals(_rImplementationName)) + if (*pImplName == _rImplementationName) { const FactoryInstantiation FactoryInstantiationFunction = reinterpret_cast(*pFactoryFunction); const ComponentInstantiation ComponentInstantiationFunction = reinterpret_cast(*pComponentFunction); diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index f40850961bef..b159237e3096 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -1339,7 +1339,7 @@ sal_Bool SbaXDataBrowserController::approveParameter(const css::form::DatabasePa #ifdef DBG_UTIL OUString sName; xParam->getPropertyValue(PROPERTY_NAME) >>= sName; - OSL_ENSURE(sName.equals(pFinalValues->Name), "SbaXDataBrowserController::approveParameter: suspicious value names!"); + OSL_ENSURE(sName == pFinalValues->Name, "SbaXDataBrowserController::approveParameter: suspicious value names!"); #endif try { xParam->setPropertyValue(PROPERTY_VALUE, pFinalValues->Value); } catch(Exception&) @@ -1781,7 +1781,7 @@ void SbaXDataBrowserController::ExecuteFilterSortCrit(bool bFilter) } OUString sNewHaving = xParser->getHavingClause(); - if ( sOldVal.equals(sNewVal) && (!bFilter || sOldHaving.equals(sNewHaving)) ) + if ( sOldVal == sNewVal && (!bFilter || sOldHaving == sNewHaving) ) // nothing to be done return; diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 6c0057e2eea8..d95fd67d0fae 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -730,7 +730,7 @@ void OGenericUnoController::removeStatusListener(const Reference< XStatusListene DispatchTarget& rCurrent = *iterSearch; if ( (rCurrent.xListener == aListener) && ( bRemoveForAll - || (rCurrent.aURL.Complete.equals(_rURL.Complete)) + || (rCurrent.aURL.Complete == _rURL.Complete) ) ) { diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index f6fb342290f5..2553ed8c9aed 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -106,7 +106,7 @@ SvTreeListEntry* DBTreeListBox::GetEntryPosByName( const OUString& aName, SvTree const SvLBoxString* pItem = static_cast( pEntry->GetFirstItem(SvLBoxItemType::String)); - if (pItem && pItem->GetText().equals(aName)) + if (pItem && pItem->GetText() == aName) { if (!_pFilter || _pFilter->includeEntry(pEntry)) // found diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 88a777396536..67a8ce11f480 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -425,7 +425,7 @@ namespace dbaui OUString sTVal( static_cast< sal_Unicode >( rList.getToken( (i+1), nTok ).toInt32() )); - if( sTVal.equals(rVal) ) + if( sTVal == rVal ) { rBox.SetText( rList.getToken( i, nTok ) ); break; diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index d66e4c7bd02c..196da5dfbd3f 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -493,7 +493,7 @@ namespace { Reference< XDatabaseMetaData > xMetaLHS( _rxLHS->getMetaData(), UNO_QUERY_THROW ); Reference< XDatabaseMetaData > xMetaRHS( _rxRHS->getMetaData(), UNO_QUERY_THROW ); - return xMetaLHS->getURL().equals( xMetaRHS->getURL() ); + return xMetaLHS->getURL() == xMetaRHS->getURL(); } } diff --git a/dbaccess/source/ui/misc/stringlistitem.cxx b/dbaccess/source/ui/misc/stringlistitem.cxx index 5e8ea0a691cb..2c5d23f64188 100644 --- a/dbaccess/source/ui/misc/stringlistitem.cxx +++ b/dbaccess/source/ui/misc/stringlistitem.cxx @@ -48,7 +48,7 @@ bool OStringListItem::operator==(const SfxPoolItem& _rItem) const const OUString* pCompareStrings = pCompare->m_aList.getConstArray(); for (sal_Int32 i=0; iequals(*pCompareStrings)) + if (*pMyStrings != *pCompareStrings) return false; return true; diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index b9dfc239f63e..3d9f49ec3a7c 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -1036,7 +1036,7 @@ bool OSelectionBrowseBox::SaveModified() OUString sFunctionName = m_pFunctionCell->GetEntry(nPos); OUString sGroupFunctionName = m_aFunctionStrings.getToken(comphelper::string::getTokenCount(m_aFunctionStrings, ';')-1, ';'); bool bGroupBy = false; - if ( sGroupFunctionName.equals(sFunctionName) ) // check if the function name is GROUP + if ( sGroupFunctionName == sFunctionName ) // check if the function name is GROUP { bGroupBy = true; @@ -1428,7 +1428,7 @@ void OSelectionBrowseBox::DeleteFields(const OUString& rAliasName) for(sal_uInt16 nPos=sal::static_int_cast< sal_uInt16 >(getFields().size());aIter != getFields().rend();++aIter,--nPos) { pEntry = *aIter; - if ( pEntry->GetAlias().equals( rAliasName ) ) + if ( pEntry->GetAlias() == rAliasName ) { RemoveField( GetColumnId( nPos ) ); break; -- cgit