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>

5 files changed, 8 insertions, 9 deletions

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;