use more OUString::operator== in sw

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

30 files changed, 38 insertions, 38 deletions

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 32df03c73071..d69f682cb8fa 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -3687,11 +3687,11 @@ void SwUiWriterTest::testUnicodeNotationToggle()
     lcl_dispatchCommand(mxComponent, ".uno:UnicodeNotationToggle", aPropertyValues);
     sExpectedString = "u+";
     sDocString = pWrtShell->GetCursor()->GetNode().GetTextNode()->GetText();
-    CPPUNIT_ASSERT( sDocString.equals(sExpectedString) );
+    CPPUNIT_ASSERT_EQUAL( sDocString, sExpectedString );
 
     lcl_dispatchCommand(mxComponent, ".uno:UnicodeNotationToggle", aPropertyValues);
     sDocString = pWrtShell->GetCursor()->GetNode().GetTextNode()->GetText();
-    CPPUNIT_ASSERT( sDocString.equals(sOriginalDocString) );
+    CPPUNIT_ASSERT_EQUAL( sDocString, sOriginalDocString );
 }
 
 void SwUiWriterTest::testTdf34957()
diff --git a/sw/source/core/doc/visiturl.cxx b/sw/source/core/doc/visiturl.cxx
index fad1ebc57a83..1ea5d3464856 100644
--- a/sw/source/core/doc/visiturl.cxx
+++ b/sw/source/core/doc/visiturl.cxx
@@ -52,7 +52,7 @@ void SwURLStateChanged::Notify( SfxBroadcaster& , const SfxHint& rHint )
 
         if( pDoc->GetDocShell() && pDoc->GetDocShell()->GetMedium() &&
             // If this is our Doc, we can also have local jumps!
-            pDoc->GetDocShell()->GetMedium()->GetName().equals(sURL) )
+            pDoc->GetDocShell()->GetMedium()->GetName() == sURL )
             sBkmk = "#" + pIURL->GetMark();
 
         bool bAction = false, bUnLockView = false;
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index 90bdef938d0e..84f76590b1dd 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -707,7 +707,7 @@ const SwTable* SwTableFormula::FindTable( SwDoc& rDoc, const OUString& rNm )
         SwFrameFormat* pFormat = rTableFormats[ --nFormatCnt ];
         // if we are called from Sw3Writer, a number is dependent on the format name
         SwTableBox* pFBox;
-        if ( rNm.equals(pFormat->GetName().getToken(0, 0x0a)) &&
+        if ( rNm == pFormat->GetName().getToken(0, 0x0a) &&
             nullptr != ( pTmpTable = SwTable::FindTable( pFormat ) ) &&
             nullptr != (pFBox = pTmpTable->GetTabSortBoxes()[0] ) &&
             pFBox->GetSttNd() &&
diff --git a/sw/source/core/unocore/XMLRangeHelper.cxx b/sw/source/core/unocore/XMLRangeHelper.cxx
index 98914d73e9fa..7390c0d1f8dc 100644
--- a/sw/source/core/unocore/XMLRangeHelper.cxx
+++ b/sw/source/core/unocore/XMLRangeHelper.cxx
@@ -269,7 +269,7 @@ bool lcl_getCellRangeAddressFromXMLString(
         }
         if( bResult &&
             !sTableSecondName.isEmpty() &&
-            ! sTableSecondName.equals( rOutRange.aTableName ))
+            sTableSecondName != rOutRange.aTableName )
             bResult = false;
     }
 
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index d9ae48983a5d..1d0c0200708b 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -616,7 +616,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData
             if( !pOleNode )
                 continue;
             const SwOLEObj& rOObj = pOleNode->GetOLEObj();
