From d55e9567b5e0f5fa0499ccfabee6b756dff0ad7e Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 30 Jul 2019 17:43:11 +0200 Subject: 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 --- xmlsecurity/source/helper/documentsignaturehelper.cxx | 6 +++--- xmlsecurity/source/helper/xsecctl.cxx | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'xmlsecurity/source/helper') 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; } } } -- cgit