use more OUString::operator== comphelper..cui

Change-Id: Ib5f3037249152be2b66acf347d1a0c236dc7adfa
Reviewed-on: https://gerrit.libreoffice.org/39888
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

31 files changed, 73 insertions, 73 deletions

diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index 4fbb49c4a65c..530872c1a714 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -669,7 +669,7 @@ bool EmbeddedObjectContainer::TryToCopyGraphReplacement( EmbeddedObjectContainer
 {
     bool bResult = false;
 
-    if ( ( &rSrc != this || !aOrigName.equals( aTargetName ) ) && !aOrigName.isEmpty() && !aTargetName.isEmpty() )
+    if ( ( &rSrc != this || aOrigName != aTargetName ) && !aOrigName.isEmpty() && !aTargetName.isEmpty() )
     {
         OUString aMediaType;
         uno::Reference < io::XInputStream > xGrStream = rSrc.GetGraphicStream( aOrigName, &aMediaType );
diff --git a/comphelper/source/misc/sequence.cxx b/comphelper/source/misc/sequence.cxx
index 43e7c89a85b5..b0b48d275380 100644
--- a/comphelper/source/misc/sequence.cxx
+++ b/comphelper/source/misc/sequence.cxx
@@ -32,7 +32,7 @@ css::uno::Sequence<sal_Int16> findValue(const css::uno::Sequence< OUString >& _r
         const OUString* pTArray = _rList.getConstArray();
         for (sal_Int32 i = 0; i < nLength; ++i, ++pTArray)
         {
-            if( pTArray->equals(_rValue) )
+            if( *pTArray == _rValue )
             {
                 nPos = i;
                 break;
@@ -60,7 +60,7 @@ css::uno::Sequence<sal_Int16> findValue(const css::uno::Sequence< OUString >& _r
         const OUString* pTArray = _rList.getConstArray();
         for (sal_Int32 i = 0; i < nLength; ++i, ++pTArray)
         {
-            if( pTArray->equals(_rValue) )
+            if( *pTArray == _rValue )
             {
                 *pReturn = (sal_Int16)i;
                 ++pReturn;
diff --git a/comphelper/source/property/property.cxx b/comphelper/source/property/property.cxx
index a0083908246f..5e3fd29dc01b 100644
--- a/comphelper/source/property/property.cxx
+++ b/comphelper/source/property/property.cxx
@@ -151,7 +151,7 @@ void RemoveProperty(Sequence<Property>& _rProps, const OUString& _rPropName)
 
     if ( pResult != _rProps.end() && pResult->Name == _rPropName )
     {
-        OSL_ENSURE(pResult->Name.equals(_rPropName), "::RemoveProperty Properties not sorted");
+        OSL_ENSURE(pResult->Name == _rPropName, "::RemoveProperty Properties not sorted");
         removeElementAt(_rProps, pResult - pProperties);
     }
 }
diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx
index c1729c5576b9..44a1c058d05c 100644
--- a/comphelper/source/property/propertycontainerhelper.cxx
+++ b/comphelper/source/property/propertycontainerhelper.cxx
@@ -56,7 +56,7 @@ namespace
 
         bool operator() (const PropertyDescription& x ) const
         {
-            return x.aProperty.Name.equals(m_rCompare);
+            return x.aProperty.Name == m_rCompare;
         }
     };
 }
diff --git a/comphelper/source/property/propertystatecontainer.cxx b/comphelper/source/property/propertystatecontainer.cxx
index 063cc79e35b4..d06c3f190443 100644
--- a/comphelper/source/property/propertystatecontainer.cxx
+++ b/comphelper/source/property/propertystatecontainer.cxx
@@ -119,7 +119,7 @@ namespace comphelper
                 OSL_ENSURE( pAllProperties->Name.compareTo( (pAllProperties + 1)->Name ) < 0,
                     "OPropertyStateContainer::getPropertyStates: all-properties not sorted!" );
 #endif
-            if ( pAllProperties->Name.equals( *pLookup ) )
+            if ( pAllProperties->Name == *pLookup )
             {
                 *pStates++ = getPropertyState( *pLookup );
                 ++pLookup;
diff --git a/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx
index 366b881cf1c6..b391b4af3f74 100644
--- a/comphelper/source/property/propstate.cxx
+++ b/comphelper/source/property/propstate.cxx
@@ -129,7 +129,7 @@ namespace comphelper
         for (sal_Int32 i=0, j=0; i<nPropCount && j<nLen; ++i, ++pProps)
         {
             // get the values only for valid properties
-            if (pProps->Name.equals(*pNames))
+            if (pProps->Name == *pNames)
             {
                 *pValues = getPropertyState(*pNames);
                 ++pValues;
diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx
index cc8067dc9901..58e4a0fbc7a2 100644
--- a/comphelper/source/xml/ofopxmlhelper.cxx
+++ b/comphelper/source/xml/ofopxmlhelper.cxx
@@ -441,7 +441,7 @@ void SAL_CALL OFOPXMLHelper_Impl::endElement( const OUString& aName )
         if ( nLength <= 0 )
             throw css::xml::sax::SAXException(); // TODO: no other end elements expected!
 
-        if ( !m_aElementsSeq[nLength-1].equals( aName ) )
+        if ( m_aElementsSeq[nLength-1] != aName )
             throw css::xml::sax::SAXException(); // TODO: unexpected element ended
 
         m_aElementsSeq.resize( nLength - 1 );
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index c89a9578e5db..37e69c7f9d74 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1737,7 +1737,7 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer,
             {
                 OUString sName;
                 xParamColumn->getPropertyValue(PROPERTY_NAME) >>= sName;
-                OSL_ENSURE(sName.equals(pFinalValues->Name), "::dbaui::askForParameters: inconsistent parameter names!");
+                OSL_ENSURE(sName == pFinalValues->Name, "::dbaui::askForParameters: inconsistent parameter names!");
 
                 // determine the field type and ...
                 sal_Int32 nParamType = 0;
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index 6f0b4188943c..b37206798150 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -194,7 +194,7 @@ void SAL_CALL OHSQLTable::alterColumnByName( const OUString& colName, const Refe
         // now we should look if the name of the column changed
         OUString sNewColumnName;
         descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_NAME)) >>= sNewColumnName;
-        if ( !sNewColumnName.equals(colName) )
+        if ( sNewColumnName != colName )
         {
             const OUString sQuote = getMetaData()->getIdentifierQuoteString(  );
 
diff --git a/connectivity/source/drivers/postgresql/pq_xtable.cxx b/connectivity/source/drivers/postgresql/pq_xtable.cxx
index 148c21a927c2..1d9e37cae218 100644
--- a/connectivity/source/drivers/postgresql/pq_xtable.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xtable.cxx
@@ -163,7 +163,7 @@ void Table::rename( const OUString& newName )
     }
     OUString fullNewName = concatQualified( newSchemaName, newTableName );
 
-    if( extractStringProperty( this, st.TYPE ).equals( st.VIEW ) && m_pSettings->views.is() )
+    if( extractStringProperty( this, st.TYPE ) == st.VIEW && m_pSettings->views.is() )
     {
         // maintain view list (really strange API !)
         Any a = m_pSettings->pViewsImpl->getByName( fullOldName );
@@ -177,7 +177,7 @@ void Table::rename( const OUString& newName )
     }
     else
     {
-        if( ! newSchemaName.equals(schema) )
+        if( newSchemaName != schema )
         {
             // try new schema name first
             try
@@ -201,7 +201,7 @@ void Table::rename( const OUString& newName )
             }
 
         }
-        if( ! newTableName.equals( oldName ) ) // might also be just the change of a schema name
+        if( newTableName != oldName ) // might also be just the change of a schema name
         {
             OUStringBuffer buf(128);
             buf.append( "ALTER TABLE" );
diff --git a/connectivity/source/drivers/postgresql/pq_xtables.cxx b/connectivity/source/drivers/postgresql/pq_xtables.cxx
index feaaf745fad1..52a418da6a9c 100644
--- a/connectivity/source/drivers/postgresql/pq_xtables.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xtables.cxx
@@ -326,7 +326,7 @@ void Tables::dropByIndex( sal_Int32 index )
     OUString name,schema;
     set->getPropertyValue( st.SCHEMA_NAME ) >>= schema;
     set->getPropertyValue( st.NAME ) >>= name;
-    if( extractStringProperty( set, st.TYPE ).equals( st.VIEW ) && m_pSettings->views.is() )
+    if( extractStringProperty( set, st.TYPE ) == st.VIEW && m_pSettings->views.is() )
     {
         m_pSettings->pViewsImpl->dropByName( concatQualified( schema, name ) );
     }
@@ -334,7 +334,7 @@ void Tables::dropByIndex( sal_Int32 index )
     {
         OUStringBuffer update( 128 );
         update.append( "DROP " );
-        if( extractStringProperty( set, st.TYPE ).equals( st.VIEW ) )
+        if( extractStringProperty( set, st.TYPE ) == st.VIEW )
             update.append( "VIEW " );
         else
             update.append( "TABLE " );
diff --git a/connectivity/source/drivers/postgresql/pq_xview.cxx b/connectivity/source/drivers/postgresql/pq_xview.cxx
index 2c8b6b7035b5..99f2f8510c2a 100644
--- a/connectivity/source/drivers/postgresql/pq_xview.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xview.cxx
@@ -112,7 +112,7 @@ void View::rename( const OUString& newName )
     }
     OUString fullNewName = concatQualified( newSchemaName, newTableName );
 
-    if( ! schema.equals( newSchemaName ) )
+    if( schema != newSchemaName )
     {
         try
         {
@@ -135,7 +135,7 @@ void View::rename( const OUString& newName )
         }
 
     }
-    if( ! oldName.equals( newTableName ) )
+    if( oldName != newTableName )
     {
         OUStringBuffer buf(128);
         buf.append( "ALTER TABLE" );
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index b69e8646910e..53216e2bd0cd 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -229,7 +229,7 @@ Any SAL_CALL ODriverEnumeration::nextElement(  )
 
         bool operator()( const DriverAccess& lhs)
         {
-            return lhs.sImplementationName.equals(m_sImplName);
+            return lhs.sImplementationName == m_sImplName;
         }
     };
 
diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx
index 2c1100a62499..1efdbfb81622 100644
--- a/cppu/source/uno/EnvStack.cxx
+++ b/cppu/source/uno/EnvStack.cxx
@@ -153,10 +153,10 @@ static rtl::OUString s_getPrefix(rtl::OUString const & str1, rtl::OUString const
         token1 = str1.getToken(0, ':', nIndex1);
         token2 = str2.getToken(0, ':', nIndex2);
 
-        if (token1.equals(token2))
+        if (token1 == token2)
             sim += token1.getLength() + 1;
     }
-    while(nIndex1 == nIndex2 && nIndex1 >= 0 && token1.equals(token2));
+    while(nIndex1 == nIndex2 && nIndex1 >= 0 && token1 == token2);
 
     rtl::OUString result;
 
diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx
index 69721566d9c2..ec3147ef59a5 100644
--- a/cppu/source/uno/cascade_mapping.cxx
+++ b/cppu/source/uno/cascade_mapping.cxx
@@ -187,10 +187,10 @@ static rtl::OUString getPrefix(rtl::OUString const & str1, rtl::OUString const &
         token1 = str1.getToken(0, ':', nIndex1);
         token2 = str2.getToken(0, ':', nIndex2);
 
-        if (token1.equals(token2))
+        if (token1 == token2)
             sim += token1.getLength() + 1;
     }
-    while(nIndex1 == nIndex2 && nIndex1 >= 0 && token1.equals(token2));
+    while(nIndex1 == nIndex2 && nIndex1 >= 0 && token1 == token2);
 
     rtl::OUString result;
 
@@ -258,7 +258,7 @@ void getCascadeMapping(uno_Mapping     ** ppMapping,
 
         // direct mapping possible?
         // uno:bla-->uno:bla:blubb
-        if (from_envPurpose.equals(purpose))
+        if (from_envPurpose == purpose)
         {
             rtl::OUString rest = to_envPurpose.copy(purpose.getLength());
 
@@ -271,7 +271,7 @@ void getCascadeMapping(uno_Mapping     ** ppMapping,
 
             uno_envDcp += rest.copy(0, index);
         }
-        else if (to_envPurpose.equals(purpose))
+        else if (to_envPurpose == purpose)
         {
             rtl::OUString rest = from_envPurpose.copy(purpose.getLength());
 
diff --git a/cppu/source/uno/eq.hxx b/cppu/source/uno/eq.hxx
index 008a204a104e..64a4d631ff4a 100644
--- a/cppu/source/uno/eq.hxx
+++ b/cppu/source/uno/eq.hxx
@@ -166,7 +166,7 @@ inline bool _equalSequence(
     {
         for ( sal_Int32 nPos = nElements; nPos--; )
         {
-            if (! (static_cast<OUString *>(pDestElements) +nPos)->equals( static_cast<const ::rtl::OUString *>(pSourceElements)[nPos] ))
+            if ( static_cast<OUString *>(pDestElements)[nPos] != static_cast<const ::rtl::OUString *>(pSourceElements)[nPos] )
                 return false;
         }
         return true;
@@ -522,8 +522,8 @@ inline bool _equalData(
         }
     case typelib_TypeClass_STRING:
         return eSourceTypeClass == typelib_TypeClass_STRING
-            && (static_cast<OUString *>(pDest))->equals(
-                *static_cast<OUString const *>(pSource) );
+            && *static_cast<OUString *>(pDest) ==
+                *static_cast<OUString const *>(pSource);
     case typelib_TypeClass_TYPE:
         return eSourceTypeClass == typelib_TypeClass_TYPE
             && _type_equals(
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 0439a242e5a4..f8c225de7bd1 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -992,7 +992,7 @@ inline void EnvironmentsData::getRegisteredEnvironments(
     {
         uno_Environment * pWeak = iPos->second;
         if (rEnvDcp.isEmpty() ||
-            rEnvDcp.equals( pWeak->pTypeName ))
+            rEnvDcp == pWeak->pTypeName )
         {
             aFounds[nSize] = nullptr;
             (*pWeak->harden)( &aFounds[nSize], pWeak );
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index 855dea236836..3d9a18a31931 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -103,7 +103,7 @@ static bool readOption( OUString * pValue, const sal_Char * pOpt,
         ++(*pnIndex);
 
         rtl_getAppCommandArg(*pnIndex, &pValue->pData);
-        if (*pnIndex >= rtl_getAppCommandArgCount() || pValue->copy(1).equals(dash))
+        if (*pnIndex >= rtl_getAppCommandArgCount() || pValue->copy(1) == dash)
         {
             throw RuntimeException( "incomplete option \"-" + aOpt + "\" given!" );
         }
@@ -130,7 +130,7 @@ static bool readOption( bool * pbOpt, const sal_Char * pOpt,
 {
     OUString aOpt = OUString::createFromAscii(pOpt);
 
-    if(aArg.startsWith("--") && aOpt.equals(aArg.copy(2)))
+    if(aArg.startsWith("--") && aOpt == aArg.copy(2))
     {
         ++(*pnIndex);
         *pbOpt = true;
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index d4788d7bf6ed..af75d2a2af30 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -273,7 +273,7 @@ generateCustomName(
     {
         SvxConfigEntry* pEntry = *iter;
 
-        if ( name.equals( pEntry->GetName() ) )
+        if ( name == pEntry->GetName() )
         {
             break;
         }
@@ -311,7 +311,7 @@ generateCustomURL(
     {
         SvxConfigEntry* pEntry = *iter;
 
-        if ( url.equals( pEntry->GetCommand() ) )
+        if ( url == pEntry->GetCommand() )
         {
             break;
         }
@@ -343,7 +343,7 @@ generateCustomMenuURL(
     {
         SvxConfigEntry* pEntry = *iter;
 
-        if ( url.equals( pEntry->GetCommand() ) )
+        if ( url == pEntry->GetCommand() )
         {
             break;
         }
@@ -1894,7 +1894,7 @@ void SvxConfigPage::Reset( const SfxItemSet* )
                     } catch(const uno::Exception&)
                         { aCheckId.clear(); }
 
-                    if ( aModuleId.equals( aCheckId ) )
+                    if ( aModuleId == aCheckId )
                     {
                         // try to get the document based ui configuration manager
                         OUString aTitle2;
@@ -3355,7 +3355,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton, void )
         OUString aSystemName =
             pSaveInData->GetSystemUIName( pEntry->GetCommand() );
 
-        if ( !pEntry->GetName().equals( aSystemName ) )
+        if ( pEntry->GetName() != aSystemName )
         {
             pEntry->SetName( aSystemName );
             m_pContentsListBox->SetEntryText(
@@ -3550,7 +3550,7 @@ void SvxToolbarConfigPage::Init()
             SvxConfigEntry* pData =
                 static_cast<SvxConfigEntry*>(m_pTopLevelListBox->GetEntryData( i ));
 
-            if ( pData->GetCommand().equals( m_aURLToSelect ) )
+            if ( pData->GetCommand() == m_aURLToSelect )
             {
                 nPos = i;
                 break;
@@ -3980,7 +3980,7 @@ ToolbarSaveInData::HasURL( const OUString& rURL )
     {
         SvxConfigEntry* pEntry = *iter;
 
-        if ( pEntry->GetCommand().equals( rURL ) )
+        if ( pEntry->GetCommand() == rURL )
         {
             return !pEntry->IsParentData();
         }
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 17c445d672e8..399db0ae57de 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -576,18 +576,18 @@ void SfxConfigGroupListBox::FillScriptList(const css::uno::Reference< css::scrip
                 OUString uiName = theChild->getName();
                 if ( bIsRootNode )
                 {
-                    if (  ! (theChild->getName().equals( user )  || theChild->getName().equals( share ) ||
-                             theChild->getName().equals( currentDocTitle ) ) )
+                    if (  ! (theChild->getName() == user  || theChild->getName() == share ||
+                             theChild->getName() == currentDocTitle ) )
                     {
                         bDisplay=false;
                     }
                     else
                     {
-                        if ( uiName.equals( user ) )
+                        if ( uiName == user )
                         {
                             uiName = xImp->m_sMyMacros;
                         }
-                        else if ( uiName.equals( share ) )
+                        else if ( uiName == share )
                         {
                             uiName = xImp->m_sProdMacros;
                         }
@@ -816,7 +816,7 @@ SfxConfigGroupListBox::getDocumentModel( Reference< XComponentContext > const &
         {
             OUString sTdocUrl =
                 ::comphelper::DocumentInfo::getDocumentTitle( model );
-            if( sTdocUrl.equals( docName ) )
+            if( sTdocUrl == docName )
             {
                 xModel = model;
                 break;
diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx
index 092fdc5e46d2..3ce4048d4021 100644
--- a/cui/source/dialogs/SpellAttrib.hxx
+++ b/cui/source/dialogs/SpellAttrib.hxx
@@ -75,15 +75,15 @@ struct SpellErrorDescription
     bool operator==( const SpellErrorDescription& rDesc ) const
     {
         return bIsGrammarError == rDesc.bIsGrammarError &&
-                sErrorText.equals( rDesc.sErrorText ) &&
-                aLocale.Language.equals( rDesc.aLocale.Language ) &&
-                aLocale.Country.equals( rDesc.aLocale.Country ) &&
-                aLocale.Variant.equals( rDesc.aLocale.Variant ) &&
+                sErrorText == rDesc.sErrorText &&
+                aLocale.Language == rDesc.aLocale.Language &&
+                aLocale.Country == rDesc.aLocale.Country &&
+                aLocale.Variant == rDesc.aLocale.Variant &&
                 aSuggestions == rDesc.aSuggestions &&
                 xGrammarChecker == rDesc.xGrammarChecker &&
-                sDialogTitle.equals( rDesc.sDialogTitle ) &&
-                sExplanation.equals( rDesc.sExplanation ) &&
-                sExplanationURL.equals( rDesc.sExplanationURL ) &&
+                sDialogTitle == rDesc.sDialogTitle &&
+                sExplanation == rDesc.sExplanation &&
+                sExplanationURL == rDesc.sExplanationURL &&
                 sRuleId == rDesc.sRuleId;
     }
 };
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 1fb06ab73da0..d36cd93a4fed 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -467,7 +467,7 @@ IMPL_LINK( SpellDialog, ExtClickHdl, Button *, pBtn, void )
             //if it's not the 'no suggestions' entry
             if(sWrong == sCurrentErrorText &&
                     m_pSuggestionLB->IsEnabled() && m_pSuggestionLB->GetSelectEntryCount() > 0 &&
-                    !m_sNoSuggestionsST.equals(m_pSuggestionLB->GetSelectEntry()))
+                    m_sNoSuggestionsST != m_pSuggestionLB->GetSelectEntry())
             {
                 sCurrentErrorText = m_pSuggestionLB->GetSelectEntry();
             }
@@ -538,7 +538,7 @@ OUString SpellDialog::getReplacementString() const
 
     if(m_pSuggestionLB->IsEnabled() &&
             m_pSuggestionLB->GetSelectEntryCount()>0 &&
-            !m_sNoSuggestionsST.equals(m_pSuggestionLB->GetSelectEntry()))
+            m_sNoSuggestionsST != m_pSuggestionLB->GetSelectEntry())
         sReplacement = m_pSuggestionLB->GetSelectEntry();
 
     return getDotReplacementString(sOrigString, sReplacement);
@@ -711,7 +711,7 @@ void SpellDialog::Impl_Restore(bool bUseSavedSentence)
 
 IMPL_LINK_NOARG(SpellDialog, IgnoreHdl, Button*, void)
 {
-    if (m_sResumeST.equals(m_pIgnorePB->GetText()))
+    if (m_sResumeST == m_pIgnorePB->GetText())
     {
         Impl_Restore(false);
     }
@@ -1727,7 +1727,7 @@ void SentenceEditWindow_Impl::RestoreCurrentError()
     if( pAttrib )
     {
         const SpellErrorDescription& rDesc = pAttrib->GetErrorDescription();
-        if( !rDesc.sErrorText.equals( GetErrorText() ) )
+        if( rDesc.sErrorText != GetErrorText() )
             ChangeMarkedWord(rDesc.sErrorText, LanguageTag::convertToLanguageType( rDesc.aLocale ));
     }
 }
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 44c3d21c742b..1b07b528665f 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -1468,11 +1468,11 @@ void SAL_CALL ColorPicker::setPropertyValues( const Sequence< PropertyValue >& a
 {
     for( sal_Int32 n = 0; n < aProps.getLength(); n++ )
     {
-        if( aProps[n].Name.equals( msColorKey ) )
+        if( aProps[n].Name == msColorKey )
         {
             aProps[n].Value >>= mnColor;
         }
-        else if( aProps[n].Name.equals( msModeKey ) )
+        else if( aProps[n].Name == msModeKey )
         {
             aProps[n].Value >>= mnMode;
         }
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 82c3000d21f2..fd3d9b3ba8df 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -262,7 +262,7 @@ void FmSearchDialog::Init(const OUString& strVisibleFields, const OUString& sIni
     // control characters, as can be the case with memo fields), I use
     // an empty OUString.
     OUString sRealSetText = m_pcmbSearchText->GetText();
-    if (!sRealSetText.equals(sInitialText))
+    if (sRealSetText != sInitialText)
         m_pcmbSearchText->SetText(OUString());
     LINK(this, FmSearchDialog, OnSearchTextModified).Call(*m_pcmbSearchText);
 
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 1e3860d71456..ec0f4e4c1f1e 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -192,10 +192,10 @@ void SFTreeListBox::Init( const OUString& language  )
         bool app = false;
         OUString uiName = children[ n ]->getName();
         OUString factoryURL;
-        if ( uiName.equals( userStr ) || uiName.equals( shareStr ) )
+        if ( uiName == userStr || uiName == shareStr )
         {
             app = true;
-            if ( uiName.equals( userStr ) )
+            if ( uiName == userStr )
             {
                 uiName = m_sMyMacros;
             }
@@ -261,7 +261,7 @@ SFTreeListBox::getDocumentModel( Reference< XComponentContext >& xCtx, OUString&
         if ( model.is() )
         {
             OUString sTdocUrl = ::comphelper::DocumentInfo::getDocumentTitle( model );
-            if( sTdocUrl.equals( docName ) )
+            if( sTdocUrl == docName )
             {
                 xModel = model;
                 break;
@@ -281,7 +281,7 @@ SFTreeListBox::getLangNodeFromRootNode( Reference< browse::XBrowseNode >& rootNo
         Sequence < Reference< browse::XBrowseNode > > children = rootNode->getChildNodes();
         for ( sal_Int32 n = 0; n < children.getLength(); n++ )
         {
-            if ( children[ n ]->getName().equals( language ) )
+            if ( children[ n ]->getName() == language )
             {
                 langNode = children[ n ];
                 break;
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index a19e075ad6f9..9ea41a5161c7 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -194,7 +194,7 @@ void CertPathDialog::AddCertPath(const OUString &rProfile, const OUString &rPath
     {
         OUString* pCertPath = static_cast<OUString*>(pEntry->GetUserData());
         //already exists, just select the original one
-        if (pCertPath->equals(rPath))
+        if (*pCertPath == rPath)
         {
             m_pCertPathList->SetCheckButtonState(pEntry, SvButtonState::Checked);
             HandleCheckEntry(pEntry);
diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx
index 925c8468c325..ffe935acee68 100644
--- a/cui/source/options/connpoolconfig.cxx
+++ b/cui/source/options/connpoolconfig.cxx
@@ -116,7 +116,7 @@ namespace offapp
                     aLookup != aSettings.end();
                     ++aLookup
                 )
-                if (sThisDriverName.equals(aLookup->sName))
+                if (sThisDriverName == aLookup->sName)
                     break;
 
             if (aLookup == aSettings.end())
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index ce4aa9d409b0..2514d8a40622 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -303,8 +303,8 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces
             SvTreeListEntries::iterator it = std::find_if(m_modifiedPrefBoxEntries.begin(), m_modifiedPrefBoxEntries.end(),
               [&sPath, &sPropertyName](std::unique_ptr<SvTreeListEntry> const& pEntry) -> bool
               {
-                  return static_cast<UserData*>(pEntry->GetUserData())->sPropertyPath.equals(sPath)
-                      && static_cast<SvLBoxString&>(pEntry->GetItem(2)).GetText().equals(sPropertyName);
+                  return static_cast<UserData*>(pEntry->GetUserData())->sPropertyPath == sPath
+                      && static_cast<SvLBoxString&>(pEntry->GetItem(2)).GetText() == sPropertyName;
               }
             );
 
@@ -771,8 +771,8 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void )
                 SvTreeListEntries::iterator it = std::find_if(m_prefBoxEntries.begin(), m_prefBoxEntries.end(),
                   [&pUserData, &sPropertyName](std::unique_ptr<SvTreeListEntry> const& rpEntry) -> bool
                   {
-                      return static_cast<UserData*>(rpEntry->GetUserData())->sPropertyPath.equals(pUserData->sPropertyPath)
-                          && static_cast<SvLBoxString&>(rpEntry->GetItem(2)).GetText().equals(sPropertyName);
+                      return static_cast<UserData*>(rpEntry->GetUserData())->sPropertyPath == pUserData->sPropertyPath
+                          && static_cast<SvLBoxString&>(rpEntry->GetItem(2)).GetText() == sPropertyName;
                   }
                 );
                 if (it != m_prefBoxEntries.end())
@@ -783,8 +783,8 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void )
                                 m_modifiedPrefBoxEntries.begin(), m_modifiedPrefBoxEntries.end(),
                                 [&pUserData, &sPropertyName](std::unique_ptr<SvTreeListEntry> const& rpEntry) -> bool
                                 {
-                                    return static_cast<UserData*>(rpEntry->GetUserData())->sPropertyPath.equals(pUserData->sPropertyPath)
-                                        && static_cast<SvLBoxString&>(rpEntry->GetItem(2)).GetText().equals(sPropertyName);
+                                    return static_cast<UserData*>(rpEntry->GetUserData())->sPropertyPath == pUserData->sPropertyPath
+                                        && static_cast<SvLBoxString&>(rpEntry->GetItem(2)).GetText() == sPropertyName;
                                 }
                     );
 
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 2f798cc5cf25..180f6f185bfa 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1198,7 +1198,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet&
             for (sal_Int32 i=0; i < m_pUserInterfaceLB->GetEntryCount(); i++)
             {
                 d = (sal_Int32)reinterpret_cast<sal_IntPtr>(m_pUserInterfaceLB->GetEntryData(i));
-                if ( d > 0 && seqInstalledLanguages.getLength() > d-1 && seqInstalledLanguages[d-1].equals(m_sUserLocaleValue))
+                if ( d > 0 && seqInstalledLanguages.getLength() > d-1 && seqInstalledLanguages[d-1] == m_sUserLocaleValue)
                     m_pUserInterfaceLB->SelectEntryPos(i);
             }
         }
@@ -1370,7 +1370,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
         theArgs[0] <<= NamedValue("nodepath", Any(OUString(sUserLocalePath)));
         Reference< XPropertySet >xProp(
             theConfigProvider->createInstanceWithArguments(sAccessUpdSrvc, theArgs ), UNO_QUERY_THROW );
-        if ( !m_sUserLocaleValue.equals(aLangString))
+        if ( m_sUserLocaleValue != aLangString)
         {
             // OSL_FAIL("UserInterface language was changed, restart.");
             // write new value
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index d64ca5d5d6bb..d229fef9f242 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -253,7 +253,7 @@ bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet* )
     m_xUpdateAccess->getByName( "DownloadDestination" ) >>= sValue;
 
     if( ( osl::FileBase::E_None == osl::FileBase::getFileURLFromSystemPath(m_pDestPath->GetText(), aURL) ) &&
-        ( ! aURL.equals( sValue ) ) )
+        ( aURL != sValue ) )
     {
         m_xUpdateAccess->replaceByName( "DownloadDestination", uno::Any( aURL ) );
         bModified = true;
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 0c7713894636..3b6a24608690 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1366,7 +1366,7 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit&, rEdt, void)
     {
         for(std::set<OUString>::iterator i = aFormatText.begin(); i != aFormatText.end(); ++i)
         {
-            if((*i).equals(rShortTxt))
+            if((*i) == rShortTxt)
             {
                 bEnableNew = false;
                 break;
@@ -1380,7 +1380,7 @@ static bool lcl_FindInArray(std::vector<OUString>& rStrings, const OUString& rSt
 {
     for(std::vector<OUString>::iterator i = rStrings.begin(); i != rStrings.end(); ++i)
     {
-        if((*i).equals(rString))
+        if((*i) == rString)
         {
             return true;
         }