diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-14 09:25:41 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-14 10:19:27 +0200 |
commit | 6af025501db1f25397bdbf1fdd6b71da4debcac4 (patch) | |
tree | 19f627e7ed7da45efa4c5bbf6bad8ed148fd6551 /svtools | |
parent | 8e39ef66928a3e37c618d3a70a631e71266db274 (diff) |
use more OUString::operator== in sfx2..svtools
Change-Id: I859b77319f551eabd19dae54bd69c212221112a8
Reviewed-on: https://gerrit.libreoffice.org/39938
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/contnr/contentenumeration.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/inettbc.cxx | 2 | ||||
-rw-r--r-- | svtools/source/dialogs/ServerDetailsControls.cxx | 2 | ||||
-rw-r--r-- | svtools/source/dialogs/colrdlg.cxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/langtab.cxx | 2 | ||||
-rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 2 | ||||
-rw-r--r-- | svtools/source/table/cellvalueconversion.cxx | 12 |
7 files changed, 12 insertions, 12 deletions
diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx index 9f477e4643a8..10d8deb6e119 100644 --- a/svtools/source/contnr/contentenumeration.cxx +++ b/svtools/source/contnr/contentenumeration.cxx @@ -345,7 +345,7 @@ namespace svt for (int i = 0; i < m_rBlackList.getLength() ; i++) { - if ( entryName.equals( m_rBlackList[i] ) ) + if ( entryName == m_rBlackList[i] ) return true; } diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 2e0cb2b79c23..ce4b42629f09 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -1148,7 +1148,7 @@ OUString SvtURLBox::GetURL() // try to get the right case preserving URL from the list of URLs for(std::vector<OUString>::iterator i = pImpl->aCompletions.begin(), j = pImpl->aURLs.begin(); i != pImpl->aCompletions.end() && j != pImpl->aURLs.end(); ++i, ++j) { - if((*i).equals(aText)) + if((*i) == aText) return *j; } diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index 06db0c0136c0..f83b3c2032c7 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -146,7 +146,7 @@ bool HostDetailsContainer::setUrl( const INetURLObject& rUrl ) bool HostDetailsContainer::verifyScheme( const OUString& sScheme ) { - return sScheme.equals( m_sScheme + "://" ); + return sScheme == ( m_sScheme + "://" ); } DavDetailsContainer::DavDetailsContainer( VclBuilderContainer* pBuilder ) : diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx index fb315dc7ea18..be1ceb111af6 100644 --- a/svtools/source/dialogs/colrdlg.cxx +++ b/svtools/source/dialogs/colrdlg.cxx @@ -87,7 +87,7 @@ short SvColorDialog::Execute() props = xPropertyAccess->getPropertyValues(); for( sal_Int32 n = 0; n < props.getLength(); n++ ) { - if( props[n].Name.equals( sColor ) ) + if( props[n].Name == sColor ) { sal_Int32 nColor = 0; if( props[n].Value >>= nColor ) diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index 49fb5bbd9826..d22880d72246 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -222,7 +222,7 @@ LanguageType SvtLanguageTableImpl::GetType( const OUString& rStr ) const for ( sal_uInt32 i = 0; i < nCount; ++i ) { - if (ResStringArray::GetString( i ).equals(rStr)) + if (ResStringArray::GetString( i ) == rStr) { eType = LanguageType( GetValue( i ) ); break; diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 1a753bcecb8e..83769a80c68e 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -825,7 +825,7 @@ HtmlTokenId HTMLParser::GetNextRawToken() bDone = bOffState && ( bReadScript ? aTok == OOO_STRING_SVTOOLS_HTML_script - : aTok.equals(aEndToken) ); + : aTok == aEndToken ); } } if( bReadComment && '>'==nNextCh && aTok.endsWith( "--" ) ) diff --git a/svtools/source/table/cellvalueconversion.cxx b/svtools/source/table/cellvalueconversion.cxx index 8c6141a369eb..a3c1d12062e0 100644 --- a/svtools/source/table/cellvalueconversion.cxx +++ b/svtools/source/table/cellvalueconversion.cxx @@ -337,24 +337,24 @@ namespace svt OUString const sTypeName( i_valueType.getTypeName() ); TypeClass const eTypeClass = i_valueType.getTypeClass(); - if ( sTypeName.equals( ::cppu::UnoType< DateTime >::get().getTypeName() ) ) + if ( sTypeName == ::cppu::UnoType< DateTime >::get().getTypeName() ) { o_formatter.reset( new DateTimeNormalization( io_data.xNumberFormatter ) ); } - else if ( sTypeName.equals( ::cppu::UnoType< css::util::Date >::get().getTypeName() ) ) + else if ( sTypeName == ::cppu::UnoType< css::util::Date >::get().getTypeName() ) { o_formatter.reset( new DateNormalization( io_data.xNumberFormatter ) ); } - else if ( sTypeName.equals( ::cppu::UnoType< css::util::Time >::get().getTypeName() ) ) + else if ( sTypeName == ::cppu::UnoType< css::util::Time >::get().getTypeName() ) { o_formatter.reset( new TimeNormalization( io_data.xNumberFormatter ) ); } - else if ( sTypeName.equals( ::cppu::UnoType< sal_Bool >::get().getTypeName() ) ) + else if ( sTypeName == ::cppu::UnoType< sal_Bool >::get().getTypeName() ) { o_formatter.reset( new BooleanNormalization( io_data.xNumberFormatter ) ); } - else if ( sTypeName.equals( ::cppu::UnoType< double >::get().getTypeName() ) - || sTypeName.equals( ::cppu::UnoType< float >::get().getTypeName() ) + else if ( sTypeName == ::cppu::UnoType< double >::get().getTypeName() + || sTypeName == ::cppu::UnoType< float >::get().getTypeName() ) { o_formatter.reset( new DoubleNormalization( io_data.xNumberFormatter ) ); |