diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-07 12:14:59 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-14 12:39:20 +0200 |
commit | daf177f703081d7afaa9b1701cf187c9a3e93ee5 (patch) | |
tree | 32e5bc14b5707777795ac26089c402cc3e93c2e3 /xmlsecurity | |
parent | 3ef7e85deb7afde6c9453c30be0a7893528a90a1 (diff) |
use more OUString::operator== in test..xmlsecurity
Change-Id: If5bdd1532be44a47ff7cc3b769be3ea585aea562
Reviewed-on: https://gerrit.libreoffice.org/39685
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmlsecurity')
5 files changed, 11 insertions, 11 deletions
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)) |