use more OUString::operator== in dbaccess..filter

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

7 files changed, 17 insertions, 17 deletions

diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index d8f4abc5b06e..9ff2e7556788 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -420,8 +420,8 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const &
             break;
         }
         OSL_ASSERT( verExc.Deployed.is() );
-        bool bEqualNames = verExc.NewDisplayName.equals(
-            verExc.Deployed->getDisplayName());
+        bool bEqualNames = verExc.NewDisplayName ==
+            verExc.Deployed->getDisplayName();
         {
             SolarMutexGuard guard;
             ScopedVclPtrInstance<MessageDialog> box(m_pDialogHelper? m_pDialogHelper->getWindow() : nullptr,
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index a53f7e3e5baa..34f862c8f6f6 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -244,7 +244,7 @@ void ExtensionManager::addExtensionsToMap(
     int index = 0;
     for (;citNames != m_repositoryNames.end(); ++citNames, ++index)
     {
-        if (citNames->equals(repository))
+        if (*citNames == repository)
             break;
     }
 
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index a49bff015734..a0eb96fdcc02 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -254,7 +254,7 @@ void PackageManagerImpl::initActivationLayer(
                                                   data.size());
                             OUString sData = OStringToOUString(
                                 osData, RTL_TEXTENCODING_UTF8);
-                            if (!sData.equals(aUserName))
+                            if (sData != aUserName)
                                 continue;
                         }
                     }
@@ -1244,8 +1244,8 @@ bool PackageManagerImpl::synchronizeRemovedExtensions(
                            "must have an identifier and a version");
                 if (infoset.hasDescription() &&
                     infoset.getIdentifier() &&
-                    (! i->first.equals(*(infoset.getIdentifier()))
-                     || ! i->second.version.equals(infoset.getVersion())))
+                    ( i->first != *(infoset.getIdentifier())
+                      || i->second.version != infoset.getVersion()))
                 {
                     bRemoved = true;
                 }
@@ -1491,7 +1491,7 @@ sal_Int32 PackageManagerImpl::checkPrerequisites(
     {
         if (!extension.is())
             return 0;
-        if (!m_context.equals(extension->getRepositoryName()))
+        if (m_context != extension->getRepositoryName())
             throw lang::IllegalArgumentException(
                 "PackageManagerImpl::checkPrerequisites: extension is not from this repository.",
                 nullptr, 0);
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 5413b9f30ff3..8d051bc2ee45 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -256,7 +256,7 @@ public:
     explicit XPackage_eq(const OUString & s) : m_URL(s) {}
     bool operator() (const Reference<deployment::XPackage> & p) const
     {
-        return m_URL.equals(p->getURL());
+        return m_URL == p->getURL();
     }
 };
 
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index ed8bfa3e3c04..c57c4e4d6760 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2383,7 +2383,7 @@ static char* getFontSubset (const OString& aFontName)
         sal_uInt16 nItFont = 0;
         for (; nItFont < nFontCount; ++nItFont)
         {
-            if (aFoundFont.equals(pList->GetFontName(nItFont).GetFamilyName()))
+            if (aFoundFont == pList->GetFontName(nItFont).GetFamilyName())
             {
                 break;
             }
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 807e335dc386..0f5b4693a651 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -941,7 +941,7 @@ std::vector< MigrationModuleInfo > MigrationImpl::dectectUIChangesForAllModules(
                 for (sal_Int32 j=0; j<lToolbars.getLength(); ++j) {
                     OUString sToolbarName = lToolbars[j];
                     if (sToolbarName.getLength()>=nCustomLen &&
-                        sToolbarName.copy(0, nCustomLen).equals(RESOURCEURL_CUSTOM_ELEMENT))
+                        sToolbarName.copy(0, nCustomLen) == RESOURCEURL_CUSTOM_ELEMENT)
                         continue;
 
                     aModuleInfo.sModuleShortName = sModuleShortName;
@@ -1106,7 +1106,7 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat
                         }
                     }
 
-                    if (sCmd.equals(it->m_sPrevSibling))
+                    if (sCmd == it->m_sPrevSibling)
                         break;
                 }
 
@@ -1129,7 +1129,7 @@ uno::Reference< ui::XUIConfigurationManager > NewVersionUIInfo::getConfigManager
     uno::Reference< ui::XUIConfigurationManager > xCfgManager;
 
     for ( const css::beans::PropertyValue& rProp : m_lCfgManagerSeq) {
-        if (rProp.Name.equals(sModuleShortName)) {
+        if (rProp.Name == sModuleShortName) {
             rProp.Value >>= xCfgManager;
             break;
         }
@@ -1143,7 +1143,7 @@ uno::Reference< container::XIndexContainer > NewVersionUIInfo::getNewMenubarSett
     uno::Reference< container::XIndexContainer > xNewMenuSettings;
 
     for (sal_Int32 i=0; i<m_lNewVersionMenubarSettingsSeq.getLength(); ++i) {
-        if (m_lNewVersionMenubarSettingsSeq[i].Name.equals(sModuleShortName)) {
+        if (m_lNewVersionMenubarSettingsSeq[i].Name == sModuleShortName) {
             m_lNewVersionMenubarSettingsSeq[i].Value >>= xNewMenuSettings;
             break;
         }
@@ -1157,11 +1157,11 @@ uno::Reference< container::XIndexContainer > NewVersionUIInfo::getNewToolbarSett
     uno::Reference< container::XIndexContainer > xNewToolbarSettings;
 
     for (sal_Int32 i=0; i<m_lNewVersionToolbarSettingsSeq.getLength(); ++i) {
-        if (m_lNewVersionToolbarSettingsSeq[i].Name.equals(sModuleShortName)) {
+        if (m_lNewVersionToolbarSettingsSeq[i].Name == sModuleShortName) {
             uno::Sequence< beans::PropertyValue > lToolbarSettingsSeq;
             m_lNewVersionToolbarSettingsSeq[i].Value >>= lToolbarSettingsSeq;
             for (sal_Int32 j=0; j<lToolbarSettingsSeq.getLength(); ++j) {
-                if (lToolbarSettingsSeq[j].Name.equals(sToolbarName)) {
+                if (lToolbarSettingsSeq[j].Name == sToolbarName) {
                     lToolbarSettingsSeq[j].Value >>= xNewToolbarSettings;
                     break;
                 }
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index b50374694e41..be570542a97c 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -63,8 +63,8 @@ struct ExtensionName
     explicit ExtensionName( OUString const & str ) : m_str( str ) {}
     bool operator () ( Reference<deployment::XPackage> const & e ) const
     {
-        return m_str.equals(dp_misc::getIdentifier(e))
-             ||  m_str.equals(e->getName());
+        return m_str == dp_misc::getIdentifier(e)
+             ||  m_str == e->getName();
     }
 };