use more OUString::operator== in forms..sal

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

49 files changed, 166 insertions, 169 deletions

diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 54da60a79dc3..c99cf8a1808e 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -775,7 +775,7 @@ bool OComboBoxModel::commitControlValueToDbColumn( bool _bPostReset )
             sal_Int32 i;
             for (i=0; i<aStringItemList.getLength(); ++i, ++pStringItems)
             {
-                if ( pStringItems->equals( sNewValue ) )
+                if ( *pStringItems == sNewValue )
                     break;
             }
 
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index 9996c85f4651..ebabadf6fd7b 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -282,7 +282,7 @@ bool HelpOnStartup::its_isHelpUrlADefaultOne(const OUString& sHelpURL)
             OUString sHelpBaseURL;
             xModuleConfig->getByName("ooSetupFactoryHelpBaseURL") >>= sHelpBaseURL;
             OUString sHelpURLForModule = HelpOnStartup::ist_createHelpURL(sHelpBaseURL, sLocale, sSystem);
-            if (sHelpURL.equals(sHelpURLForModule))
+            if (sHelpURL == sHelpURLForModule)
                 return true;
         }
         catch(const css::uno::RuntimeException&)
diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index 5e7776b62827..13f23feafe8f 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -492,7 +492,7 @@ bool JobData::hasCorrectContext(const OUString& rModuleIdent) const
         if ( nIndex >= 0 && ( nIndex+nModuleIdLen <= nContextLen ))
     {
         OUString sContextModule = m_sContext.copy( nIndex, nModuleIdLen );
-        return sContextModule.equals( rModuleIdent );
+        return sContextModule == rModuleIdent;
     }
     }
 
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index 0067e8cd9c3e..243e36f848ca 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -693,7 +693,7 @@ void PathSettings::impl_mergeOldUserPaths(      PathSettings::PathInfo& rPath,
         if (rPath.bIsSinglePath)
         {
             SAL_WARN_IF(lOld.size()>1, "fwk", "PathSettings::impl_mergeOldUserPaths(): Single path has more than one path value inside old configuration (Common.xcu)!");
-            if (! rPath.sWritePath.equals(sOld))
+            if ( rPath.sWritePath != sOld )
                rPath.sWritePath = sOld;
         }
         else
@@ -701,7 +701,7 @@ void PathSettings::impl_mergeOldUserPaths(      PathSettings::PathInfo& rPath,
             if (
                 (  std::find(rPath.lInternalPaths.begin(), rPath.lInternalPaths.end(), sOld) == rPath.lInternalPaths.end()) &&
                 (  std::find(rPath.lUserPaths.begin(), rPath.lUserPaths.end(), sOld)     == rPath.lUserPaths.end()    ) &&
-                (! rPath.sWritePath.equals(sOld)                                     )
+                (  rPath.sWritePath != sOld                                     )
                )
                rPath.lUserPaths.push_back(sOld);
         }
@@ -840,16 +840,16 @@ css::uno::Sequence< sal_Int32 > PathSettings::impl_mapPathName2IDList(const OUSt
     {
         const css::beans::Property& rProp = m_lPropDesc[i];
 
-        if (rProp.Name.equals(sPath))
+        if (rProp.Name == sPath)
             lIDs[IDGROUP_OLDSTYLE] = rProp.Handle;
         else
-        if (rProp.Name.equals(sInternalProp))
+        if (rProp.Name == sInternalProp)
             lIDs[IDGROUP_INTERNAL_PATHS] = rProp.Handle;
         else
-        if (rProp.Name.equals(sUserProp))
+        if (rProp.Name == sUserProp)
             lIDs[IDGROUP_USER_PATHS] = rProp.Handle;
         else
-        if (rProp.Name.equals(sWriteProp))
+        if (rProp.Name == sWriteProp)
             lIDs[IDGROUP_WRITE_PATH] = rProp.Handle;
     }
 
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index f7646cf27a9d..8a71ebdf6c0d 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -982,7 +982,7 @@ void ConfigurationAccess_WindowState::impl_fillStructFromSequence( WindowStateIn
     {
         for ( sal_Int32 j = 0; j < nCompareCount; j++ )
         {
-            if ( rSeq[i].Name.equals( m_aPropArray[j] ))
+            if ( rSeq[i].Name == m_aPropArray[j] )
             {
                 switch ( j )
                 {
diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx
index 2578f40bf2dc..a13c654f19a5 100644
--- a/framework/source/uifactory/uicontrollerfactory.cxx
+++ b/framework/source/uifactory/uicontrollerfactory.cxx
@@ -130,7 +130,7 @@ Reference< XInterface > SAL_CALL UIControllerFactory::createInstanceWithArgument
     // module!!
     for ( int i = 0; i < Arguments.getLength(); i++ )
     {
-        if (( Arguments[i] >>= aPropValue ) && ( aPropValue.Name.equals( aPropModuleName )))
+        if (( Arguments[i] >>= aPropValue ) && ( aPropValue.Name == aPropModuleName ))
         {
             aPropValue.Value >>= aPropName;
             break;
diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx
index 245e9ff3771b..38bca648f27f 100644
--- a/i18npool/source/collator/collatorImpl.cxx
+++ b/i18npool/source/collator/collatorImpl.cxx
@@ -145,7 +145,7 @@ CollatorImpl::createCollator(const lang::Locale& rLocale, const OUString& servic
 {
     for (size_t l = 0; l < lookupTable.size(); l++) {
         cachedItem = lookupTable[l];
-        if (cachedItem->service.equals(serviceName)) {// cross locale sharing
+        if (cachedItem->service == serviceName) {// cross locale sharing
             lookupTable.push_back(cachedItem = new lookupTableItem(rLocale, rSortAlgorithm, serviceName, cachedItem->xC));
             return true;
         }
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 42abd7bbbf48..a5308ba3696a 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -1024,7 +1024,7 @@ Sequence< sal_Int16 > DefaultNumberingProvider::getSupportedNumberingTypes(  )
 sal_Int16 DefaultNumberingProvider::getNumberingType( const OUString& rNumberingIdentifier )
 {
     for(sal_Int16 i = 0; i < nSupported_NumberingTypes; i++)
-        if(rNumberingIdentifier.equals(makeNumberingIdentifier(i)))
+        if(rNumberingIdentifier == makeNumberingIdentifier(i))
             return aSupportedTypes[i].nType;
     throw RuntimeException();
 }
@@ -1032,7 +1032,7 @@ sal_Int16 DefaultNumberingProvider::getNumberingType( const OUString& rNumbering
 sal_Bool DefaultNumberingProvider::hasNumberingType( const OUString& rNumberingIdentifier )
 {
     for(sal_Int16 i = 0; i < nSupported_NumberingTypes; i++)
-        if(rNumberingIdentifier.equals(makeNumberingIdentifier(i)))
+        if(rNumberingIdentifier == makeNumberingIdentifier(i))
             return true;
     return false;
 }
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index 55ad5b730463..a17ff49cefcf 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -1638,7 +1638,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
         if (!ref_name.isEmpty() && i > 0) {
             for (j = 0; j < i; j++) {
                 str = getChildAt(j)->getAttr().getValueByName("unoid");
-                if (str.equals(ref_name))
+                if (str == ref_name)
                     daysNode = getChildAt(j)->getChildAt(0);
             }
         }
@@ -1671,7 +1671,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
         if (!ref_name.isEmpty() && i > 0) {
             for (j = 0; j < i; j++) {
                 str = getChildAt(j)->getAttr().getValueByName("unoid");
-                if (str.equals(ref_name))
+                if (str == ref_name)
                     monthsNode = getChildAt(j)->getChildAt(1);
             }
         }
@@ -1707,7 +1707,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
         if (!ref_name.isEmpty() && i > 0) {
             for (j = 0; j < i; j++) {
                 str = getChildAt(j)->getAttr().getValueByName("unoid");
-                if (str.equals(ref_name))
+                if (str == ref_name)
                     genitiveMonthsNode = getChildAt(j)->getChildAt(1);
             }
         }
@@ -1744,7 +1744,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
         if (!ref_name.isEmpty() && i > 0) {
             for (j = 0; j < i; j++) {
                 str = getChildAt(j)->getAttr().getValueByName("unoid");
-                if (str.equals(ref_name))
+                if (str == ref_name)
                     partitiveMonthsNode = getChildAt(j)->getChildAt(1);
             }
         }
@@ -1777,7 +1777,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
         if (!ref_name.isEmpty() && i > 0) {
             for (j = 0; j < i; j++) {
                 str = getChildAt(j)->getAttr().getValueByName("unoid");
-                if (str.equals(ref_name))
+                if (str == ref_name)
                     erasNode = getChildAt(j)->getChildAt(2);
             }
         }
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 2a344cfdd2fe..78a37c15308a 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -605,7 +605,7 @@ oslGenericFunction SAL_CALL lcl_LookupTableHelper::getFunctionSymbolByName(
 Sequence< CalendarItem2 > &LocaleDataImpl::getCalendarItemByName(const OUString& name,
         const Locale& rLocale, const Sequence< Calendar2 >& calendarsSeq, sal_Int16 item)
 {
-    if (!ref_name.equals(name)) {
+    if (ref_name != name) {
         OUString aLocStr, id;
         sal_Int32 nLastUnder = name.lastIndexOf( cUnder);
         SAL_WARN_IF( nLastUnder < 1, "i18npool",
@@ -625,7 +625,7 @@ Sequence< CalendarItem2 > &LocaleDataImpl::getCalendarItemByName(const OUString&
         }
         sal_Int32 index;
         for (index = 0; index < cals.getLength(); index++) {
-            if (id.equals(cals[index].Name)) {
+            if (id == cals[index].Name) {
                 ref_cal = cals[index];
                 break;
             }
@@ -903,7 +903,7 @@ LocaleDataImpl::getCollatorRuleByAlgorithm( const Locale& rLocale, const OUStrin
         sal_Int16 collatorCount = 0;
         sal_Unicode **collatorArray = func(collatorCount);
         for(sal_Int16 i = 0; i < collatorCount; i++)
-            if (algorithm.equals(collatorArray[i * COLLATOR_ELEMENTS + COLLATOR_OFFSET_ALGO]))
+            if (algorithm == collatorArray[i * COLLATOR_ELEMENTS + COLLATOR_OFFSET_ALGO])
                 return OUString(collatorArray[i * COLLATOR_ELEMENTS + COLLATOR_OFFSET_RULE]);
     }
     return OUString();
@@ -1038,7 +1038,7 @@ LocaleDataImpl::getIndexArrayForAlgorithm(const Locale& rLocale, const OUString&
     sal_Unicode **indexArray = getIndexArray(rLocale, indexCount);
     if ( indexArray ) {
         for(sal_Int16 i = 0; i < indexCount; i++) {
-            if (algorithm.equals(indexArray[i*5]))
+            if (algorithm == indexArray[i*5])
                 return indexArray+i*5;
         }
     }
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index c99a5d1e1398..aeb3e3caca97 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -577,9 +577,9 @@ OUString SAL_CALL NativeNumberSupplierService::getNativeNumberString(const OUStr
     }
 
     if (number || num >= 0) {
-        if (!aLocale.Language.equals(rLocale.Language) ||
-                !aLocale.Country.equals(rLocale.Country) ||
-                !aLocale.Variant.equals(rLocale.Variant)) {
+        if (aLocale.Language != rLocale.Language ||
+                aLocale.Country != rLocale.Country ||
+                aLocale.Variant != rLocale.Variant) {
             LocaleDataItem item = LocaleDataImpl::get()->getLocaleItem( rLocale );
             aLocale = rLocale;
             DecimalChar[NumberChar_HalfWidth]=item.decimalSeparator.toChar();
diff --git a/include/com/sun/star/uno/Any.hxx b/include/com/sun/star/uno/Any.hxx
index 0ea1fb9c4ad6..7171c1dbbbf8 100644
--- a/include/com/sun/star/uno/Any.hxx
+++ b/include/com/sun/star/uno/Any.hxx
@@ -566,7 +566,7 @@ template<>
 inline bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & value )
 {
     return (typelib_TypeClass_STRING == rAny.pType->eTypeClass &&
-            value.equals( * static_cast< const ::rtl::OUString * >( rAny.pData ) ));
+            value == * static_cast< const ::rtl::OUString * >( rAny.pData ) );
 }
 // type
 
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index bb50c21a7e8c..77714d13dc4f 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -58,7 +58,7 @@ public:
     UStringMixEqual(bool bCaseSensitive = true):m_bCaseSensitive(bCaseSensitive){}
     bool operator() (const OUString& lhs, const OUString& rhs) const
     {
-        return m_bCaseSensitive ? lhs.equals( rhs ) : lhs.equalsIgnoreAsciiCase( rhs );
+        return m_bCaseSensitive ? lhs == rhs : lhs.equalsIgnoreAsciiCase( rhs );
     }
     bool isCaseSensitive() const {return m_bCaseSensitive;}
 };
diff --git a/include/vbahelper/vbacollectionimpl.hxx b/include/vbahelper/vbacollectionimpl.hxx
index 163f4a1078e7..93e5e0e65ec9 100644
--- a/include/vbahelper/vbacollectionimpl.hxx
+++ b/include/vbahelper/vbacollectionimpl.hxx
@@ -208,7 +208,7 @@ public:
         for ( ; cachePos != it_end; ++cachePos )
         {
             css::uno::Reference< css::container::XNamed > xName( *cachePos, css::uno::UNO_QUERY_THROW );
-            if ( aName.equals( xName->getName() ) )
+            if ( aName == xName->getName() )
                 break;
         }
         return ( cachePos != it_end );
diff --git a/include/vbahelper/vbahelperinterface.hxx b/include/vbahelper/vbahelperinterface.hxx
index eee4523d6989..d68767ddd7dc 100644
--- a/include/vbahelper/vbahelperinterface.hxx
+++ b/include/vbahelper/vbahelperinterface.hxx
@@ -95,7 +95,7 @@ public:
         const OUString* pStart = sServices.getConstArray();
         const OUString* pEnd = pStart + sServices.getLength();
         for ( ; pStart != pEnd ; ++pStart )
-            if ( (*pStart).equals( ServiceName ) )
+            if ( *pStart == ServiceName )
                 return true;
         return false;
     }
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
index 32203618b8cd..dee43b6b6d67 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
@@ -115,22 +115,22 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
     typedef vector<pair<OUString, OUString> >::const_iterator it_prop;
     for (it_prop i = props.begin(); i != props.end(); ++i)
     {
-        if(! bVendor && sVendorProperty.equals(i->first))
+        if(! bVendor && sVendorProperty == i->first)
         {
             m_sVendor = i->second;
             bVendor = true;
         }
-        else if (!bVersion && sVersionProperty.equals(i->first))
+        else if (!bVersion && sVersionProperty == i->first)
         {
             m_sVersion = i->second;
             bVersion = true;
         }
-        else if (!bHome && sGNUHomeProperty.equals(i->first))
+        else if (!bHome && sGNUHomeProperty == i->first)
         {
             m_sHome = i->second;
             bHome = true;
         }
-        else if (!bJavaHome && sJavaHomeProperty.equals(i->first))
+        else if (!bJavaHome && sJavaHomeProperty == i->first)
         {
            OUString fileURL;
            if (osl_getFileURLFromSystemPath(i->second.pData,& fileURL.pData) ==
@@ -146,13 +146,13 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
                }
            }
         }
-        else if (!bJavaLibraryPath && sJavaLibraryPathProperty.equals(i->first))
+        else if (!bJavaLibraryPath && sJavaLibraryPathProperty == i->first)
         {
             sal_Int32 nIndex = 0;
             osl_getFileURLFromSystemPath(i->second.getToken(0, ':', nIndex).pData, &sJavaLibraryPath.pData);
             bJavaLibraryPath = true;
         }
-        else if (!bAccess && sAccessProperty.equals(i->first))
+        else if (!bAccess && sAccessProperty == i->first)
         {
             if (!i->second.isEmpty())
             {
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index c95849e77ac2..40ce22e78ea9 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -315,7 +315,7 @@ javaPluginError jfw_plugin_getAllJavaInfos(
     {
         const rtl::Reference<VendorBase>& cur = *i;
 
-        if (!sVendor.equals(cur->getVendor()))
+        if (sVendor != cur->getVendor())
             continue;
 
         javaPluginError err = checkJavaVersionRequirements(
@@ -362,7 +362,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
         return javaPluginError::NoJre;
 
     //Check if the detected JRE matches the version requirements
-    if (!sVendor.equals(aVendorInfo->getVendor()))
+    if (sVendor != aVendorInfo->getVendor())
         return javaPluginError::NoJre;
     javaPluginError errorcode = checkJavaVersionRequirements(
             aVendorInfo, sMinVersion, sMaxVersion, arExcludeList);
@@ -394,7 +394,7 @@ javaPluginError jfw_plugin_getJavaInfoFromJavaHome(
         const OUString& vendor = vendorInfo->first;
         jfw::VersionInfo versionInfo = vendorInfo->second;
 
-        if (vendor.equals(infoJavaHome[0]->getVendor()))
+        if (vendor == infoJavaHome[0]->getVendor())
         {
             javaPluginError errorcode = checkJavaVersionRequirements(
                 infoJavaHome[0],
@@ -436,7 +436,7 @@ javaPluginError jfw_plugin_getJavaInfosFromPath(
             const OUString& vendor = vendorInfo->first;
             jfw::VersionInfo const & versionInfo = vendorInfo->second;
 
-            if (vendor.equals(currentInfo->getVendor()))
+            if (vendor == currentInfo->getVendor())
             {
                 javaPluginError errorcode = checkJavaVersionRequirements(
                     currentInfo,
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index ceffbfea6930..d53c6eecfc3b 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -1040,7 +1040,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(
         {
             OUString sNameMap(gVendorMap[c].sVendorName, strlen(gVendorMap[c].sVendorName),
                               RTL_TEXTENCODING_ASCII_US);
-            if (sNameMap.equals(sVendorName))
+            if (sNameMap == sVendorName)
             {
                 ret = createInstance(gVendorMap[c].createFunc, props);
                 break;
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
index 74497337be90..413e6aa771f9 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
@@ -69,7 +69,7 @@ struct InfoFindSame
 
     bool operator () (const rtl::Reference<VendorBase> & aVendorInfo)
     {
-        return aVendorInfo->getHome().equals(sJava);
+        return aVendorInfo->getHome() == sJava;
     }
 };
 
diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx b/lotuswordpro/source/filter/lwpfootnote.cxx
index 0c4dbd6ec5f9..5ed5611b1c2f 100644
--- a/lotuswordpro/source/filter/lwpfootnote.cxx
+++ b/lotuswordpro/source/filter/lwpfootnote.cxx
@@ -363,7 +363,7 @@ LwpEnSuperTableLayout* LwpFootnote::FindFootnoteTableLayout()
     LwpContent* pContent = nullptr;
 
     while ((pContent = pFoundry->EnumContents(pContent)) != nullptr)
-        if (pContent->IsTable() && (strClassName.equals(pContent->GetClassName())) &&
+        if (pContent->IsTable() && (strClassName == pContent->GetClassName()) &&
             pContent->IsActive() && pContent->GetLayout(nullptr).is())
         {
             // Found it!
diff --git a/lotuswordpro/source/filter/lwpproplist.cxx b/lotuswordpro/source/filter/lwpproplist.cxx
index 3ecc26782201..69587e80e936 100644
--- a/lotuswordpro/source/filter/lwpproplist.cxx
+++ b/lotuswordpro/source/filter/lwpproplist.cxx
@@ -80,7 +80,7 @@ void LwpPropListElement::Read()
 
 bool LwpPropListElement::IsNamed(const OUString& name)
 {
-    return name.equals(m_Name.str());
+    return name == m_Name.str();
 }
 
 OUString LwpPropList::GetNamedProperty(const OUString& name)
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index 13d3fed8a773..f36c6496157f 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -222,7 +222,7 @@ void FilterDetectDocHandler::parseContentTypesDefault( const AttributeList& rAtt
 
 void FilterDetectDocHandler::parseContentTypesOverride( const AttributeList& rAttribs )
 {
-    if( rAttribs.getString( XML_PartName, OUString() ).equals( maTargetPath ) )
+    if( rAttribs.getString( XML_PartName, OUString() ) == maTargetPath )
         mrFilterName = getFilterNameFromContentType( rAttribs.getString( XML_ContentType, OUString() ), maFileName );
 }
 
diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx
index 3f8912d0f0d3..c575c9a1736f 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -247,7 +247,7 @@ void OOXMLDocPropHandler::UpdateDocStatistic( const OUString& aChars )
         bool bFound = false;
         sal_Int32 nLen = aSet.getLength();
         for ( sal_Int32 nInd = 0; nInd < nLen; nInd++ )
-            if ( aSet[nInd].Name.equals( aName ) )
+            if ( aSet[nInd].Name == aName )
             {
                 aSet[nInd].Value <<= aChars.toInt32();
                 bFound = true;
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index 160879cc3e66..57aedfcd022a 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -164,7 +164,7 @@ void CustomShapeProperties::pushToPropSet(
             for ( i = 0; i < nCount; i++ )
             {
                 const OUString sAdjustmentValues("AdjustmentValues");
-                if ( aGeoPropSeq[ i ].Name.equals( sAdjustmentValues ) )
+                if ( aGeoPropSeq[ i ].Name == sAdjustmentValues )
                 {
                     OUString presetTextWarp;
                     if ( aGeoPropSeq[ i ].Value >>= presetTextWarp )
@@ -184,7 +184,7 @@ void CustomShapeProperties::pushToPropSet(
                 for ( i = 0; i < nCount; i++ )
                 {
                     const OUString sAdjustmentValues("AdjustmentValues");
-                    if ( aGeoPropSeq[ i ].Name.equals( sAdjustmentValues ) )
+                    if ( aGeoPropSeq[ i ].Name == sAdjustmentValues )
                     {
                         uno::Sequence< css::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq;
                         if ( aGeoPropSeq[ i ].Value >>= aAdjustmentSeq )
@@ -216,7 +216,7 @@ void CustomShapeProperties::pushToPropSet(
                             xPropSet->setPropertyValue( sCustomShapeGeometry, Any( aGeoPropSeq ) );
                         }
                     }
-                    else if ( aGeoPropSeq[ i ].Name.equals( sType ) )
+                    else if ( aGeoPropSeq[ i ].Name == sType )
                     {
                         if ( sConnectorShapeType.getLength() > 0 )
                             aGeoPropSeq[ i ].Value <<= sConnectorShapeType;
diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx
index ec25b10c3c49..c55ca4936c82 100644
--- a/oox/source/export/ColorPropertySet.cxx
+++ b/oox/source/export/ColorPropertySet.cxx
@@ -66,14 +66,14 @@ Sequence< Property > SAL_CALL lcl_ColorPropertySetInfo::getProperties()
 
 Property SAL_CALL lcl_ColorPropertySetInfo::getPropertyByName( const OUString& aName )
 {
-    if( aName.equals( m_aColorPropName ))
+    if( aName == m_aColorPropName )
         return m_aColorProp;
     throw UnknownPropertyException( m_aColorPropName, static_cast< uno::XWeak * >( this ));
 }
 
 sal_Bool SAL_CALL lcl_ColorPropertySetInfo::hasPropertyByName( const OUString& Name )
 {
-    return Name.equals( m_aColorPropName );
+    return Name == m_aColorPropName;
 }
 
 } // anonymous namespace
@@ -163,13 +163,13 @@ Sequence< PropertyState > SAL_CALL ColorPropertySet::getPropertyStates( const Se
 
 void SAL_CALL ColorPropertySet::setPropertyToDefault( const OUString& PropertyName )
 {
-    if( PropertyName.equals( m_aColorPropName ))
+    if( PropertyName == m_aColorPropName )
         m_nColor = m_nDefaultColor;
 }
 
 uno::Any SAL_CALL ColorPropertySet::getPropertyDefault( const OUString& aPropertyName )
 {
-    if( aPropertyName.equals( m_aColorPropName ))
+    if( aPropertyName == m_aColorPropName )
         return uno::makeAny( m_nDefaultColor );
 
     return uno::Any();
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 5f488e0b4b75..075b98f23de5 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -143,7 +143,7 @@ public:
 
         return ( xProp.is() &&
                  (xProp->getPropertyValue( "Role" ) >>= aRole ) &&
-                 m_aRole.equals( aRole ));
+                 m_aRole == aRole );
     }
 
 private:
@@ -2008,7 +2008,7 @@ void ChartExport::exportSeries( const Reference<chart2::XChartType>& xChartType,
                         if( xSeqProp.is())
                             xSeqProp->getPropertyValue("Role") >>= aRole;
                         // "main" sequence
-                        if( aRole.equals( aLabelRole ))
+                        if( aRole == aLabelRole )
                         {
                             xValuesSeq.set( xTempValueSeq );
                             xLabelSeq.set( aSeqCnt[nSeqIdx]->getLabel());
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index ff909e7bc625..6cf8246a79d4 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -661,12 +661,12 @@ void lcl_AnalyzeHandles( const uno::Sequence<beans::PropertyValues> & rHandles,
         const Sequence< PropertyValue >& rPropSeq = rHandles[ k ];
         for ( const PropertyValue& rPropVal: rPropSeq )
         {
-            if ( rPropVal.Name.equals( sPosition ) )
+            if ( rPropVal.Name == sPosition )
             {
                 if ( rPropVal.Value >>= aPosition )
                     bPosition = true;
             }
-            else if ( rPropVal.Name.equals( sSwitched ) )
+            else if ( rPropVal.Name == sSwitched )
             {
                 rPropVal.Value >>= bSwitched ;
             }
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index 8356b13da191..10eef84abe17 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -905,7 +905,7 @@ void PropertyMap::dumpCode( const Reference< XPropertySet >& rXPropSet )
     for (int i=0; i < props.getLength (); i++) {
 
         // ignore Type, it is set elsewhere
-        if (props[i].Name.equals (sType))
+        if (props[i].Name == sType)
             continue;
 
         OString name = OUStringToOString( props [i].Name, RTL_TEXTENCODING_UTF8);
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index a84171949e1f..a499500d17f7 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -212,7 +212,7 @@ ShapeContextHandler::getDrawingShapeContext()
     {
         // Reset the handler if fragment path has changed
         OUString sHandlerFragmentPath = dynamic_cast<ContextHandler&>(*mxDrawingFragmentHandler.get()).getFragmentPath();
-        if ( !msRelationFragmentPath.equals(sHandlerFragmentPath) )
+        if ( msRelationFragmentPath != sHandlerFragmentPath )
         {
             mxDrawingFragmentHandler.clear();
             mxDrawingFragmentHandler.set
diff --git a/package/source/manifest/ManifestExport.cxx b/package/source/manifest/ManifestExport.cxx
index 60bcb8b3ff2a..915c8f243bd7 100644
--- a/package/source/manifest/ManifestExport.cxx
+++ b/package/source/manifest/ManifestExport.cxx
@@ -109,15 +109,15 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > con
         const beans::PropertyValue *pValue = pSequence[nInd].getConstArray();
         for (sal_uInt32 j = 0, nNum = pSequence[nInd].getLength(); j < nNum; j++, pValue++)
         {
-            if (pValue->Name.equals (sMediaTypeProperty) )
+            if (pValue->Name == sMediaTypeProperty )
             {
                 pValue->Value >>= aMediaType;
             }
-            else if (pValue->Name.equals (sFullPathProperty) )
+            else if (pValue->Name == sFullPathProperty )
             {
                 pValue->Value >>= aPath;
             }
-            else if (pValue->Name.equals (sVersionProperty) )
+            else if (pValue->Name == sVersionProperty )
             {
                 pValue->Value >>= aVersion;
             }
@@ -201,24 +201,24 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > con
         const uno::Any *pVector = nullptr, *pSalt = nullptr, *pIterationCount = nullptr, *pDigest = nullptr, *pDigestAlg = nullptr, *pEncryptAlg = nullptr, *pStartKeyAlg = nullptr, *pDerivedKeySize = nullptr;
         for (sal_uInt32 j = 0, nNum = pSequence[i].getLength(); j < nNum; j++, pValue++)
         {
-            if (pValue->Name.equals (sMediaTypeProperty) )
+            if (pValue->Name == sMediaTypeProperty )
             {
                 pValue->Value >>= aString;
                 pAttrList->AddAttribute ( sMediaTypeAttribute, sCdataAttribute, aString );
             }
-            else if (pValue->Name.equals (sVersionProperty) )
+            else if (pValue->Name == sVersionProperty )
             {
                 pValue->Value >>= aString;
                 // the version is stored only if it is not empty
                 if ( bAcceptNonemptyVersion && !aString.isEmpty() )
                     pAttrList->AddAttribute ( sVersionAttribute, sCdataAttribute, aString );
             }
-            else if (pValue->Name.equals (sFullPathProperty) )
+            else if (pValue->Name == sFullPathProperty )
             {
                 pValue->Value >>= aString;
                 pAttrList->AddAttribute ( sFullPathAttribute, sCdataAttribute, aString );
             }
-            else if (pValue->Name.equals (sSizeProperty) )
+            else if (pValue->Name == sSizeProperty )
             {
                 sal_Int64 nSize = 0;
                 pValue->Value >>= nSize;
@@ -226,21 +226,21 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > con
                 aBuffer.append ( nSize );
                 pAttrList->AddAttribute ( sSizeAttribute, sCdataAttribute, aBuffer.makeStringAndClear() );
             }
-            else if (pValue->Name.equals (sInitialisationVectorProperty) )
+            else if (pValue->Name == sInitialisationVectorProperty )
                 pVector = &pValue->Value;
-            else if (pValue->Name.equals (sSaltProperty) )
+            else if (pValue->Name == sSaltProperty )
                 pSalt = &pValue->Value;
-            else if (pValue->Name.equals (sIterationCountProperty) )
+            else if (pValue->Name == sIterationCountProperty )
                 pIterationCount = &pValue->Value;
-            else if (pValue->Name.equals ( sDigestProperty ) )
+            else if (pValue->Name == sDigestProperty )
                 pDigest = &pValue->Value;
-            else if (pValue->Name.equals ( sDigestAlgProperty ) )
+            else if (pValue->Name == sDigestAlgProperty )
                 pDigestAlg = &pValue->Value;
-            else if (pValue->Name.equals ( sEncryptionAlgProperty ) )
+            else if (pValue->Name == sEncryptionAlgProperty )
                 pEncryptAlg = &pValue->Value;
-            else if (pValue->Name.equals ( sStartKeyAlgProperty ) )
+            else if (pValue->Name == sStartKeyAlgProperty )
                 pStartKeyAlg = &pValue->Value;
-            else if (pValue->Name.equals ( sDerivedKeySizeProperty ) )
+            else if (pValue->Name == sDerivedKeySizeProperty )
                 pDerivedKeySize = &pValue->Value;
         }
 
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx
index ec34c750858f..bfde6aa3cb2c 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/package/source/manifest/ManifestImport.cxx
@@ -133,10 +133,10 @@ void ManifestImport::doEncryptionData(StringHashMap &rConvertedAttribs)
     nDerivedKeySize = 0;
     OUString aString = rConvertedAttribs[sChecksumTypeAttribute];
     if ( !bIgnoreEncryptData ) {
-        if ( aString.equals( sSHA1_1k_Name ) || aString.equals( sSHA1_1k_URL ) ) {
+        if ( aString == sSHA1_1k_Name || aString == sSHA1_1k_URL ) {
             aSequence[PKG_MNFST_DIGESTALG].Name = sDigestAlgProperty;
             aSequence[PKG_MNFST_DIGESTALG].Value <<= xml::crypto::DigestID::SHA1_1K;
-        } else if ( aString.equals( sSHA256_1k_URL ) ) {
+        } else if ( aString == sSHA256_1k_URL ) {
             aSequence[PKG_MNFST_DIGESTALG].Name = sDigestAlgProperty;
             aSequence[PKG_MNFST_DIGESTALG].Value <<= xml::crypto::DigestID::SHA256_1K;
         } else
@@ -156,20 +156,20 @@ void ManifestImport::doAlgorithm(StringHashMap &rConvertedAttribs)
 {
     if ( !bIgnoreEncryptData ) {
         OUString aString = rConvertedAttribs[sAlgorithmNameAttribute];
-        if ( aString.equals( sBlowfish_Name ) || aString.equals( sBlowfish_URL ) ) {
+        if ( aString == sBlowfish_Name || aString == sBlowfish_URL ) {
             aSequence[PKG_MNFST_ENCALG].Name = sEncryptionAlgProperty;
             aSequence[PKG_MNFST_ENCALG].Value <<= xml::crypto::CipherID::BLOWFISH_CFB_8;
-        } else if ( aString.equals( sAES256_URL ) ) {
+        } else if ( aString == sAES256_URL ) {
             aSequence[PKG_MNFST_ENCALG].Name = sEncryptionAlgProperty;
             aSequence[PKG_MNFST_ENCALG].Value <<= xml::crypto::CipherID::AES_CBC_W3C_PADDING;
             OSL_ENSURE( !nDerivedKeySize || nDerivedKeySize == 32, "Unexpected derived key length!" );
             nDerivedKeySize = 32;
-        } else if ( aString.equals( sAES192_URL ) ) {
+        } else if ( aString == sAES192_URL ) {
             aSequence[PKG_MNFST_ENCALG].Name = sEncryptionAlgProperty;
             aSequence[PKG_MNFST_ENCALG].Value <<= xml::crypto::CipherID::AES_CBC_W3C_PADDING;
             OSL_ENSURE( !nDerivedKeySize || nDerivedKeySize == 24, "Unexpected derived key length!" );
             nDerivedKeySize = 24;
-        } else if ( aString.equals( sAES128_URL ) ) {
+        } else if ( aString == sAES128_URL ) {
             aSequence[PKG_MNFST_ENCALG].Name = sEncryptionAlgProperty;
             aSequence[PKG_MNFST_ENCALG].Value <<= xml::crypto::CipherID::AES_CBC_W3C_PADDING;
             OSL_ENSURE( !nDerivedKeySize || nDerivedKeySize == 16, "Unexpected derived key length!" );
@@ -191,7 +191,7 @@ void ManifestImport::doKeyDerivation(StringHashMap &rConvertedAttribs)
 {
     if ( !bIgnoreEncryptData ) {
         OUString aString = rConvertedAttribs[sKeyDerivationNameAttribute];
-        if ( aString.equals( sPBKDF2_Name ) || aString.equals( sPBKDF2_URL ) ) {
+        if ( aString == sPBKDF2_Name || aString == sPBKDF2_URL ) {
             aString = rConvertedAttribs[sSaltAttribute];
             uno::Sequence < sal_Int8 > aDecodeBuffer;
             ::sax::Converter::decodeBase64(aDecodeBuffer, aString);
@@ -222,10 +222,10 @@ void ManifestImport::doKeyDerivation(StringHashMap &rConvertedAttribs)
 void ManifestImport::doStartKeyAlg(StringHashMap &rConvertedAttribs)
 {
     OUString aString = rConvertedAttribs[sStartKeyAlgNameAttribute];
-    if (aString.equals(sSHA256_URL) || aString.equals(sSHA256_URL_ODF12)) {
+    if (aString == sSHA256_URL || aString == sSHA256_URL_ODF12) {
         aSequence[PKG_MNFST_STARTALG].Name = sStartKeyAlgProperty;
         aSequence[PKG_MNFST_STARTALG].Value <<= xml::crypto::DigestID::SHA256;
-    } else if ( aString.equals( sSHA1_Name ) || aString.equals( sSHA1_URL ) ) {
+    } else if ( aString == sSHA1_Name || aString == sSHA1_URL ) {
         aSequence[PKG_MNFST_STARTALG].Name = sStartKeyAlgProperty;
         aSequence[PKG_MNFST_STARTALG].Value <<= xml::crypto::DigestID::SHA1;
     } else
@@ -260,7 +260,7 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re
 
         if (!aIter->m_bValid)
             aStack.back().m_bValid = false;
-        else if (aConvertedName.equals(sEncryptionDataElement))   //manifest:encryption-data
+        else if (aConvertedName == sEncryptionDataElement)   //manifest:encryption-data
             doEncryptionData(aConvertedAttribs);
         else
             aStack.back().m_bValid = false;
@@ -272,11 +272,11 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re
 
         if (!aIter->m_bValid)
             aStack.back().m_bValid = false;
-        else if (aConvertedName.equals(sAlgorithmElement))   //manifest:algorithm,
+        else if (aConvertedName == sAlgorithmElement)   //manifest:algorithm,
             doAlgorithm(aConvertedAttribs);
-        else if (aConvertedName.equals(sKeyDerivationElement)) //manifest:key-derivation,
+        else if (aConvertedName == sKeyDerivationElement) //manifest:key-derivation,
             doKeyDerivation(aConvertedAttribs);
-        else if (aConvertedName.equals(sStartKeyAlgElement))   //manifest:start-key-generation
+        else if (aConvertedName == sStartKeyAlgElement)   //manifest:start-key-generation
             doStartKeyAlg(aConvertedAttribs);
         else
             aStack.back().m_bValid = false;
@@ -299,8 +299,8 @@ bool isEmpty(const css::beans::PropertyValue &rProp)
 void SAL_CALL ManifestImport::endElement( const OUString& aName )
 {
     OUString aConvertedName = ConvertName( aName );
-    if ( !aStack.empty() && aStack.rbegin()->m_aConvertedName.equals( aConvertedName ) ) {
-        if ( aConvertedName.equals( sFileEntryElement ) && aStack.back().m_bValid ) {
+    if ( !aStack.empty() && aStack.rbegin()->m_aConvertedName == aConvertedName ) {
+        if ( aConvertedName == sFileEntryElement && aStack.back().m_bValid ) {
             css::beans::PropertyValue aEmpty;
             aSequence.erase(std::remove_if(aSequence.begin(), aSequence.end(),
                                            isEmpty), aSequence.end());
diff --git a/package/source/xstor/ocompinstream.cxx b/package/source/xstor/ocompinstream.cxx
index 2fc6927e4f04..06076370ea92 100644
--- a/package/source/xstor/ocompinstream.cxx
+++ b/package/source/xstor/ocompinstream.cxx
@@ -351,7 +351,7 @@ uno::Sequence< beans::StringPair > SAL_CALL OInputCompStream::getRelationshipByI
         for ( sal_Int32 nInd2 = 0; nInd2 < aSeq[nInd1].getLength(); nInd2++ )
             if ( aSeq[nInd1][nInd2].First == "Id" )
             {
-                if ( aSeq[nInd1][nInd2].Second.equals( sID ) )
+                if ( aSeq[nInd1][nInd2].Second == sID )
                     return aSeq[nInd1];
                 break;
             }
@@ -381,7 +381,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OInputCompStream::g
         for ( sal_Int32 nInd2 = 0; nInd2 < aSeq[nInd1].getLength(); nInd2++ )
             if ( aSeq[nInd1][nInd2].First == "Type" )
             {
-                if ( aSeq[nInd1][nInd2].Second.equals( sType ) )
+                if ( aSeq[nInd1][nInd2].Second == sType )
                 {
                     aResult.realloc( nEntriesNum );
                     aResult[nEntriesNum-1] = aSeq[nInd1];
@@ -510,7 +510,7 @@ void SAL_CALL OInputCompStream::setPropertyValue( const OUString& aPropertyName,
     // all the provided properties are accessible
     for ( sal_Int32 aInd = 0; aInd < m_aProperties.getLength(); aInd++ )
     {
-        if ( m_aProperties[aInd].Name.equals( aPropertyName ) )
+        if ( m_aProperties[aInd].Name == aPropertyName )
         {
             throw beans::PropertyVetoException(); // TODO
         }
@@ -541,7 +541,7 @@ uno::Any SAL_CALL OInputCompStream::getPropertyValue( const OUString& aProp )
     // all the provided properties are accessible
     for ( sal_Int32 aInd = 0; aInd < m_aProperties.getLength(); aInd++ )
     {
-        if ( m_aProperties[aInd].Name.equals( aPropertyName ) )
+        if ( m_aProperties[aInd].Name == aPropertyName )
         {
             return m_aProperties[aInd].Value;
         }
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index 6bee879b5a75..af0dc07fbb29 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -169,7 +169,7 @@ bool SequencesEqual( const uno::Sequence< beans::NamedValue >& aSequence1, const
         {
             for ( sal_Int32 nInd2 = 0; nInd2 < aSequence2.getLength(); nInd2++ )
             {
-                if ( aSequence1[nInd].Name.equals( aSequence2[nInd2].Name ) )
+                if ( aSequence1[nInd].Name == aSequence2[nInd2].Name )
                 {
                     bHasMember = true;
 
@@ -183,7 +183,7 @@ bool SequencesEqual( const uno::Sequence< beans::NamedValue >& aSequence1, const
         {
             for ( sal_Int32 nInd2 = 0; nInd2 < aSequence2.getLength(); nInd2++ )
             {
-                if ( aSequence1[nInd].Name.equals( aSequence2[nInd2].Name ) )
+                if ( aSequence1[nInd].Name == aSequence2[nInd2].Name )
                 {
                     bHasMember = true;
 
@@ -727,13 +727,13 @@ void OWriteStream_Impl::InsertStreamDirectly( const uno::Reference< io::XInputSt
     OUString aMedTypePropName( "MediaType" );
     for ( sal_Int32 nInd = 0; nInd < aProps.getLength(); nInd++ )
     {
-        if ( aProps[nInd].Name.equals( aComprPropName ) )
+        if ( aProps[nInd].Name == aComprPropName )
         {
             bCompressedIsSet = true;
             aProps[nInd].Value >>= bCompressed;
         }
         else if ( ( m_nStorageType == embed::StorageFormats::OFOPXML || m_nStorageType == embed::StorageFormats::PACKAGE )
-               && aProps[nInd].Name.equals( aMedTypePropName ) )
+               && aProps[nInd].Name == aMedTypePropName )
         {
             xPropertySet->setPropertyValue( aProps[nInd].Name, aProps[nInd].Value );
         }
@@ -743,10 +743,10 @@ void OWriteStream_Impl::InsertStreamDirectly( const uno::Reference< io::XInputSt
             throw lang::IllegalArgumentException();
 
         // if there are cached properties update them
-        if ( aProps[nInd].Name.equals( aMedTypePropName ) || aProps[nInd].Name.equals( aComprPropName ) )
+        if ( aProps[nInd].Name == aMedTypePropName || aProps[nInd].Name == aComprPropName )
             for ( sal_Int32 nMemInd = 0; nMemInd < m_aProps.getLength(); nMemInd++ )
             {
-                if ( aProps[nInd].Name.equals( m_aProps[nMemInd].Name ) )
+                if ( aProps[nInd].Name == m_aProps[nMemInd].Name )
                     m_aProps[nMemInd].Value = aProps[nInd].Value;
             }
     }
@@ -1547,7 +1547,7 @@ void OWriteStream_Impl::CommitStreamRelInfo( const uno::Reference< embed::XStora
         OUString aNewRelStreamName = aNewStreamName;
         aNewRelStreamName += ".rels";
 
-        bool bRenamed = !aOrigRelStreamName.equals( aNewRelStreamName );
+        bool bRenamed = aOrigRelStreamName != aNewRelStreamName;
         if ( m_nRelInfoStatus == RELINFO_CHANGED
           || m_nRelInfoStatus == RELINFO_CHANGED_STREAM_READ
           || m_nRelInfoStatus == RELINFO_CHANGED_STREAM )
@@ -2593,7 +2593,7 @@ uno::Sequence< beans::StringPair > SAL_CALL OWriteStream::getRelationshipByID(
         for ( sal_Int32 nInd2 = 0; nInd2 < aSeq[nInd1].getLength(); nInd2++ )
             if ( aSeq[nInd1][nInd2].First == "Id" )
             {
-                if ( aSeq[nInd1][nInd2].Second.equals( sID ) )
+                if ( aSeq[nInd1][nInd2].Second == sID )
                     return aSeq[nInd1];
                 break;
             }
@@ -2623,7 +2623,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OWriteStream::getRe
         for ( sal_Int32 nInd2 = 0; nInd2 < aSeq[nInd1].getLength(); nInd2++ )
             if ( aSeq[nInd1][nInd2].First == "Type" )
             {
-                if ( aSeq[nInd1][nInd2].Second.equals( sType ) )
+                if ( aSeq[nInd1][nInd2].Second == sType )
                 {
                     aResult.realloc( nEntriesNum );
                     aResult[nEntriesNum-1] = aSeq[nInd1];
@@ -2671,9 +2671,9 @@ void SAL_CALL OWriteStream::insertRelationshipByID(  const OUString& sID, const
     uno::Sequence< uno::Sequence< beans::StringPair > > aSeq = getAllRelationships();
     for ( sal_Int32 nInd1 = 0; nInd1 < aSeq.getLength(); nInd1++ )
         for ( sal_Int32 nInd2 = 0; nInd2 < aSeq[nInd1].getLength(); nInd2++ )
-            if ( aSeq[nInd1][nInd2].First.equals( aIDTag ) )
+            if ( aSeq[nInd1][nInd2].First == aIDTag )
             {
-                if ( aSeq[nInd1][nInd2].Second.equals( sID ) )
+                if ( aSeq[nInd1][nInd2].Second == sID )
                     nIDInd = nInd1;
 
                 break;
@@ -2696,7 +2696,7 @@ void SAL_CALL OWriteStream::insertRelationshipByID(  const OUString& sID, const
               nIndOrig < aEntry.getLength();
               nIndOrig++ )
         {
-            if ( !aEntry[nIndOrig].First.equals( aIDTag ) )
+            if ( aEntry[nIndOrig].First != aIDTag )
                 aSeq[nIDInd][nIndTarget++] = aEntry[nIndOrig];
         }
 
@@ -2728,7 +2728,7 @@ void SAL_CALL OWriteStream::removeRelationshipByID(  const OUString& sID  )
         for ( sal_Int32 nInd2 = 0; nInd2 < aSeq[nInd1].getLength(); nInd2++ )
             if ( aSeq[nInd1][nInd2].First == "Id" )
             {
-                if ( aSeq[nInd1][nInd2].Second.equals( sID ) )
+                if ( aSeq[nInd1][nInd2].Second == sID )
                 {
                     sal_Int32 nLength = aSeq.getLength();
                     aSeq[nInd1] = aSeq[nLength-1];
@@ -2768,16 +2768,16 @@ void SAL_CALL OWriteStream::insertRelationships(  const uno::Sequence< uno::Sequ
 
     for ( sal_Int32 nIndTarget1 = 0; nIndTarget1 < aSeq.getLength(); nIndTarget1++ )
         for ( sal_Int32 nIndTarget2 = 0; nIndTarget2 < aSeq[nIndTarget1].getLength(); nIndTarget2++ )
-            if ( aSeq[nIndTarget1][nIndTarget2].First.equals( aIDTag ) )
+            if ( aSeq[nIndTarget1][nIndTarget2].First == aIDTag )
             {
                 sal_Int32 nIndSourceSame = -1;
 
                 for ( sal_Int32 nIndSource1 = 0; nIndSource1 < aEntries.getLength(); nIndSource1++ )
                     for ( sal_Int32 nIndSource2 = 0; nIndSource2 < aEntries[nIndSource1].getLength(); nIndSource2++ )
                     {
-                        if ( aEntries[nIndSource1][nIndSource2].First.equals( aIDTag ) )
+                        if ( aEntries[nIndSource1][nIndSource2].First == aIDTag )
                         {
-                            if ( aEntries[nIndSource1][nIndSource2].Second.equals( aSeq[nIndTarget1][nIndTarget2].Second ) )
+                            if ( aEntries[nIndSource1][nIndSource2].Second == aSeq[nIndTarget1][nIndTarget2].Second )
                             {
                                 if ( !bReplace )
                                     throw container::ElementExistException();
@@ -2805,7 +2805,7 @@ void SAL_CALL OWriteStream::insertRelationships(  const uno::Sequence< uno::Sequ
         sal_Int32 nResInd2 = 1;
 
         for ( sal_Int32 nIndSource2 = 0; nIndSource2 < aEntries[nIndSource1].getLength(); nIndSource2++ )
-            if ( aEntries[nIndSource1][nIndSource2].First.equals( aIDTag ) )
+            if ( aEntries[nIndSource1][nIndSource2].First == aIDTag )
             {
                 aResultSeq[nResultInd][0] = aEntries[nIndSource1][nIndSource2];
                 bHasID = true;
@@ -2866,7 +2866,7 @@ void SAL_CALL OWriteStream::setPropertyValue( const OUString& aPropertyName, con
     m_pImpl->GetStreamProperties();
     OUString aCompressedString( "Compressed" );
     OUString aMediaTypeString( "MediaType" );
-    if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE && aPropertyName.equals( aMediaTypeString ) )
+    if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE && aPropertyName == aMediaTypeString )
     {
         // if the "Compressed" property is not set explicitly, the MediaType can change the default value
         bool bCompressedValueFromType = true;
@@ -2881,19 +2881,19 @@ void SAL_CALL OWriteStream::setPropertyValue( const OUString& aPropertyName, con
 
         for ( sal_Int32 nInd = 0; nInd < m_pImpl->m_aProps.getLength(); nInd++ )
         {
-            if ( aPropertyName.equals( m_pImpl->m_aProps[nInd].Name ) )
+            if ( aPropertyName == m_pImpl->m_aProps[nInd].Name )
                 m_pImpl->m_aProps[nInd].Value = aValue;
-            else if ( !m_pImpl->m_bCompressedSetExplicit && aCompressedString.equals( m_pImpl->m_aProps[nInd].Name ) )
+            else if ( !m_pImpl->m_bCompressedSetExplicit && aCompressedString == m_pImpl->m_aProps[nInd].Name )
                 m_pImpl->m_aProps[nInd].Value <<= bCompressedValueFromType;
         }
     }
-    else if ( aPropertyName.equals( aCompressedString ) )
+    else if ( aPropertyName == aCompressedString )
     {
         // if the "Compressed" property is not set explicitly, the MediaType can change the default value
         m_pImpl->m_bCompressedSetExplicit = true;
         for ( sal_Int32 nInd = 0; nInd < m_pImpl->m_aProps.getLength(); nInd++ )
         {
-            if ( aPropertyName.equals( m_pImpl->m_aProps[nInd].Name ) )
+            if ( aPropertyName == m_pImpl->m_aProps[nInd].Name )
                 m_pImpl->m_aProps[nInd].Value = aValue;
         }
     }
@@ -2922,11 +2922,11 @@ void SAL_CALL OWriteStream::setPropertyValue( const OUString& aPropertyName, con
         else
             throw lang::IllegalArgumentException(); //TODO
     }
-    else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML && aPropertyName.equals( aMediaTypeString ) )
+    else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML && aPropertyName == aMediaTypeString )
     {
         for ( sal_Int32 nInd = 0; nInd < m_pImpl->m_aProps.getLength(); nInd++ )
         {
-            if ( aPropertyName.equals( m_pImpl->m_aProps[nInd].Name ) )
+            if ( aPropertyName == m_pImpl->m_aProps[nInd].Name )
                 m_pImpl->m_aProps[nInd].Value = aValue;
         }
     }
@@ -3005,7 +3005,7 @@ uno::Any SAL_CALL OWriteStream::getPropertyValue( const OUString& aProp )
 
         for ( sal_Int32 nInd = 0; nInd < m_pImpl->m_aProps.getLength(); nInd++ )
         {
-            if ( aPropertyName.equals( m_pImpl->m_aProps[nInd].Name ) )
+            if ( aPropertyName == m_pImpl->m_aProps[nInd].Name )
                 return m_pImpl->m_aProps[nInd].Value;
         }
     }
diff --git a/package/source/xstor/register.cxx b/package/source/xstor/register.cxx
index e32f64e1ea7e..7f4e75ab1d9b 100644
--- a/package/source/xstor/register.cxx
+++ b/package/source/xstor/register.cxx
@@ -34,7 +34,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL xstor_component_getFactory( const sal_Char
     OUString aImplName( OUString::createFromAscii( pImplName ) );
     uno::Reference< lang::XSingleServiceFactory > xFactory;
 
-    if ( pServiceManager && aImplName.equals( OStorageFactory::impl_staticGetImplementationName() ) )
+    if ( pServiceManager && aImplName == OStorageFactory::impl_staticGetImplementationName() )
     {
         xFactory= ::cppu::createOneInstanceFactory( static_cast< lang::XMultiServiceFactory*>( pServiceManager ),
                                             OStorageFactory::impl_staticGetImplementationName(),
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index 569bd30f86c0..aa47f3d45726 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -339,7 +339,7 @@ OStorage_Impl::~OStorage_Impl()
     OUString aPropertyName = "URL";
     for ( sal_Int32 aInd = 0; aInd < m_xProperties.getLength(); ++aInd )
     {
-        if ( m_xProperties[aInd].Name.equals( aPropertyName ) )
+        if ( m_xProperties[aInd].Name == aPropertyName )
         {
             // the storage is URL based so all the streams are opened by factory and should be closed
             try
@@ -4448,7 +4448,7 @@ uno::Any SAL_CALL OStorage::getPropertyValue( const OUString& aPropertyName )
         {
             for ( sal_Int32 aInd = 0; aInd < m_pImpl->m_xProperties.getLength(); aInd++ )
             {
-                if ( m_pImpl->m_xProperties[aInd].Name.equals( aPropertyName ) )
+                if ( m_pImpl->m_xProperties[aInd].Name == aPropertyName )
                     return m_pImpl->m_xProperties[aInd].Value;
             }
 
@@ -4638,7 +4638,7 @@ uno::Sequence< beans::StringPair > SAL_CALL OStorage::getRelationshipByID(  cons
         for ( sal_Int32 nInd2 = 0; nInd2 < aSeq[nInd1].getLength(); nInd2++ )
             if ( aSeq[nInd1][nInd2].First == "Id" )
             {
-                if ( aSeq[nInd1][nInd2].Second.equals( sID ) )
+                if ( aSeq[nInd1][nInd2].Second == sID )
                     return aSeq[nInd1];
                 break;
             }
@@ -4738,9 +4738,9 @@ void SAL_CALL OStorage::insertRelationshipByID(  const OUString& sID, const uno:
     uno::Sequence< uno::Sequence< beans::StringPair > > aSeq = getAllRelationships();
     for ( sal_Int32 nInd1 = 0; nInd1 < aSeq.getLength(); nInd1++ )
         for ( sal_Int32 nInd2 = 0; nInd2 < aSeq[nInd1].getLength(); nInd2++ )
-            if ( aSeq[nInd1][nInd2].First.equals( aIDTag ) )
+            if ( aSeq[nInd1][nInd2].First == aIDTag )
             {
-                if ( aSeq[nInd1][nInd2].Second.equals( sID ) )
+                if ( aSeq[nInd1][nInd2].Second == sID )
                     nIDInd = nInd1;
 
                 break;
@@ -4763,7 +4763,7 @@ void SAL_CALL OStorage::insertRelationshipByID(  const OUString& sID, const uno:
               nIndOrig < aEntry.getLength();
               nIndOrig++ )
         {
-            if ( !aEntry[nIndOrig].First.equals( aIDTag ) )
+            if ( aEntry[nIndOrig].First != aIDTag )
                 aSeq[nIDInd][nIndTarget++] = aEntry[nIndOrig];
         }
 
@@ -4795,7 +4795,7 @@ void SAL_CALL OStorage::removeRelationshipByID(  const OUString& sID  )
         for ( sal_Int32 nInd2 = 0; nInd2 < aSeq[nInd1].getLength(); nInd2++ )
             if ( aSeq[nInd1][nInd2].First == "Id" )
             {
-                if ( aSeq[nInd1][nInd2].Second.equals( sID ) )
+                if ( aSeq[nInd1][nInd2].Second == sID )
                 {
                     sal_Int32 nLength = aSeq.getLength();
                     aSeq[nInd1] = aSeq[nLength-1];
@@ -4835,16 +4835,16 @@ void SAL_CALL OStorage::insertRelationships(  const uno::Sequence< uno::Sequence
 
     for ( sal_Int32 nIndTarget1 = 0; nIndTarget1 < aSeq.getLength(); nIndTarget1++ )
         for ( sal_Int32 nIndTarget2 = 0; nIndTarget2 < aSeq[nIndTarget1].getLength(); nIndTarget2++ )
-            if ( aSeq[nIndTarget1][nIndTarget2].First.equals( aIDTag ) )
+            if ( aSeq[nIndTarget1][nIndTarget2].First == aIDTag )
             {
                 sal_Int32 nIndSourceSame = -1;
 
                 for ( sal_Int32 nIndSource1 = 0; nIndSource1 < aEntries.getLength(); nIndSource1++ )
                     for ( sal_Int32 nIndSource2 = 0; nIndSource2 < aEntries[nIndSource1].getLength(); nIndSource2++ )
                     {
-                        if ( aEntries[nIndSource1][nIndSource2].First.equals( aIDTag ) )
+                        if ( aEntries[nIndSource1][nIndSource2].First == aIDTag )
                         {
-                            if ( aEntries[nIndSource1][nIndSource2].Second.equals( aSeq[nIndTarget1][nIndTarget2].Second ) )
+                            if ( aEntries[nIndSource1][nIndSource2].Second == aSeq[nIndTarget1][nIndTarget2].Second )
                             {
                                 if ( !bReplace )
                                     throw container::ElementExistException( THROW_WHERE );
@@ -4872,7 +4872,7 @@ void SAL_CALL OStorage::insertRelationships(  const uno::Sequence< uno::Sequence
         sal_Int32 nResInd2 = 1;
 
         for ( sal_Int32 nIndSource2 = 0; nIndSource2 < aEntries[nIndSource1].getLength(); nIndSource2++ )
-            if ( aEntries[nIndSource1][nIndSource2].First.equals( aIDTag ) )
+            if ( aEntries[nIndSource1][nIndSource2].First == aIDTag )
             {
                 aResultSeq[nResultInd][0] = aEntries[nIndSource1][nIndSource2];
                 bHasID = true;
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index c331282f9c76..efad81b5fdf2 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -782,7 +782,7 @@ bool ZipFile::readLOC( ZipEntry &rEntry )
         }
 
         bBroken = rEntry.nPathLen != nPathLen
-                        || !rEntry.sPath.equals( sLOCPath );
+                        || rEntry.sPath != sLOCPath;
     }
     catch(...)
     {
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 7f998ccf01ec..66e40cb9d410 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -212,29 +212,29 @@ void ZipPackage::parseManifest()
                             const Any *pSalt = nullptr, *pVector = nullptr, *pCount = nullptr, *pSize = nullptr, *pDigest = nullptr, *pDigestAlg = nullptr, *pEncryptionAlg = nullptr, *pStartKeyAlg = nullptr, *pDerivedKeySize = nullptr;
                             for ( sal_Int32 j = 0, nNum = pSequence->getLength(); j < nNum; j++ )
                             {
-                                if ( pValue[j].Name.equals( sPropFullPath ) )
+                                if ( pValue[j].Name == sPropFullPath )
                                     pValue[j].Value >>= sPath;
-                                else if ( pValue[j].Name.equals( sPropVersion ) )
+                                else if ( pValue[j].Name == sPropVersion )
                                     pValue[j].Value >>= sVersion;
-                                else if ( pValue[j].Name.equals( sPropMediaType ) )
+                                else if ( pValue[j].Name == sPropMediaType )
                                     pValue[j].Value >>= sMediaType;
-                                else if ( pValue[j].Name.equals( sPropSalt ) )
+                                else if ( pValue[j].Name == sPropSalt )
                                     pSalt = &( pValue[j].Value );
-                                else if ( pValue[j].Name.equals( sPropInitialisationVector ) )
+                                else if ( pValue[j].Name == sPropInitialisationVector )
                                     pVector = &( pValue[j].Value );
-                                else if ( pValue[j].Name.equals( sPropIterationCount ) )
+                                else if ( pValue[j].Name == sPropIterationCount )
                                     pCount = &( pValue[j].Value );
-                                else if ( pValue[j].Name.equals( sPropSize ) )
+                                else if ( pValue[j].Name == sPropSize )
                                     pSize = &( pValue[j].Value );
-                                else if ( pValue[j].Name.equals( sPropDigest ) )
+                                else if ( pValue[j].Name == sPropDigest )
                                     pDigest = &( pValue[j].Value );
-                                else if ( pValue[j].Name.equals( sPropDigestAlgorithm ) )
+                                else if ( pValue[j].Name == sPropDigestAlgorithm )
                                     pDigestAlg = &( pValue[j].Value );
-                                else if ( pValue[j].Name.equals( sPropEncryptionAlgorithm ) )
+                                else if ( pValue[j].Name == sPropEncryptionAlgorithm )
                                     pEncryptionAlg = &( pValue[j].Value );
-                                else if ( pValue[j].Name.equals( sPropStartKeyAlgorithm ) )
+                                else if ( pValue[j].Name == sPropStartKeyAlgorithm )
                                     pStartKeyAlg = &( pValue[j].Value );
-                                else if ( pValue[j].Name.equals( sPropDerivedKeySize ) )
+                                else if ( pValue[j].Name == sPropDerivedKeySize )
                                     pDerivedKeySize = &( pValue[j].Value );
                             }
 
@@ -366,7 +366,7 @@ void ZipPackage::parseManifest()
             else if ( !m_bForceRecovery )
             {
                 // the mimetype stream should contain the information from manifest.xml
-                if ( !m_xRootFolder->GetMediaType().equals( aPackageMediatype ) )
+                if ( m_xRootFolder->GetMediaType() != aPackageMediatype )
                     throw ZipIOException(
                         THROW_WHERE
                         "mimetype conflicts with manifest.xml, \""
@@ -1556,7 +1556,7 @@ const uno::Sequence< sal_Int8 > ZipPackage::GetEncryptionKey()
             throw uno::RuntimeException(THROW_WHERE "No expected key is provided!" );
 
         for ( sal_Int32 nInd = 0; nInd < m_aStorageEncryptionKeys.getLength(); nInd++ )
-            if ( m_aStorageEncryptionKeys[nInd].Name.equals( aNameToFind ) )
+            if ( m_aStorageEncryptionKeys[nInd].Name == aNameToFind )
                 m_aStorageEncryptionKeys[nInd].Value >>= aResult;
 
         // empty keys are not allowed here
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx
index af4b1c9d56dc..5d110278c674 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -345,7 +345,7 @@ void ZipPackageFolder::saveContents(
         const OUString &rShortName = (*aCI).first;
         const ZipContentInfo &rInfo = *(*aCI).second;
 
-        if ( !bMimeTypeStreamStored || !rShortName.equals( aMimeTypeStreamName ) )
+        if ( !bMimeTypeStreamStored || rShortName != aMimeTypeStreamName )
         {
             if (rInfo.bFolder)
             {
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index fcec2f09d982..dc3129c67ce7 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -232,7 +232,7 @@ uno::Sequence< sal_Int8 > ZipPackageStream::GetEncryptionKey( bool bUseWinEncodi
             throw uno::RuntimeException(THROW_WHERE "No expected key is provided!" );
 
         for ( sal_Int32 nInd = 0; nInd < m_aStorageEncryptionKeys.getLength(); nInd++ )
-            if ( m_aStorageEncryptionKeys[nInd].Name.equals( aNameToFind ) )
+            if ( m_aStorageEncryptionKeys[nInd].Name == aNameToFind )
                 m_aStorageEncryptionKeys[nInd].Value >>= aResult;
 
         // empty keys are not allowed here
diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx
index 8f0979f5f748..03e2451efbf8 100644
--- a/package/source/zippackage/zipfileaccess.cxx
+++ b/package/source/zippackage/zipfileaccess.cxx
@@ -127,14 +127,14 @@ bool OZipFileAccess::StringGoodForPattern_Impl( const OUString& aString,
         if ( aPattern[0].isEmpty() )
             return true;
 
-        return aString.equals( aPattern[0] );
+        return aString == aPattern[0];
     }
 
     sal_Int32 nBeginInd = aPattern[0].getLength();
     sal_Int32 nEndInd = aString.getLength() - aPattern[nInd].getLength();
     if ( nEndInd >= nBeginInd
-      && ( nEndInd == aString.getLength() || aString.copy( nEndInd ).equals( aPattern[nInd] ) )
-      && ( nBeginInd == 0 || aString.copy( 0, nBeginInd ).equals( aPattern[0] ) ) )
+      && ( nEndInd == aString.getLength() || aString.copy( nEndInd ) == aPattern[nInd] )
+      && ( nBeginInd == 0 || aString.copy( 0, nBeginInd ) == aPattern[0] ) )
     {
         for ( sal_Int32 nCurInd = aPattern.getLength() - 2; nCurInd > 0; nCurInd-- )
         {
diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index 2aeb31015d9d..1d687a61efd2 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -1011,7 +1011,7 @@ OStoreDirectory ORegKey::getStoreDir()
     OUString        relativName;
     storeAccessMode accessMode = storeAccessMode::ReadWrite;
 
-    if ( m_name.equals(m_pRegistry->ROOT) )
+    if ( m_name == m_pRegistry->ROOT )
     {
         fullPath.clear();
         relativName.clear();
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index be3651aba776..d82f4a457851 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -819,7 +819,7 @@ void OUnoObject::_propertyChange( const  beans::PropertyChangeEvent& evt )
                 OUString aNewName;
                 evt.NewValue >>= aNewName;
 
-                if ( !aNewName.equals(aOldName) )
+                if ( aNewName != aOldName )
                 {
                     // set old name property
                     OObjectBase::EndListening();
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 73a162b74f0e..c865a1293f8b 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -922,7 +922,7 @@ beans::Property GeometryHandler::getProperty(const OUString & PropertyName)
     const beans::Property* pEnd  = pIter + aProps.getLength();
     const beans::Property* pFind = ::std::find_if(pIter, pEnd,
             [&PropertyName] (const beans::Property& x) -> bool {
-                return x.Name.equals(PropertyName);
+                return x.Name == PropertyName;
             });
     if ( pFind == pEnd )
         return beans::Property();
@@ -1336,13 +1336,11 @@ uno::Sequence< beans::Property > SAL_CALL GeometryHandler::getSupportedPropertie
     const uno::Sequence< beans::Property> aSeq = xInfo->getProperties();
     for (const auto & rIncludeProp : pIncludeProperties)
     {
-        const beans::Property* pIter = aSeq.getConstArray();
-        const beans::Property* pEnd  = pIter + aSeq.getLength();
-        const beans::Property* pFind = ::std::find_if(pIter, pEnd,
+        const beans::Property* pFind = ::std::find_if(aSeq.begin(), aSeq.end(),
             [&rIncludeProp] (const beans::Property& x) -> bool {
-                return x.Name.equals(rIncludeProp);
+                return x.Name == rIncludeProp;
             });
-        if ( pFind != pEnd )
+        if ( pFind != aSeq.end() )
         {
             // special case for controls which contain a data field
             if ( PROPERTY_DATAFIELD == rIncludeProp )
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 07ad27198690..d23550f9de16 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -3941,7 +3941,7 @@ void OReportController::createDefaultControl(const uno::Sequence< beans::Propert
         const beans::PropertyValue* pEnd  = pIter + _aArgs.getLength();
         const beans::PropertyValue* pKeyModifier = ::std::find_if(pIter, pEnd,
             [&sKeyModifier] (const beans::PropertyValue& x) -> bool {
-                return x.Name.equals(sKeyModifier);
+                return x.Name == sKeyModifier;
             });
         sal_Int16 nKeyModifier = 0;
         if ( pKeyModifier == pEnd || ((pKeyModifier->Value >>= nKeyModifier) && nKeyModifier == KEY_MOD1) )
@@ -4040,7 +4040,7 @@ sal_Bool SAL_CALL OReportController::supportsMode( const OUString& aMode )
     const OUString* pEnd  = pIter + aModes.getLength();
     for(;pIter != pEnd;++pIter)
     {
-        if ( pIter->equals(aMode ) )
+        if ( *pIter == aMode )
             break;
     }
     return pIter != pEnd;
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 4a52bc8a7df9..4a3b014b095c 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -464,8 +464,7 @@ namespace osl_FileBase
 
         if (nError == osl::FileBase::E_None)
         {
-            bool bStrAreEqual = _suAssumeResultStr.equals(suResultURL);
-            CPPUNIT_ASSERT_MESSAGE("Assumption is wrong: ResultURL is not equal to expected URL ", bStrAreEqual);
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("Assumption is wrong: ResultURL is not equal to expected URL ", _suAssumeResultStr, suResultURL);
         }
     }
 
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
index 4c699ab18d6e..1595377ac25d 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -133,7 +133,7 @@ namespace osl_Security
             aMessage.append(", bRes: ");
             aMessage.append(bRes);
 
-            CPPUNIT_ASSERT_MESSAGE( aMessage.getStr(), strUserID.equals(strID) );
+            CPPUNIT_ASSERT_EQUAL_MESSAGE( aMessage.getStr(), strUserID, strID );
             CPPUNIT_ASSERT_MESSAGE( aMessage.getStr(), bRes );
         }
 
diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
index a328b4f0fffb..c8173831f757 100644
--- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
+++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
@@ -111,7 +111,7 @@ protected:
             while(schedule())
             {
                 rtl::OUString aStr = Gregorian::get();
-                if (aStr.equals(m_sConstStr))
+                if (aStr == m_sConstStr)
                 {
                     m_nOK++;
                 }
diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx
index eb024402b49b..79d232f42355 100644
--- a/sal/qa/rtl/uri/rtl_Uri.cxx
+++ b/sal/qa/rtl/uri/rtl_Uri.cxx
@@ -58,13 +58,13 @@ namespace Stringtest
                 rtl::OString sStr("h\xE4llo", strlen("h\xE4llo"));
                 rtl::OUString suString = rtl::OStringToOUString(sStr, RTL_TEXTENCODING_ISO_8859_15);
 
-                CPPUNIT_ASSERT_MESSAGE("Strings must be equal", suString.equals(suStr_UriDecodeToIuri));
+                CPPUNIT_ASSERT_EQUAL_MESSAGE("Strings must be equal", suString, suStr_UriDecodeToIuri);
 
                 // ustring --> ustring (UTF8)
                 rtl::OUString suStr2 = rtl::Uri::encode(suStr_UriDecodeToIuri, rtl_UriCharClassUnoParamValue, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8);
                 showContent(suStr2);
 
-                CPPUNIT_ASSERT_MESSAGE("Strings must be equal", suStr2.equals(suStrUTF8));
+                CPPUNIT_ASSERT_EQUAL_MESSAGE("Strings must be equal", suStr2, suStrUTF8);
                 // suStr should be equal to suStr2
             }
 
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index c3d2be34e322..172a5a3e6952 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -198,7 +198,7 @@ static bool getFromCommandLineArgs(
          ii != pNameValueList->end() ;
          ++ii )
     {
-        if( (*ii).sName.equals(key) )
+        if( (*ii).sName == key )
         {
             *value = (*ii).sValue;
             found = true;
@@ -341,7 +341,7 @@ Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName )
         dirItem.getFileStatus( status ) == DirectoryItem::E_None)
     {
         base_ini = status.getFileURL();
-        if (! rIniName.equals( base_ini ))
+        if ( rIniName != base_ini )
         {
             _base_ini = static_cast< Bootstrap_Impl * >(
                 rtl_bootstrap_args_open( base_ini.pData ) );
@@ -765,7 +765,7 @@ void SAL_CALL rtl_bootstrap_set (
     NameValueList::iterator iEnd( r_rtl_bootstrap_set_list.end() );
     for ( ; iPos != iEnd; ++iPos )
     {
-        if (iPos->sName.equals( name ))
+        if (iPos->sName == name)
         {
             iPos->sValue = value;
             return;