-            if( aChartOleObjectName.equals( rOObj.GetCurrentPersistName() ) )
+            if( aChartOleObjectName == rOObj.GetCurrentPersistName() )
             {
                 aChartTableName = pOleNode->GetChartTableName();
                 break;
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 926d114d34c0..1d6b2d362409 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -1344,7 +1344,7 @@ SwXDocumentIndex::attach(const uno::Reference< text::XTextRange > & xTextRange)
     SwTOXBase & rTOXBase = m_pImpl->m_pProps->GetTOXBase();
     SwTOXType const*const pTOXType = rTOXBase.GetTOXType();
     if ((TOX_USER == pTOXType->GetType()) &&
-        !m_pImpl->m_pProps->GetTypeName().equals(pTOXType->GetTypeName()))
+        m_pImpl->m_pProps->GetTypeName() != pTOXType->GetTypeName())
     {
         lcl_ReAssignTOXType(pDoc, rTOXBase, m_pImpl->m_pProps->GetTypeName());
     }
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 63be420dd9e6..63e59d4996db 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -970,7 +970,7 @@ sal_Int32 SwXCell::getError()
 {
     SolarMutexGuard aGuard;
     OUString sContent = getString();
-    return sal_Int32(sContent.equals(SwViewShell::GetShellRes()->aCalc_Error));
+    return sal_Int32(sContent == SwViewShell::GetShellRes()->aCalc_Error);
 }
 
 uno::Reference<text::XTextCursor> SwXCell::createTextCursor()
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index 862f0165e4c3..055a952bbfab 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -76,7 +76,7 @@ std::shared_ptr<const SfxFilter> SwIoSystem::GetFilterOfFormat(const OUString& r
             std::shared_ptr<const SfxFilter> pFilter = aIter.First();
             while ( pFilter )
             {
-                if( pFilter->GetUserData().equals(rFormatNm) )
+                if( pFilter->GetUserData() == rFormatNm )
                     return pFilter;
                 pFilter = aIter.Next();
             }
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 8ee597c8d921..d7889c17f366 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4817,7 +4817,7 @@ void SwWW8ImplReader::ReadGlobalTemplateSettings( const OUString& sCreatedFrom,
                 aURL = sGlobalTemplates[ i ];
         else
                 osl::FileBase::getFileURLFromSystemPath( sGlobalTemplates[ i ], aURL );
-        if ( !aURL.endsWithIgnoreAsciiCase( ".dot" ) || ( !sCreatedFrom.isEmpty() && sCreatedFrom.equals( aURL ) ) )
+        if ( !aURL.endsWithIgnoreAsciiCase( ".dot" ) || ( !sCreatedFrom.isEmpty() && sCreatedFrom == aURL ) )
             continue; // don't try and read the same document as ourselves
 
         tools::SvRef<SotStorage> rRoot = new SotStorage( aURL, StreamMode::STD_READWRITE );
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index ab5f55e9ece5..57cb820f2fe4 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3683,7 +3683,7 @@ const SwFormat* SwWW8ImplReader::GetStyleWithOrgWWName( OUString& rName ) const
     {
         for(sal_uInt16 nI = 0; nI < m_xStyles->GetCount(); nI++ )
             if(    m_vColl[ nI ].m_bValid
-                && (rName.equals( m_vColl[ nI ].GetOrgWWName())) )
+                && (rName == m_vColl[ nI ].GetOrgWWName()) )
             {
                 pRet = m_vColl[ nI ].m_pFormat;
                 break;
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 72be1a7e4d0a..0cb452f12fdc 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -2713,7 +2713,7 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam)
             {
                 const SvxFontItem &rF = ItemGet<SvxFontItem>(*(*aIter),
                     GetWhichOfScript(RES_CHRATR_FONT,nScript));
-                if (rF.GetFamilyName().equals(sFontName))
+                if (rF.GetFamilyName() == sFontName)
                 {
                     pCharFormat=*aIter;
                     break;
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 1c6463df7b6c..df80ff69e843 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -4166,7 +4166,7 @@ OUString WW8PLCFx_Book::GetUniqueBookmarkName(const OUString &rSuggestedName)
     size_t i = 0;
     while (i < aBookNames.size())
     {
-        if (aRet.equals(aBookNames[i]))
+        if (aRet == aBookNames[i])
         {
             sal_Int32 len = aRet.getLength();
             sal_Int32 p = len - 1;
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index 07e6390daa64..32bd7a5d30e0 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -376,15 +376,15 @@ void XMLRedlineImportHelper::Add(
 
     // ad 1)
     RedlineType_t eType;
-    if (rType.equals(sInsertion))
+    if (rType == sInsertion)
     {
         eType = nsRedlineType_t::REDLINE_INSERT;
     }
-    else if (rType.equals(sDeletion))
+    else if (rType == sDeletion)
     {
         eType = nsRedlineType_t::REDLINE_DELETE;
     }
-    else if (rType.equals(sFormatChange))
+    else if (rType == sFormatChange)
     {
         eType = nsRedlineType_t::REDLINE_FORMAT;
     }
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index a989dc57ad29..062ae2938c95 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -311,7 +311,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
             if( pExistingOLENd )
             {
                 OUString aExistingName = pExistingOLENd->GetOLEObj().GetCurrentPersistName();
-                if ( aExistingName.equals( aObjName ) )
+                if ( aExistingName == aObjName )
                 {
                     OSL_FAIL( "The document contains duplicate object references, means it is partially broken, please let developers know how this document was generated!" );
 
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 2a542d3b7da0..a994ee54484d 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -479,7 +479,7 @@ SwCaptionOptPage::SwCaptionOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
         {
             SwFieldType* pFieldType = pMgr->GetFieldType(SwFieldIds::Unknown, --i);
             if (!pFieldType->GetName().isEmpty()
-                && pFieldType->GetName().equals(m_pCategoryBox->GetText()))
+                && pFieldType->GetName() == m_pCategoryBox->GetText())
             {
                 nSelFormat = (sal_uInt16)static_cast<SwSetExpFieldType*>(pFieldType)->GetSeqFormat();
                 break;
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 80d89d6ade9f..97abb559b731 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -1676,7 +1676,7 @@ void SwInsertDBColAutoPilot::Load()
         pDataSourceProps[0] >>= sSource;
         pDataSourceProps[1] >>= sCommand;
         pDataSourceProps[2] >>= nCommandType;
-        if(sSource.equals(aDBData.sDataSource) && sCommand.equals(aDBData.sCommand))
+        if(sSource == aDBData.sDataSource && sCommand == aDBData.sCommand)
         {
             std::unique_ptr<DB_ColumnConfigData> pNewData(new DB_ColumnConfigData);
             pNewData->sSource = sSource;
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index 7afde439fb37..1edd167e825c 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -353,7 +353,7 @@ SwFrameFormat* SwMailMergeLayoutPage::InsertAddressFrame(
                         nColumn < static_cast<sal_uInt32>(aAssignment.getLength());
                                                                                     ++nColumn)
                 {
-                    if (rHeaders.GetString(nColumn).equals(aItem.sText) &&
+                    if (rHeaders.GetString(nColumn) == aItem.sText &&
                         !pAssignment[nColumn].isEmpty())
                     {
                         sConvertedColumn = pAssignment[nColumn];
@@ -573,7 +573,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
                                     nColumn < static_cast<sal_uInt32>(aAssignment.getLength());
                                                                                                 ++nColumn)
                             {
-                                if (rHeaders.GetString(nColumn).equals(aItem.sText) &&
+                                if (rHeaders.GetString(nColumn) == aItem.sText &&
                                     !pAssignment[nColumn].isEmpty())
                                 {
                                     sConvertedColumn = pAssignment[nColumn];
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index 6c7a02f58f66..6e4b21a03037 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -137,21 +137,21 @@ void SwFieldInputDlg::Apply()
     {
         if(pUsrType)
         {
-            if( !aTmp.equals(pUsrType->GetContent()) )
+            if( aTmp != pUsrType->GetContent() )
             {
                 pUsrType->SetContent(aTmp);
                 pUsrType->UpdateFields();
                 bModified = true;
             }
         }
-        else if( !aTmp.equals(pInpField->GetPar1()) )
+        else if( aTmp != pInpField->GetPar1() )
         {
             pInpField->SetPar1(aTmp);
             rSh.SwEditShell::UpdateFields(*pInpField);
             bModified = true;
         }
     }
-    else if( !aTmp.equals(pSetField->GetPar2()) )
+    else if( aTmp != pSetField->GetPar2())
     {
         pSetField->SetPar2(aTmp);
         rSh.SwEditShell::UpdateFields(*pSetField);
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 5f60b4e0a814..424cdf7d5c58 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -207,7 +207,7 @@ SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) :
     for ( size_t i = nCount; i; )
     {
         SwFieldType* pFieldType = pMgr->GetFieldType(SwFieldIds::Unknown, --i);
-        if( pFieldType->GetName().equals(m_pCategoryBox->GetText()) )
+        if( pFieldType->GetName() == m_pCategoryBox->GetText() )
         {
             nSelFormat = (sal_uInt16)static_cast<SwSetExpFieldType*>(pFieldType)->GetSeqFormat();
             break;
diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx
index 2a73235d129e..24f021ba0b2b 100644
--- a/sw/source/ui/vba/vbadocument.cxx
+++ b/sw/source/ui/vba/vbadocument.cxx
@@ -427,7 +427,7 @@ SwVbaDocument::getControlShape( const OUString& sName )
         if( xControlShape.is() )
         {
              uno::Reference< container::XNamed > xNamed( xControlShape->getControl(), uno::UNO_QUERY_THROW );
-            if( sName.equals( xNamed->getName() ))
+            if( sName == xNamed->getName() )
             {
                 return aUnoObj;
             }
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx
index 4e1ce1815a5c..126306d25218 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -323,7 +323,7 @@ public:
             bool bFound = false;
             for ( sal_Int32 index = 0; index < nLen && !bFound ; ++index )
             {
-                if ( rPropName.equals( stats[ index ].Name ) )
+                if ( rPropName == stats[ index ].Name )
                 {
                     aReturn = stats[ index ].Value;
                     bFound = true;
@@ -343,7 +343,7 @@ public:
         sal_Int32 nLen = stats.getLength();
         for ( sal_Int32 index = 0; index < nLen; ++index )
         {
-            if ( rPropName.equals( stats[ index ].Name ) )
+            if ( rPropName == stats[ index ].Name )
             {
                 stats[ index ].Value = aValue;
                 m_xDocProps->setDocumentStatistics(stats);
diff --git a/sw/source/ui/vba/vbavariable.cxx b/sw/source/ui/vba/vbavariable.cxx
index 76033d2a9d83..01cacf146851 100644
--- a/sw/source/ui/vba/vbavariable.cxx
+++ b/sw/source/ui/vba/vbavariable.cxx
@@ -68,7 +68,7 @@ SwVbaVariable::getIndex()
     const uno::Sequence< beans::PropertyValue > props = mxUserDefined->getPropertyValues();
     for (sal_Int32 i = 0; i < props.getLength(); ++i)
     {
-        if( maVariableName.equals( props[i].Name ) )
+        if( maVariableName == props[i].Name )
             return i+1;
     }
 
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index a7bccb654ef2..ffc10aa3ce1e 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1700,7 +1700,7 @@ sal_uLong SwDBManager::GetColumnFormat( const OUString& rDBName,
         uno::Reference< sdbcx::XColumnsSupplier> xColsSupp;
         bool bDisposeConnection = false;
         if(pImpl->pMergeData &&
-            pImpl->pMergeData->sDataSource.equals(rDBName) && pImpl->pMergeData->sCommand.equals(rTableName))
+            pImpl->pMergeData->sDataSource == rDBName && pImpl->pMergeData->sCommand == rTableName)
         {
             xConnection = pImpl->pMergeData->xConnection;
             xSource = SwDBManager::getDataSourceAsParent(xConnection,rDBName);
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx
index 1bbbfc5d76c5..006ef49eabac 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -495,7 +495,7 @@ OUString SwAddressPreview::FillData(
                     nColumn < rDefHeaders.Count() && nColumn < sal_uInt32(aAssignment.getLength());
                                                                                 ++nColumn)
             {
-                if (rDefHeaders.GetString(nColumn).equals(aItem.sText) &&
+                if (rDefHeaders.GetString(nColumn) == aItem.sText &&
                     !pAssignment[nColumn].isEmpty())
                 {
                     sConvertedColumn = pAssignment[nColumn];
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
index ca0559bd0e76..2adab839408d 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -1225,7 +1225,7 @@ bool SwMailMergeConfigItem::IsAddressFieldsAssigned() const
                     nColumn < rHeaders.Count() && nColumn < sal_uInt32(aAssignment.getLength());
                                                                                 ++nColumn)
             {
-                if (rHeaders.GetString(nColumn).equals(aItem.sText) &&
+                if (rHeaders.GetString(nColumn) == aItem.sText &&
                     !pAssignment[nColumn].isEmpty())
                 {
                     sConvertedColumn = pAssignment[nColumn];
@@ -1284,7 +1284,7 @@ bool SwMailMergeConfigItem::IsGreetingFieldsAssigned() const
                     nColumn < rHeaders.Count() && nColumn < sal_uInt32(aAssignment.getLength());
                                                                                 ++nColumn)
             {
-                if (rHeaders.GetString(nColumn).equals(aItem.sText) &&
+                if (rHeaders.GetString(nColumn) == aItem.sText &&
                     !pAssignment[nColumn].isEmpty())
                 {
                     sConvertedColumn = pAssignment[nColumn];
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index a55764f4434d..f20db12ab9a9 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -202,7 +202,7 @@ void SwAnnotationWin::SetPostItText()
     //point .e.g. fdo#33599
     mpField = static_cast<SwPostItField*>(mpFormatField->GetField());
     OUString sNewText = mpField->GetPar2();
-    bool bTextUnchanged = sNewText.equals(mpOutliner->GetEditEngine().GetText());
+    bool bTextUnchanged = sNewText == mpOutliner->GetEditEngine().GetText();
     ESelection aOrigSelection(GetOutlinerView()->GetEditView().GetSelection());
 
     // get text from SwPostItField and insert into our textview
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index 8de481a0f78a..4c31ff70f659 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -602,7 +602,7 @@ IMPL_LINK( SwDrawBaseShell, CheckGroupShapeNameHdl, AbstractSvxObjectNameDialog&
         while( aIter.IsMore() )
         {
             SdrObject* pTempObj = aIter.Next();
-            if ( pObj != pTempObj && pTempObj->GetName().equals(sNewName) )
+            if ( pObj != pTempObj && pTempObj->GetName() == sNewName )
             {
                 bRet = false;
                 break;
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index bdf016c7dab6..654716b85172 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -333,7 +333,7 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq )
     for( size_t i = 0; i < aFormats.size(); ++i )
     {
         pEntries[i] = aFormats[i];
-        if(pEntries[i].equals(sGraphicFormat))
+        if(pEntries[i] == sGraphicFormat)
             nSelect = i;
     }
     try
diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx
index ed520f0bec9d..4ea2e22fc16d 100644
--- a/sw/source/uibase/uno/unoatxt.cxx
+++ b/sw/source/uibase/uno/unoatxt.cxx
@@ -600,7 +600,7 @@ void SwXAutoTextGroup::setPropertyValue(
             aValue >>= sNewTitle;
             if(sNewTitle.isEmpty())
                 throw lang::IllegalArgumentException();
-            bool bChanged = !sNewTitle.equals(pGlosGroup->GetName());
+            bool bChanged = sNewTitle != pGlosGroup->GetName();
             pGlosGroup->SetName(sNewTitle);
             if(bChanged && HasGlossaryList())
                 GetGlossaryList()->ClearGroups();
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 88862a02a7b2..20c6ee6c028b 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3420,7 +3420,7 @@ void SwContentTree::GotoContent(SwContent* pCnt)
                 for( size_t i=0; i<nCount; ++i )
                 {
                     SdrObject* pTemp = pPage->GetObj(i);
-                    if (pTemp->GetName().equals(pCnt->GetName()))
+                    if (pTemp->GetName() == pCnt->GetName())
                     {
                         SdrPageView* pPV = pDrawView->GetSdrPageView();
                         if( pPV )