diff options
57 files changed, 119 insertions, 122 deletions
diff --git a/test/source/sheet/xnamedrange.cxx b/test/source/sheet/xnamedrange.cxx index 84e4cb1c4875..faaa2a47b56a 100644 --- a/test/source/sheet/xnamedrange.cxx +++ b/test/source/sheet/xnamedrange.cxx @@ -38,7 +38,7 @@ void XNamedRange::testGetContent() uno::Reference< sheet::XNamedRange > xNamedRange = getNamedRange("initial1"); OUString const aExpectedContent("$Sheet1.$B$1"); - CPPUNIT_ASSERT_MESSAGE("Wrong expected content for initial1 on GetContent", xNamedRange->getContent().equals(aExpectedContent)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong expected content for initial1 on GetContent", xNamedRange->getContent(), aExpectedContent); } void XNamedRange::testSetContent() @@ -50,19 +50,18 @@ void XNamedRange::testSetContent() // test a cell aExpectedContent = "D1"; xNamedRange->setContent(aExpectedContent); - CPPUNIT_ASSERT_MESSAGE("Wrong expected content for initial1 after SetContent a cell", xNamedRange->getContent().equals(aExpectedContent)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong expected content for initial1 after SetContent a cell", xNamedRange->getContent(), aExpectedContent); // test a cellrange aExpectedContent = "D1:D10"; xNamedRange->setContent(aExpectedContent); - CPPUNIT_ASSERT_MESSAGE("Wrong expected content for initial1 after SetContent a cellrange", xNamedRange->getContent().equals(aExpectedContent)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong expected content for initial1 after SetContent a cellrange", xNamedRange->getContent(), aExpectedContent); // test a formula aExpectedContent = "=D10"; xNamedRange->setContent(aExpectedContent); aExpectedContent = "D10"; - CPPUNIT_ASSERT_MESSAGE("Wrong expected content for initial1 after SetContent a formula", xNamedRange->getContent().equals(aExpectedContent)); - + CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong expected content for initial1 after SetContent a formula", xNamedRange->getContent(), aExpectedContent); } void XNamedRange::testGetType() diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 41179ad6ed88..4876794bd6e4 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -371,7 +371,7 @@ InternalResMgr* ResMgrContainer::getNextFallback( InternalResMgr* pMgr ) LanguageTag aLocale( ((aFallbacks.size() > 1) ? aFallbacks[1] : OUString( "en-US"))); InternalResMgr* pNext = getResMgr( pMgr->aPrefix, aLocale, pMgr->bSingular ); // prevent recursion - if( pNext == pMgr || ( pNext && pNext->aResName.equals( pMgr->aResName ) ) ) + if( pNext == pMgr || ( pNext && pNext->aResName == pMgr->aResName ) ) { if( pNext->bSingular ) delete pNext; diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.cxx b/ucb/source/ucp/webdav-neon/ContentProperties.cxx index 4557a565674c..551d91080b93 100644 --- a/ucb/source/ucp/webdav-neon/ContentProperties.cxx +++ b/ucb/source/ucp/webdav-neon/ContentProperties.cxx @@ -396,7 +396,7 @@ void ContentProperties::addProperty( const OUString & rName, const css::uno::Any & rValue, bool bIsCaseSensitive ) { - if ( rName.equals( DAVProperties::CREATIONDATE ) ) + if ( rName == DAVProperties::CREATIONDATE ) { // Map DAV:creationdate to UCP:DateCreated OUString aValue; @@ -413,7 +413,7 @@ void ContentProperties::addProperty( const OUString & rName, // else if ( rName.equals( DAVProperties::GETCONTENTLANGUAGE ) ) // { // } - else if ( rName.equals( DAVProperties::GETCONTENTLENGTH ) ) + else if ( rName == DAVProperties::GETCONTENTLENGTH ) { // Map DAV:getcontentlength to UCP:Size OUString aValue; @@ -434,7 +434,7 @@ void ContentProperties::addProperty( const OUString & rName, (*m_xProps)[ OUString("Size") ] = PropertyValue( uno::makeAny( aValue.toInt64() ), true ); } - else if ( rName.equals( DAVProperties::GETCONTENTTYPE ) ) + else if ( rName == DAVProperties::GETCONTENTTYPE ) { // Map DAV:getcontenttype to UCP:MediaType (1:1) (*m_xProps)[ OUString("MediaType") ] @@ -452,7 +452,7 @@ void ContentProperties::addProperty( const OUString & rName, // else if ( rName.equals( DAVProperties::GETETAG ) ) // { // } - else if ( rName.equals( DAVProperties::GETLASTMODIFIED ) ) + else if ( rName == DAVProperties::GETLASTMODIFIED ) { // Map the DAV:getlastmodified entity header to UCP:DateModified OUString aValue; @@ -480,7 +480,7 @@ void ContentProperties::addProperty( const OUString & rName, // else if ( rName.equals( DAVProperties::LOCKDISCOVERY ) ) // { // } - else if ( rName.equals( DAVProperties::RESOURCETYPE ) ) + else if ( rName == DAVProperties::RESOURCETYPE ) { OUString aValue; rValue >>= aValue; @@ -539,7 +539,7 @@ namespace { if ( isCaseSensitive ) { - if ( rName.equals( rNonCachableProp ) ) + if ( rName == rNonCachableProp ) return false; } else diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx index 2ba3c8601d09..74bb47622524 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.cxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx @@ -1759,7 +1759,7 @@ bool NeonSession::removeExpiredLocktoken( const OUString & inURL, while ( it != end ) { - if ( (*it).Name.equals( DAVProperties::LOCKDISCOVERY ) ) + if ( (*it).Name == DAVProperties::LOCKDISCOVERY ) { uno::Sequence< ucb::Lock > aLocks; if ( !( (*it).Value >>= aLocks ) ) diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx index f86ed585c718..70d380bd1b75 100644 --- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx @@ -348,7 +348,7 @@ bool DataSupplier::getData() while ( it != end ) { - if ( (*it).equals( DAVProperties::RESOURCETYPE ) ) + if ( (*it) == DAVProperties::RESOURCETYPE ) break; ++it; diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx index 892347e6781d..a9e1967a7ce1 100644 --- a/ucbhelper/source/provider/propertyvalueset.cxx +++ b/ucbhelper/source/provider/propertyvalueset.cxx @@ -564,7 +564,7 @@ sal_Int32 SAL_CALL PropertyValueSet::findColumn( const OUString& columnName ) sal_Int32 nCount = m_pValues->size(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - if ( (*m_pValues)[ n ].sPropertyName.equals( columnName ) ) + if ( (*m_pValues)[ n ].sPropertyName == columnName ) return sal_Int32( n + 1 ); // Index is 1-based. } } diff --git a/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx index f5e3163b5658..c377288069ee 100644 --- a/ucbhelper/source/provider/providerhelper.cxx +++ b/ucbhelper/source/provider/providerhelper.cxx @@ -314,7 +314,7 @@ bool ContentProviderImplHelper::renameAdditionalPropertySet( { const OUString& rKey = pKeys[ n ]; if ( rKey.startsWith( aOldKeyWithSlash ) - || rKey.equals( aOldKeyWithoutSlash ) ) + || rKey == aOldKeyWithoutSlash ) { OUString aNewKey = rKey.replaceAt( @@ -396,7 +396,7 @@ bool ContentProviderImplHelper::copyAdditionalPropertySet( { const OUString& rKey = pKeys[ n ]; if ( rKey.startsWith(aSrcKeyWithSlash ) - || rKey.equals( aSrcKeyWithoutSlash ) ) + || rKey == aSrcKeyWithoutSlash ) { OUString aNewKey = rKey.replaceAt( @@ -530,7 +530,7 @@ bool ContentProviderImplHelper::removeAdditionalPropertySet( { const OUString& rCurrKey = pKeys[ n ]; if ( rCurrKey.startsWith(aKeyWithSlash ) - || rCurrKey.equals( aKeyWithoutSlash ) ) + || rCurrKey == aKeyWithoutSlash ) { if ( !removeAdditionalPropertySet( rCurrKey, false ) ) diff --git a/unodevtools/source/unodevtools/options.cxx b/unodevtools/source/unodevtools/options.cxx index 596a2415c0e9..8156660ef735 100644 --- a/unodevtools/source/unodevtools/options.cxx +++ b/unodevtools/source/unodevtools/options.cxx @@ -45,7 +45,7 @@ bool readOption( OUString * pValue, const sal_Char * pOpt, rtl_getAppCommandArg(*pnIndex, &pValue->pData); if (*pnIndex >= rtl_getAppCommandArgCount() || - pValue->copy(1).equals(dash)) + pValue->copy(1) == dash) { throw CannotDumpException( "incomplete option \"-" + aOpt + "\" given!"); diff --git a/unotools/source/config/configpaths.cxx b/unotools/source/config/configpaths.cxx index ca3c2b94b9a9..abbf8f465f09 100644 --- a/unotools/source/config/configpaths.cxx +++ b/unotools/source/config/configpaths.cxx @@ -196,7 +196,7 @@ sal_Int32 lcl_findPrefixEnd(OUString const& _sNestedPath, OUString const& _sPref } else if (_sNestedPath.getLength() == nPrefixLength) { - bIsPrefix = _sNestedPath.equals(_sPrefixPath); + bIsPrefix = _sNestedPath == _sPrefixPath; } else { diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx index 1eef0b5415d4..06def7e5d8ed 100644 --- a/unotools/source/i18n/textsearch.cxx +++ b/unotools/source/i18n/textsearch.cxx @@ -86,8 +86,8 @@ static bool lcl_Equals( const i18nutil::SearchOptions2& rSO1, const i18nutil::Se rSO1.WildcardEscapeCharacter == rSO2.WildcardEscapeCharacter && rSO1.algorithmType == rSO2.algorithmType && rSO1.searchFlag == rSO2.searchFlag && - rSO1.searchString.equals(rSO2.searchString) && - rSO1.replaceString.equals(rSO2.replaceString) && + rSO1.searchString == rSO2.searchString && + rSO1.replaceString == rSO2.replaceString && rSO1.changedChars == rSO2.changedChars && rSO1.deletedChars == rSO2.deletedChars && rSO1.insertedChars == rSO2.insertedChars && diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx index faf243b6ff69..bae64f8fda45 100644 --- a/unoxml/source/xpath/xpathapi.cxx +++ b/unoxml/source/xpath/xpathapi.cxx @@ -108,7 +108,7 @@ namespace XPath { ::osl::MutexGuard const g(m_Mutex); - if ((m_nsmap.find(aPrefix))->second.equals(aURI)) { + if ((m_nsmap.find(aPrefix))->second == aURI) { m_nsmap.erase(aPrefix); } } diff --git a/vbahelper/source/msforms/vbacombobox.cxx b/vbahelper/source/msforms/vbacombobox.cxx index 62033556ec48..a026816e4e27 100644 --- a/vbahelper/source/msforms/vbacombobox.cxx +++ b/vbahelper/source/msforms/vbacombobox.cxx @@ -97,7 +97,7 @@ ScVbaComboBox::getListIndex() sal_Int32 nLen = sItems.getLength(); for ( sal_Int32 index = 0; !sText.isEmpty() && index < nLen; ++index ) { - if ( sItems[ index ].equals( sText ) ) + if ( sItems[ index ] == sText ) { SAL_INFO("vbahelper", "getListIndex returning " << index ); return uno::makeAny( index ); diff --git a/vbahelper/source/msforms/vbalistbox.cxx b/vbahelper/source/msforms/vbalistbox.cxx index da94a1097fe4..58e8d3acbe28 100644 --- a/vbahelper/source/msforms/vbalistbox.cxx +++ b/vbahelper/source/msforms/vbalistbox.cxx @@ -83,7 +83,7 @@ ScVbaListBox::setValue( const uno::Any& _value ) sal_Int16 i = 0; for( i = 0; i < nLength; i++ ) { - if( sList[i].equals( sValue ) ) + if( sList[i] == sValue ) { nValue = i; break; diff --git a/vbahelper/source/vbahelper/vbaglobalbase.cxx b/vbahelper/source/vbahelper/vbaglobalbase.cxx index 3d90fa37d181..2eaa8ea9d66f 100644 --- a/vbahelper/source/vbahelper/vbaglobalbase.cxx +++ b/vbahelper/source/vbahelper/vbaglobalbase.cxx @@ -107,7 +107,7 @@ VbaGlobalsBase::init( const uno::Sequence< beans::PropertyValue >& aInitArgs ) for ( sal_Int32 nIndex = 0; nIndex < nLen; ++nIndex ) { uno::Reference< container::XNameContainer > xNameContainer( mxContext, uno::UNO_QUERY_THROW ); - if ( aInitArgs[ nIndex ].Name.equals( msApplication ) ) + if ( aInitArgs[ nIndex ].Name == msApplication ) { xNameContainer->replaceByName( msApplication, aInitArgs[ nIndex ].Value ); uno::Reference< XHelperInterface > xParent( aInitArgs[ nIndex ].Value, uno::UNO_QUERY ); @@ -163,7 +163,7 @@ VbaGlobalsBase::hasServiceName( const OUString& serviceName ) sal_Int32 nLen = sServiceNames.getLength(); for ( sal_Int32 index = 0; index < nLen; ++index ) { - if ( sServiceNames[ index ].equals( serviceName ) ) + if ( sServiceNames[ index ] == serviceName ) return true; } return false; diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 272608c2a11c..d1b68f198503 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -534,8 +534,7 @@ ContainerUtilities::FieldInList( const uno::Sequence< OUString >& SearchList, co { // I wonder why comparing lexicographically is done // when it's a match is whats interesting? - //if (SearchList[i].compareTo(SearchString) == 0) - if ( SearchList[i].equals( SearchString ) ) + if ( SearchList[i] == SearchString ) { retvalue = i; break; @@ -752,7 +751,7 @@ uno::Any getPropertyValue( const uno::Sequence< beans::PropertyValue >& aProp, c { for ( sal_Int32 i = 0; i < aProp.getLength(); i++ ) { - if ( aProp[i].Name.equals(aName) ) + if ( aProp[i].Name == aName ) { return aProp[i].Value; } @@ -764,7 +763,7 @@ bool setPropertyValue( uno::Sequence< beans::PropertyValue >& aProp, const OUStr { for ( sal_Int32 i = 0; i < aProp.getLength(); i++ ) { - if ( aProp[i].Name.equals(aName) ) + if ( aProp[i].Name == aName ) { aProp[i].Value = aValue; return true; diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 271ab84ac60a..ca8536d63a9a 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -950,7 +950,7 @@ void Menu::SetItemText( sal_uInt16 nItemId, const OUString& rStr ) if ( !pData ) return; - if ( !rStr.equals( pData->aText ) ) + if ( rStr != pData->aText ) { pData->aText = rStr; ImplSetMenuItemData( pData ); diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 5630c1c09a08..c8c340343453 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -748,7 +748,7 @@ void PrintDialog::readFromSettings() for( sal_uInt16 i = 0; i < nCount; i++ ) { sal_uInt16 nPageId = mpTabCtrl->GetPageId( i ); - if( aValue.equals( mpTabCtrl->GetPageText( nPageId ) ) ) + if( aValue == mpTabCtrl->GetPageText( nPageId ) ) { mpTabCtrl->SelectTabPage( nPageId ); break; diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 6290b8f46e37..b9841d5252dc 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -54,9 +54,9 @@ namespace psp bool operator()(const css::lang::Locale& i_rLeft, const css::lang::Locale& i_rRight) const { - return i_rLeft.Language.equals( i_rRight.Language ) && - i_rLeft.Country.equals( i_rRight.Country ) && - i_rLeft.Variant.equals( i_rRight.Variant ); + return i_rLeft.Language == i_rRight.Language && + i_rLeft.Country == i_rRight.Country && + i_rLeft.Variant == i_rRight.Variant; } }; diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index b913028f9ca4..222ce648f435 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -1726,7 +1726,7 @@ void SalGtkFilePicker::SetCurFilter( const OUString& rFilter ) OUString sFilterName( filtername, strlen( filtername ), RTL_TEXTENCODING_UTF8 ); OUString aShrunkName = shrinkFilterName( rFilter ); - if( aShrunkName.equals( sFilterName) ) + if( aShrunkName == sFilterName ) { SAL_INFO( "vcl.gtk", "actually setting " << filtername ); gtk_file_chooser_set_filter( GTK_FILE_CHOOSER( m_pDialog ), pFilter ); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 7fbefaf73568..8011c65baa88 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2672,7 +2672,7 @@ void DomainMapper_Impl::ChainTextFrames() //if no mso-next-textbox, we are done. //if it points to itself, we are done. if( !msoIter->second.s_mso_next_textbox.isEmpty() - && !msoIter->second.s_mso_next_textbox.equals(msoIter->first) ) + && msoIter->second.s_mso_next_textbox != msoIter->first ) { ChainMap::iterator nextFinder=aTextFramesForChainingHelper.find(msoIter->second.s_mso_next_textbox); if( nextFinder != aTextFramesForChainingHelper.end() ) diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index f223ba977ba7..6d044ae5d5c3 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -59,7 +59,7 @@ sal_Int32 lcl_findProperty( const uno::Sequence< beans::PropertyValue >& aProps, while ( nPos == -1 && i < nLen ) { - if ( aProps[i].Name.equals( sName ) ) + if ( aProps[i].Name == sName ) nPos = i; else i++; @@ -347,13 +347,13 @@ void ListLevel::AddParaProperties( uno::Sequence< beans::PropertyValue >* props sal_Int32 nLen = aParaProps.getLength( ); for ( sal_Int32 i = 0; i < nLen; i++ ) { - if ( !hasFirstLineIndent && aParaProps[i].Name.equals( sParaIndent ) ) + if ( !hasFirstLineIndent && aParaProps[i].Name == sParaIndent ) { aProps.realloc( aProps.getLength() + 1 ); aProps[aProps.getLength( ) - 1] = aParaProps[i]; aProps[aProps.getLength( ) - 1].Name = sFirstLineIndent; } - else if ( !hasIndentAt && aParaProps[i].Name.equals( sParaLeftMargin ) ) + else if ( !hasIndentAt && aParaProps[i].Name == sParaLeftMargin ) { aProps.realloc( aProps.getLength() + 1 ); aProps[aProps.getLength( ) - 1] = aParaProps[i]; diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 3ab46124a62e..b42e589e7ab5 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1362,7 +1362,7 @@ void RTFDocumentImpl::text(OUString& rString) if (bRet) return; - if (!m_aIgnoreFirst.isEmpty() && m_aIgnoreFirst.equals(rString)) + if (!m_aIgnoreFirst.isEmpty() && m_aIgnoreFirst == rString) { m_aIgnoreFirst.clear(); return; diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index 524669a7211f..de0ad9433501 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -906,7 +906,7 @@ Reference< XHierarchicalNameAccess > Databases::findJarFileForPath OUString aIdentifier = rtl::Uri::encode( aUnencodedIdentifier, rtl_UriCharClassPchar, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 ); - if( !aIdentifierInPath.equals( aIdentifier ) ) + if( aIdentifierInPath != aIdentifier ) { // path does not start with extension identifier -> ignore bSuccess = false; @@ -1188,7 +1188,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP const Reference< deployment::XPackage > xSubPkg = pSeq[ iPkg ]; const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xSubPkg->getPackageType(); OUString aMediaType = xPackageTypeInfo->getMediaType(); - if( aMediaType.equals( aHelpMediaType ) ) + if( aMediaType == aHelpMediaType ) { xHelpPackage = xSubPkg; o_xParentPackageBundle = xPackage; @@ -1200,7 +1200,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP { const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xPackage->getPackageType(); OUString aMediaType = xPackageTypeInfo->getMediaType(); - if( aMediaType.equals( aHelpMediaType ) ) + if( aMediaType == aHelpMediaType ) xHelpPackage = xPackage; } } diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx index 84f0d74092c5..993666682aca 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx @@ -229,7 +229,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte for( int j = 0 ; j < nCount ; ++j ) { HitItem& rFindItem = aIndexFolderResultVector[ j ]; - if( rFindItem.m_aURL.equals( aItemCopy.m_aURL ) ) + if( rFindItem.m_aURL == aItemCopy.m_aURL ) { rFindItem.m_fScore += aItemCopy.m_fScore; break; diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx index abaabc83b04d..c0f0011ceb6d 100644 --- a/xmloff/source/chart/ColorPropertySet.cxx +++ b/xmloff/source/chart/ColorPropertySet.cxx @@ -63,14 +63,14 @@ Sequence< Property > SAL_CALL lcl_ColorPropertySetInfo::getProperties() Property SAL_CALL lcl_ColorPropertySetInfo::getPropertyByName( const OUString& aName ) { - if( aName.equals( m_aColorPropName )) + if( aName == m_aColorPropName ) return m_aColorProp; throw UnknownPropertyException( m_aColorPropName, static_cast< uno::XWeak * >( this )); } sal_Bool SAL_CALL lcl_ColorPropertySetInfo::hasPropertyByName( const OUString& Name ) { - return Name.equals( m_aColorPropName ); + return Name == m_aColorPropName; } } // anonymous namespace @@ -144,13 +144,13 @@ Sequence< PropertyState > SAL_CALL ColorPropertySet::getPropertyStates( const Se void SAL_CALL ColorPropertySet::setPropertyToDefault( const OUString& PropertyName ) { - if( PropertyName.equals( m_aColorPropName )) + if( PropertyName == m_aColorPropName ) m_nColor = m_nDefaultColor; } uno::Any SAL_CALL ColorPropertySet::getPropertyDefault( const OUString& aPropertyName ) { - if( aPropertyName.equals( m_aColorPropName )) + if( aPropertyName == m_aColorPropName ) return uno::makeAny( m_nDefaultColor ); return uno::Any(); } diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index aad2d6539569..92b53cafbc0d 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -289,7 +289,7 @@ public: return ( xProp.is() && (xProp->getPropertyValue( "Role" ) >>= aRole ) && - m_aRole.equals( aRole )); + m_aRole == aRole ); } private: @@ -939,7 +939,7 @@ bool lcl_exportDomainForThisSequence( const Reference< chart2::data::XDataSequen OUString aRange( lcl_ConvertRange( rValues->getSourceRangeRepresentation(), xNewDoc ) ); //work around error in OOo 2.0 (problems with multiple series having a domain element) - if( rFirstRangeForThisDomainIndex.isEmpty() || !aRange.equals(rFirstRangeForThisDomainIndex) ) + if( rFirstRangeForThisDomainIndex.isEmpty() || aRange != rFirstRangeForThisDomainIndex ) { rExport.AddAttribute( XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, aRange); SvXMLElementExport aDomain( rExport, XML_NAMESPACE_CHART, XML_DOMAIN, true, true ); @@ -2601,7 +2601,7 @@ void SchXMLExportHelper_Impl::exportSeries( if( xSeqProp.is()) xSeqProp->getPropertyValue("Role") >>= aRole; // "main" sequence - if( aRole.equals( aLabelRole )) + if( aRole == aLabelRole ) { xValuesSeq.set( xTempValueSeq ); xLabelSeq.set( aSeqCnt[nSeqIdx]->getLabel()); diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx index 8c44d3f65702..21f9864b0cea 100644 --- a/xmloff/source/chart/SchXMLImport.cxx +++ b/xmloff/source/chart/SchXMLImport.cxx @@ -70,7 +70,7 @@ public: bool operator () ( const Reference< chart2::XChartType > & xChartType ) const { return (xChartType.is() && - xChartType->getChartType().equals( m_aChartTypeName )); + xChartType->getChartType() == m_aChartTypeName ); } private: diff --git a/xmloff/source/chart/SchXMLParagraphContext.cxx b/xmloff/source/chart/SchXMLParagraphContext.cxx index 6637254f6a7b..5fa8ecf4b053 100644 --- a/xmloff/source/chart/SchXMLParagraphContext.cxx +++ b/xmloff/source/chart/SchXMLParagraphContext.cxx @@ -87,11 +87,11 @@ SvXMLImportContext* SchXMLParagraphContext::CreateChildContext( { if( nPrefix == XML_NAMESPACE_TEXT ) { - if( rLocalName.equals( ::xmloff::token::GetXMLToken( ::xmloff::token::XML_TAB_STOP ))) + if( rLocalName == ::xmloff::token::GetXMLToken( ::xmloff::token::XML_TAB_STOP )) { maBuffer.append( u'\x0009'); // tabulator } - else if( rLocalName.equals( ::xmloff::token::GetXMLToken( ::xmloff::token::XML_LINE_BREAK ))) + else if( rLocalName == ::xmloff::token::GetXMLToken( ::xmloff::token::XML_LINE_BREAK )) { maBuffer.append( u'\x000A'); // linefeed } diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index ba69c3a50456..74141afbc526 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -248,11 +248,11 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri break; case XML_TOK_PA_DS_HAS_LABELS: { - if( aValue.equals( ::xmloff::token::GetXMLToken( ::xmloff::token::XML_BOTH ))) + if( aValue == ::xmloff::token::GetXMLToken( ::xmloff::token::XML_BOTH )) mrColHasLabels = mrRowHasLabels = true; - else if( aValue.equals( ::xmloff::token::GetXMLToken( ::xmloff::token::XML_ROW ))) + else if( aValue == ::xmloff::token::GetXMLToken( ::xmloff::token::XML_ROW )) mrRowHasLabels = true; - else if( aValue.equals( ::xmloff::token::GetXMLToken( ::xmloff::token::XML_COLUMN ))) + else if( aValue == ::xmloff::token::GetXMLToken( ::xmloff::token::XML_COLUMN )) mrColHasLabels = true; } break; diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index a2e9069629b5..ee6a10c447f7 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -322,7 +322,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib sal_Int32 nNumOfAxes = mrAxes.size(); for( sal_Int32 nCurrent = 0; nCurrent < nNumOfAxes; nCurrent++ ) { - if( aValue.equals( mrAxes[ nCurrent ].aName ) && + if( aValue == mrAxes[ nCurrent ].aName && mrAxes[ nCurrent ].eDimension == SCH_XML_AXIS_Y ) { mpAttachedAxis = &( mrAxes[ nCurrent ] ); @@ -384,7 +384,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib } } if( ! mrGlobalChartTypeUsedBySeries ) - mrGlobalChartTypeUsedBySeries = (maSeriesChartTypeName.equals( maGlobalChartTypeName )); + mrGlobalChartTypeUsedBySeries = (maSeriesChartTypeName == maGlobalChartTypeName); sal_Int32 const nCoordinateSystemIndex = 0;//so far we can only import one coordinate system m_xSeries.set( SchXMLImportHelper::GetNewDataSeries( mxNewDoc, nCoordinateSystemIndex, maSeriesChartTypeName, ! mrGlobalChartTypeUsedBySeries )); @@ -811,7 +811,7 @@ void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDe if( !(iStyle->msStyleName).isEmpty()) { - if( ! rCurrStyleName.equals( iStyle->msStyleName )) + if( rCurrStyleName != iStyle->msStyleName ) { rCurrStyleName = iStyle->msStyleName; rpStyle = pStylesCtxt->FindStyleChildContext( @@ -975,7 +975,7 @@ void SchXMLSeries2Context::setStylesToStatisticsObjects( SeriesDefaultsAndStyles if( !(iStyle->msStyleName).isEmpty()) { - if( ! rCurrStyleName.equals( iStyle->msStyleName )) + if( rCurrStyleName != iStyle->msStyleName ) { rCurrStyleName = iStyle->msStyleName; rpStyle = pStylesCtxt->FindStyleChildContext( @@ -1058,7 +1058,7 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri if( bIsDonutChart ) { //set special series styles for donut charts first - if( !rCurrStyleName.equals( iStyle->msSeriesStyleNameForDonuts ) ) + if( rCurrStyleName != iStyle->msSeriesStyleNameForDonuts ) { rCurrStyleName = iStyle->msSeriesStyleNameForDonuts; rpStyle = pStylesCtxt->FindStyleChildContext( @@ -1083,7 +1083,7 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri { } - if( !rCurrStyleName.equals( iStyle->msStyleName ) ) + if( rCurrStyleName != iStyle->msStyleName ) { rCurrStyleName = iStyle->msStyleName; rpStyle = pStylesCtxt->FindStyleChildContext( diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx index 0d42dcebc3a9..32c7ee0ecad4 100644 --- a/xmloff/source/chart/SchXMLTableContext.cxx +++ b/xmloff/source/chart/SchXMLTableContext.cxx @@ -473,7 +473,7 @@ void SchXMLTableColumnContext::StartElement( const uno::Reference< xml::sax::XAt IsXMLToken( aLocalName, XML_VISIBILITY ) ) { OUString aVisibility = xAttrList->getValueByIndex( i ); - bHidden = aVisibility.equals( GetXMLToken( XML_COLLAPSE ) ); + bHidden = aVisibility == GetXMLToken( XML_COLLAPSE ); } } @@ -1039,7 +1039,7 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary( { aRange = xValues->getSourceRangeRepresentation(); sal_Int32 nIndex = aRange.toInt32(); - if( nIndex!=0 || !aRange.equals(lcl_aCategoriesRange) ) + if( nIndex!=0 || aRange != lcl_aCategoriesRange ) aUsageMap[nIndex] = true; } Reference< chart2::data::XDataSequence > xLabel( xLabeledSequence->getLabel() ); diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index b301a1ed7961..13ef728160d2 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -546,7 +546,7 @@ uno::Any getPropertyFromContext( const OUString& rPropertyName, const XMLPropSty if( nIdx == -1 ) continue; OUString aPropName = rMapper->GetEntryAPIName( nIdx ); - if(rPropertyName.equals(aPropName)) + if(rPropertyName == aPropName) return aPropIter->maValue; } return aRet; diff --git a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx index 2f876e9dc8c5..6508031bad93 100644 --- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx +++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx @@ -46,7 +46,7 @@ bool XMLAxisPositionPropertyHdl::importXML( const OUString& rStrImpValue, { bool bResult = false; - if( rStrImpValue.equals( GetXMLToken(XML_START) ) ) + if( rStrImpValue == GetXMLToken(XML_START) ) { if( !m_bCrossingValue ) { @@ -54,7 +54,7 @@ bool XMLAxisPositionPropertyHdl::importXML( const OUString& rStrImpValue, bResult = true; } } - else if( rStrImpValue.equals( GetXMLToken(XML_END) ) ) + else if( rStrImpValue == GetXMLToken(XML_END) ) { if( !m_bCrossingValue ) { @@ -62,7 +62,7 @@ bool XMLAxisPositionPropertyHdl::importXML( const OUString& rStrImpValue, bResult = true; } } - else if( rStrImpValue.equals( GetXMLToken(XML_0) ) ) + else if( rStrImpValue == GetXMLToken(XML_0) ) { if( !m_bCrossingValue ) { diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx index 3edd65c43090..e20363ee67ab 100644 --- a/xmloff/source/core/nmspmap.cxx +++ b/xmloff/source/core/nmspmap.cxx @@ -462,7 +462,7 @@ bool SvXMLNamespaceMap::NormalizeW3URI( OUString& rName ) { const OUString& sURISuffix = GetXMLToken( XML_URI_XFORMS_SUFFIX ); sal_Int32 nCompareFrom = rName.getLength() - sURISuffix.getLength(); - if( rName.copy( nCompareFrom ).equals( sURISuffix ) ) + if( rName.copy( nCompareFrom ) == sURISuffix ) { // found W3 prefix, and xforms suffix rName = GetXMLToken( XML_N_XFORMS_1_0 ); diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index c331d833a72c..89fe990f6d11 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -2379,7 +2379,7 @@ SvXMLExport::AddAttributeXmlId(uno::Reference<uno::XInterface> const & i_xIfc) const OUString streamName = mpImpl->mStreamName; if ( !streamName.isEmpty() ) { - if ( streamName.equals(mdref.First) ) + if ( streamName == mdref.First ) { AddAttribute( XML_NAMESPACE_XML, XML_ID, mdref.Second ); } diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 91e2a97148a3..16fcb5791baf 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -1695,7 +1695,7 @@ bool SvXMLImport::IsODFVersionConsistent( const OUString& aODFVersion ) // This workaround is not nice, but I see no other way to handle it, since there are // ODF1.2 documents without version in manifest.xml if ( !aStorVersion.isEmpty() ) - bResult = aODFVersion.equals( aStorVersion ); + bResult = aODFVersion == aStorVersion; else xStorProps->setPropertyValue( "Version", uno::makeAny( aODFVersion ) ); diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 44926530d47a..3172188a747b 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -1357,7 +1357,7 @@ ImpXMLEXPPageMasterInfo* SdXMLExport::ImpGetPageMasterInfoByName(const OUString& { if(pInfo) { - if(!pInfo->GetMasterPageName().isEmpty() && rName.equals(pInfo->GetMasterPageName())) + if(!pInfo->GetMasterPageName().isEmpty() && rName == pInfo->GetMasterPageName()) { return pInfo; } diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 947c4d9bb42f..e49451f686e8 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -1126,12 +1126,12 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x OUString sCLSID; if(xPropSet->getPropertyValue("CLSID") >>= sCLSID) { - if (sCLSID.equals(mrExport.GetChartExport()->getChartCLSID()) || - sCLSID.equals( SvGlobalName( SO3_RPTCH_CLASSID ).GetHexName() )) + if (sCLSID == mrExport.GetChartExport()->getChartCLSID() || + sCLSID == SvGlobalName( SO3_RPTCH_CLASSID ).GetHexName() ) { eShapeType = XmlShapeTypeDrawChartShape; } - else if (sCLSID.equals( SvGlobalName( SO3_SC_CLASSID ).GetHexName() )) + else if (sCLSID == SvGlobalName( SO3_SC_CLASSID ).GetHexName() ) { eShapeType = XmlShapeTypeDrawSheetShape; } @@ -1177,7 +1177,7 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x OUString sCLSID; if(xPropSet->getPropertyValue("CLSID") >>= sCLSID) { - if( sCLSID.equals( SvGlobalName( SO3_SC_CLASSID ).GetHexName() ) ) + if( sCLSID == SvGlobalName( SO3_SC_CLASSID ).GetHexName() ) { eShapeType = XmlShapeTypePresSheetShape; } diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx index 920d287bb7a5..f6be2889a974 100644 --- a/xmloff/source/draw/ximpbody.cxx +++ b/xmloff/source/draw/ximpbody.cxx @@ -168,7 +168,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport, { OUString sMasterPageName = xMasterNamed->getName(); - if(!sMasterPageName.isEmpty() && sMasterPageName.equals(sDisplayName)) + if(!sMasterPageName.isEmpty() && sMasterPageName == sDisplayName) { xDrawPage->setMasterPage(xMasterPage); bDone = true; diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx index d655520c6bea..c0c10e0247a8 100644 --- a/xmloff/source/meta/xmlmetae.cxx +++ b/xmloff/source/meta/xmlmetae.cxx @@ -375,7 +375,7 @@ SvXMLMetaExport::startElement(const OUString & i_rName, const SvXMLNamespaceMap & rNsMap(mrExport.GetNamespaceMap()); for (sal_uInt16 key = rNsMap.GetFirstKey(); key != USHRT_MAX; key = rNsMap.GetNextKey(key)) { - if (name.equals(rNsMap.GetAttrNameByKey(key))) { + if (name == rNsMap.GetAttrNameByKey(key)) { found = true; break; } @@ -401,7 +401,7 @@ SvXMLMetaExport::startElement(const OUString & i_rName, const sal_Int16 nCount = i_xAttribs->getLength(); for (sal_Int16 i = 0; i < nCount; ++i) { const OUString name(i_xAttribs->getNameByIndex(i)); - if (ns.equals(name)) { + if (ns == name) { found = true; break; } diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx index 0bc2297e05db..19d23e47f2ac 100644 --- a/xmloff/source/script/XMLEventExport.cxx +++ b/xmloff/source/script/XMLEventExport.cxx @@ -204,7 +204,7 @@ void XMLEventExport::ExportEvent( for(sal_Int32 nVal = 0; nVal < nValues; nVal++) { - if (sEventType.equals(pValues[nVal].Name)) + if (sEventType == pValues[nVal].Name) { // found! Now find handler and delegate OUString sType; diff --git a/xmloff/source/script/XMLScriptExportHandler.cxx b/xmloff/source/script/XMLScriptExportHandler.cxx index ab43ab281356..5e6ca3196aa6 100644 --- a/xmloff/source/script/XMLScriptExportHandler.cxx +++ b/xmloff/source/script/XMLScriptExportHandler.cxx @@ -56,7 +56,7 @@ void XMLScriptExportHandler::Export( sal_Int32 nCount = rValues.getLength(); for(sal_Int32 i = 0; i < nCount; i++) { - if (sURL.equals(rValues[i].Name)) + if (sURL == rValues[i].Name) { OUString sTmp; rValues[i].Value >>= sTmp; diff --git a/xmloff/source/script/XMLStarBasicExportHandler.cxx b/xmloff/source/script/XMLStarBasicExportHandler.cxx index 3e18bbd40128..d0c05bfa846d 100644 --- a/xmloff/source/script/XMLStarBasicExportHandler.cxx +++ b/xmloff/source/script/XMLStarBasicExportHandler.cxx @@ -60,7 +60,7 @@ void XMLStarBasicExportHandler::Export( sal_Int32 nCount = rValues.getLength(); for(sal_Int32 i = 0; i < nCount; i++) { - if (sLibrary.equals(rValues[i].Name)) + if (sLibrary == rValues[i].Name) { OUString sTmp; rValues[i].Value >>= sTmp; @@ -69,7 +69,7 @@ void XMLStarBasicExportHandler::Export( sTmp.equalsIgnoreAsciiCase(sStarOffice) ) ? XML_APPLICATION : XML_DOCUMENT ); } - else if (sMacroName.equals(rValues[i].Name)) + else if (sMacroName == rValues[i].Name) { rValues[i].Value >>= sName; } diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index 3e9571195719..d11b5ed37fef 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -238,7 +238,7 @@ const uno::Sequence<OUString>& FilterPropertiesInfo_Impl::GetApiNames() while ( aCurrent != aEnd ) { // equal to next element? - if ( aOld->GetApiName().equals( aCurrent->GetApiName() ) ) + if ( aOld->GetApiName() == aCurrent->GetApiName() ) { // if equal: merge index lists aOld->GetIndexes().merge( aCurrent->GetIndexes() ); diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 6f4ba5d86949..f6f1574e0136 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -1117,7 +1117,7 @@ void SvXMLNumFmtElementContext::EndElement() { case XML_TOK_STYLE_TEXT: if ( rParent.HasLongDoW() && - aContent.toString().equals(rParent.GetLocaleData().getLongDateDayOfWeekSep()) ) + aContent.toString() == rParent.GetLocaleData().getLongDateDayOfWeekSep() ) { // skip separator constant after long day of week // (NF_KEY_NNNN contains the separator) diff --git a/xmloff/source/style/xmlprmap.cxx b/xmloff/source/style/xmlprmap.cxx index a287408f00d2..634e50afcf7f 100644 --- a/xmloff/source/style/xmlprmap.cxx +++ b/xmloff/source/style/xmlprmap.cxx @@ -303,7 +303,7 @@ sal_Int32 XMLPropertySetMapper::FindEntryIndex( { const XMLPropertySetMapperEntry_Impl& rEntry = mpImpl->maMapEntries[nIndex]; if( rEntry.nXMLNameSpace == nNameSpace && - rEntry.sXMLAttributeName.equals( sXMLName ) && + rEntry.sXMLAttributeName == sXMLName && rEntry.sAPIPropertyName.equalsAscii( sApiName ) ) return nIndex; else diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx index b0b6cce5817a..7bd55721731d 100644 --- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx @@ -227,7 +227,7 @@ void XMLIndexBibliographyConfigurationContext::CreateAndInsert(bool) sal_Int32 nServiceCount(aServices.getLength()); while (i < nServiceCount && !bFound) { - if (aServices[i].equals(sFieldMaster_Bibliography)) + if (aServices[i] == sFieldMaster_Bibliography) // here we should use a method which compares in reverse order if available bFound = true; else diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 0bc0c9617473..8bd34398caea 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -2708,7 +2708,7 @@ void XMLTextImportHelper::ConnectFrameChains( { for(std::vector<OUString>::iterator i = m_xImpl->m_xPrevFrmNames->begin(), j = m_xImpl->m_xNextFrmNames->begin(); i != m_xImpl->m_xPrevFrmNames->end() && j != m_xImpl->m_xNextFrmNames->end(); ++i, ++j) { - if((*j).equals(rFrmName)) + if((*j) == rFrmName) { // The previous frame must exist, because it existing than // inserting the entry diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index fabf67802046..05cb915e31c9 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -2158,12 +2158,12 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( OUString sType; xPropSet->getPropertyValue(sTextPortionType) >>= sType; - if( sType.equals(sText)) + if( sType == sText) { exportTextRange( xTxtRange, bAutoStyles, rPrevCharIsSpace, openFieldMark); } - else if( sType.equals(sTextField)) + else if( sType == sTextField) { exportTextField(xTxtRange, bAutoStyles, bIsProgress, &rPrevCharIsSpace); } @@ -2184,7 +2184,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_OFFICE, XML_ANNOTATION_END, false, false ); } } - else if( sType.equals( sFrame ) ) + else if( sType == sFrame ) { Reference < XEnumeration> xContentEnum; Reference < XContentEnumerationAccess > xCEA( xTxtRange, @@ -2201,36 +2201,36 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( &xPropSet ); } - else if (sType.equals(sFootnote)) + else if (sType == sFootnote) { exportTextFootnote(xPropSet, xTxtRange->getString(), bAutoStyles, bIsProgress ); } - else if (sType.equals(sBookmark)) + else if (sType == sBookmark) { exportTextMark(xPropSet, sBookmark, lcl_XmlBookmarkElements, bAutoStyles); } - else if (sType.equals(sReferenceMark)) + else if (sType == sReferenceMark) { exportTextMark(xPropSet, sReferenceMark, lcl_XmlReferenceElements, bAutoStyles); } - else if (sType.equals(sDocumentIndexMark)) + else if (sType == sDocumentIndexMark) { pIndexMarkExport->ExportIndexMark(xPropSet, bAutoStyles); } - else if (sType.equals(sRedline)) + else if (sType == sRedline) { if (nullptr != pRedlineExport) pRedlineExport->ExportChange(xPropSet, bAutoStyles); } - else if (sType.equals(sRuby)) + else if (sType == sRuby) { exportRuby(xPropSet, bAutoStyles); } @@ -2238,7 +2238,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( { exportMeta(xPropSet, bAutoStyles, bIsProgress, rPrevCharIsSpace); } - else if (sType.equals(sTextFieldStart)) + else if (sType == sTextFieldStart) { Reference< css::text::XFormField > xFormField(xPropSet->getPropertyValue(sBookmark), UNO_QUERY); @@ -2305,7 +2305,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( } } } - else if (sType.equals(sTextFieldEnd)) + else if (sType == sTextFieldEnd) { if (!bAutoStyles) { @@ -2343,7 +2343,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( } } } - else if (sType.equals(sTextFieldStartEnd)) + else if (sType == sTextFieldStartEnd) { if (!bAutoStyles) { @@ -2379,7 +2379,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( } } } - else if (sType.equals(sSoftPageBreak)) + else if (sType == sSoftPageBreak) { exportSoftPageBreak(); } diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index 6f1b920fd7af..433c148e61dd 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -278,7 +278,7 @@ XMLEndReferenceContext_Impl::XMLEndReferenceContext_Impl( { XMLHint_Impl *const pHint = rHints.GetHints()[nPos].get(); if ( pHint->IsReference() && - sName.equals( static_cast<XMLReferenceHint_Impl *>(pHint)->GetRefName()) ) + sName == static_cast<XMLReferenceHint_Impl *>(pHint)->GetRefName() ) { // set end and stop searching pHint->SetEnd(GetImport().GetTextImport()-> @@ -1102,8 +1102,7 @@ void XMLIndexMarkImportContext_Impl::StartElement( { XMLHint_Impl *const pHint = m_rHints.GetHints()[nPos].get(); if ( pHint->IsIndexMark() && - sID.equals( - static_cast<XMLIndexMarkHint_Impl *>(pHint)->GetID()) ) + sID == static_cast<XMLIndexMarkHint_Impl *>(pHint)->GetID() ) { // set end and stop searching pHint->SetEnd(xPos); diff --git a/xmloff/source/transform/DlgOASISTContext.cxx b/xmloff/source/transform/DlgOASISTContext.cxx index 0397c3746cb7..31e9400c9bfc 100644 --- a/xmloff/source/transform/DlgOASISTContext.cxx +++ b/xmloff/source/transform/DlgOASISTContext.cxx @@ -77,9 +77,9 @@ void XMLDlgOASISTransformerContext::StartElement( { case XML_ATACTION_DLG_BORDER: { - if ( !rAttrValue.equals( GetXMLToken( XML_NONE ) ) && - !rAttrValue.equals( GetXMLToken( XML_SIMPLE ) ) && - !rAttrValue.equals( GetXMLToken( XML_3D ) ) ) + if ( rAttrValue != GetXMLToken( XML_NONE ) && + rAttrValue != GetXMLToken( XML_SIMPLE ) && + rAttrValue != GetXMLToken( XML_3D ) ) { pMutableAttrList->SetValueByIndex( i, GetXMLToken( XML_NONE ) ); diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx index 94a97ac8c508..6b7288de37c5 100644 --- a/xmlscript/source/xml_helper/xml_impctx.cxx +++ b/xmlscript/source/xml_helper/xml_impctx.cxx @@ -632,7 +632,7 @@ sal_Int32 ExtendedAttributes::getIndexByQName( OUString const & rQName ) { for ( sal_Int32 nPos = m_nAttributes; nPos--; ) { - if (m_pQNames[ nPos ].equals( rQName )) + if (m_pQNames[ nPos ] == rQName) { return nPos; } diff --git a/xmlsecurity/source/component/certificatecontainer.cxx b/xmlsecurity/source/component/certificatecontainer.cxx index 0635fd702849..4d35c9b9404b 100644 --- a/xmlsecurity/source/component/certificatecontainer.cxx +++ b/xmlsecurity/source/component/certificatecontainer.cxx @@ -35,7 +35,7 @@ CertificateContainer::searchMap( const OUString & url, const OUString & certific while( p != _certMap.end() ) { - ret = (*p).second.equals(certificate_name); + ret = (*p).second == certificate_name; if( ret ) break; ++p; diff --git a/xmlsecurity/source/component/registerservices.cxx b/xmlsecurity/source/component/registerservices.cxx index 674979b68c82..24de5116abc9 100644 --- a/xmlsecurity/source/component/registerservices.cxx +++ b/xmlsecurity/source/component/registerservices.cxx @@ -38,7 +38,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL xmlsecurity_component_getFactory( const sal_ //Decryptor OUString implName = OUString::createFromAscii( pImplName ); - if ( pServiceManager && implName.equals( DocumentDigitalSignatures::GetImplementationName() ) ) + if ( pServiceManager && implName == DocumentDigitalSignatures::GetImplementationName() ) { // DocumentDigitalSignatures xFactory = cppu::createSingleComponentFactory( @@ -46,7 +46,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL xmlsecurity_component_getFactory( const sal_ OUString::createFromAscii( pImplName ), DocumentDigitalSignatures::GetSupportedServiceNames() ); } - else if ( pServiceManager && implName.equals( CertificateContainer::impl_getStaticImplementationName() )) + else if ( pServiceManager && implName == CertificateContainer::impl_getStaticImplementationName() ) { // CertificateContainer xFactory = cppu::createOneInstanceFactory( diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx index cb8d3e239cd7..5b04868e52a1 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.cxx +++ b/xmlsecurity/source/dialogs/resourcemanager.cxx @@ -324,7 +324,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString) typedef vector< pair < OUString, OUString > >::const_iterator CIT; for (CIT idn = vecAttrValueOfDN.begin(); idn != vecAttrValueOfDN.end(); ++idn) { - if (idn->first.equals(sPartId)) + if (idn->first == sPartId) { retVal = idn->second; break; diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx index 1eecea496128..a9515c18a9e5 100644 --- a/xmlsecurity/source/helper/documentsignaturehelper.cxx +++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx @@ -112,8 +112,8 @@ void ImplFillElementList( if ( rxStore->isStreamElement( pNames[n] ) ) { //Exclude documentsignatures.xml! - if (pNames[n].equals( - DocumentSignatureHelper::GetDocumentContentSignatureDefaultStreamName())) + if (pNames[n] == + DocumentSignatureHelper::GetDocumentContentSignatureDefaultStreamName()) continue; OUString aFullName( rRootStorageName + sEncName ); rList.push_back(aFullName); @@ -459,7 +459,7 @@ bool DocumentSignatureHelper::checkIfAllFilesAreSigned( sElementListURI, rtl_UriCharClassPchar, rtl_UriEncodeCheckEscapes, RTL_TEXTENCODING_UTF8); } - if (sElementListURI.equals(sReferenceURI)) + if (sElementListURI == sReferenceURI) { nRealCount++; break; @@ -508,7 +508,7 @@ bool DocumentSignatureHelper::equalsReferenceUriManifestPath( //Decode the uri segment, so that %20 becomes ' ', etc. OUString sDecUri = ::rtl::Uri::decode( *i, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8); - if (!sDecUri.equals(*j)) + if (sDecUri != *j) { retVal = false; break; diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx b/xmlsecurity/source/helper/documentsignaturemanager.cxx index 12e76685c8d2..f39fe39a68b2 100644 --- a/xmlsecurity/source/helper/documentsignaturemanager.cxx +++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx @@ -141,11 +141,11 @@ bool DocumentSignatureManager::isXML(const OUString& rURI) { const beans::PropertyValue& prop = entry[j]; - if (prop.Name.equals(sPropFullPath)) + if (prop.Name == sPropFullPath) prop.Value >>= sPath; - else if (prop.Name.equals(sPropMediaType)) + else if (prop.Name == sPropMediaType) prop.Value >>= sMediaType; - else if (prop.Name.equals(sPropDigest)) + else if (prop.Name == sPropDigest) bEncrypted = true; } if (DocumentSignatureHelper::equalsReferenceUriManifestPath(rURI, sPath)) |