diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2019-07-30 17:43:11 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2019-07-31 12:51:43 +0200 |
commit | d55e9567b5e0f5fa0499ccfabee6b756dff0ad7e (patch) | |
tree | abe7ead5aef1dc721a079d809f987d05b84ea046 /xmlsecurity/source/helper | |
parent | 634844354ee6ed884128086a80c3ee32c889d8c9 (diff) |
Improved loplugin:stringconstant (now that GCC 7 supports it): xmlsecurity
Change-Id: I47c93247b9a34abf4b95966833664e63eb57f133
Reviewed-on: https://gerrit.libreoffice.org/76621
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'xmlsecurity/source/helper')
-rw-r--r-- | xmlsecurity/source/helper/documentsignaturehelper.cxx | 6 | ||||
-rw-r--r-- | xmlsecurity/source/helper/xsecctl.cxx | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx index 6e173afdebff..ee5fb4989ec1 100644 --- a/xmlsecurity/source/helper/documentsignaturehelper.cxx +++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx @@ -470,17 +470,17 @@ bool DocumentSignatureHelper::equalsReferenceUriManifestPath( OUString DocumentSignatureHelper::GetDocumentContentSignatureDefaultStreamName() { - return OUString("documentsignatures.xml"); + return "documentsignatures.xml"; } OUString DocumentSignatureHelper::GetScriptingContentSignatureDefaultStreamName() { - return OUString("macrosignatures.xml"); + return "macrosignatures.xml"; } OUString DocumentSignatureHelper::GetPackageSignatureDefaultStreamName() { - return OUString("packagesignatures.xml"); + return "packagesignatures.xml"; } void DocumentSignatureHelper::writeDigestMethod( diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx index 83396b5e7312..6dbd44b091be 100644 --- a/xmlsecurity/source/helper/xsecctl.cxx +++ b/xmlsecurity/source/helper/xsecctl.cxx @@ -54,13 +54,13 @@ OUString getDigestURI(sal_Int32 nID) switch( nID ) { case cssxc::DigestID::SHA1: - return OUString(ALGO_XMLDSIGSHA1); + return ALGO_XMLDSIGSHA1; case cssxc::DigestID::SHA256: - return OUString(ALGO_XMLDSIGSHA256); + return ALGO_XMLDSIGSHA256; case cssxc::DigestID::SHA512: - return OUString(ALGO_XMLDSIGSHA512); + return ALGO_XMLDSIGSHA512; default: - return OUString(ALGO_XMLDSIGSHA1); + return ALGO_XMLDSIGSHA1; } } OUString getSignatureURI(svl::crypto::SignatureMethodAlgorithm eAlgorithm, sal_Int32 nDigestID) @@ -91,13 +91,13 @@ OUString getSignatureURI(svl::crypto::SignatureMethodAlgorithm eAlgorithm, sal_I switch (nDigestID) { case cssxc::DigestID::SHA1: - return OUString(ALGO_RSASHA1); + return ALGO_RSASHA1; case cssxc::DigestID::SHA256: - return OUString(ALGO_RSASHA256); + return ALGO_RSASHA256; case cssxc::DigestID::SHA512: - return OUString(ALGO_RSASHA512); + return ALGO_RSASHA512; default: - return OUString(ALGO_RSASHA1); + return ALGO_RSASHA1; } } } |