From a394d67f374e1b253f288a58113a3cfc8d301743 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 13 Jul 2017 09:55:21 +0200
Subject: 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>
---
 cppu/source/uno/EnvStack.cxx        | 4 ++--
 cppu/source/uno/cascade_mapping.cxx | 8 ++++----
 cppu/source/uno/eq.hxx              | 6 +++---
 cppu/source/uno/lbenv.cxx           | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'cppu')

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 );
-- 
cgit