diff options
Diffstat (limited to 'sw/source/filter')
-rw-r--r-- | sw/source/filter/basflt/iodetect.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par2.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par5.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8scan.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/xml/XMLRedlineImportHelper.cxx | 6 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltexti.cxx | 2 |
7 files changed, 9 insertions, 9 deletions
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!" ); |