diff options
| author | Arkadiy Illarionov <qarkai@gmail.com> | 2018-06-12 20:34:41 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2018-06-15 16:24:54 +0200 |
| commit | 1774599479c1b89ac048183c95e1ba9076dfe609 (patch) | |
| tree | 3a5ae0d89258d19fba96e420cf6d561cb1755522 /xmlsecurity | |
| parent | 434c730a889685ecf2df068dcf2db65124f9b8d6 (diff) | |
tdf#96099 Remove some trivial std::vector iterator typedefs
Change-Id: Iced10ed59c475dff4d33ff06151b2015a27a860b
Reviewed-on: https://gerrit.libreoffice.org/55715
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/helper/documentsignaturehelper.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx index 8bb06b84e92a..c6ee555e0068 100644 --- a/xmlsecurity/source/helper/documentsignaturehelper.cxx +++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx @@ -142,9 +142,8 @@ bool DocumentSignatureHelper::isODFPre_1_2(const OUString & sVersion) bool DocumentSignatureHelper::isOOo3_2_Signature(const SignatureInformation & sigInfo) { bool bOOo3_2 = false; - typedef ::std::vector< SignatureReferenceInformation >::const_iterator CIT; - for (CIT i = sigInfo.vSignatureReferenceInfors.begin(); - i < sigInfo.vSignatureReferenceInfors.end(); ++i) + for (auto i = sigInfo.vSignatureReferenceInfors.cbegin(); + i < sigInfo.vSignatureReferenceInfors.cend(); ++i) { if (i->ouURI == "META-INF/manifest.xml") { @@ -450,8 +449,7 @@ bool DocumentSignatureHelper::checkIfAllFilesAreSigned( } //find the file in the element list - typedef ::std::vector< OUString >::const_iterator CIT; - for (CIT aIter = sElementList.begin(); aIter != sElementList.end(); ++aIter) + for (auto aIter = sElementList.cbegin(); aIter != sElementList.cend(); ++aIter) { OUString sElementListURI = *aIter; if (alg == DocumentSignatureAlgorithm::OOo2) @@ -503,9 +501,8 @@ bool DocumentSignatureHelper::equalsReferenceUriManifestPath( if (vUriSegments.size() == vPathSegments.size()) { retVal = true; - typedef std::vector<OUString>::const_iterator CIT; - for (CIT i = vUriSegments.begin(), j = vPathSegments.begin(); - i != vUriSegments.end(); ++i, ++j) + for (auto i = vUriSegments.cbegin(), j = vPathSegments.cbegin(); + i != vUriSegments.cend(); ++i, ++j) { //Decode the uri segment, so that %20 becomes ' ', etc. OUString sDecUri = ::rtl::Uri::decode( |