diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-05-15 13:12:42 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-05-15 18:03:51 +0200 |
commit | 6e267990695548db227c918679b907c60263cb81 (patch) | |
tree | 96bca33746fe1a26a348a35c74a1dee8977c349d /xmlsecurity/source/component | |
parent | 11bfced0a4f1d5f3ccaf8e1c87c11733ca71f29d (diff) |
loplugin:ostr in xmlsecurity
Change-Id: Ifb936c230f68447b3bb5993705adb5e5b790371f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167668
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
Diffstat (limited to 'xmlsecurity/source/component')
-rw-r--r-- | xmlsecurity/source/component/certificatecontainer.cxx | 4 | ||||
-rw-r--r-- | xmlsecurity/source/component/documentdigitalsignatures.cxx | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/xmlsecurity/source/component/certificatecontainer.cxx b/xmlsecurity/source/component/certificatecontainer.cxx index e230c7b2ce83..a5842bf5eaa9 100644 --- a/xmlsecurity/source/component/certificatecontainer.cxx +++ b/xmlsecurity/source/component/certificatecontainer.cxx @@ -126,7 +126,7 @@ CertificateContainer::hasCertificate( const OUString & url, const OUString & cer OUString SAL_CALL CertificateContainer::getImplementationName( ) { - return "com.sun.star.security.CertificateContainer"; + return u"com.sun.star.security.CertificateContainer"_ustr; } sal_Bool SAL_CALL @@ -138,7 +138,7 @@ CertificateContainer::supportsService( const OUString& ServiceName ) Sequence< OUString > SAL_CALL CertificateContainer::getSupportedServiceNames( ) { - return { "com.sun.star.security.CertificateContainer" }; + return { u"com.sun.star.security.CertificateContainer"_ustr }; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index c0f9a58b14f7..3833a76e81e5 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -228,7 +228,7 @@ void DocumentDigitalSignatures::initialize( const Sequence< Any >& aArguments) { if (aArguments.getLength() > 2) throw css::lang::IllegalArgumentException( - "DocumentDigitalSignatures::initialize requires zero, one, or two arguments", + u"DocumentDigitalSignatures::initialize requires zero, one, or two arguments"_ustr, static_cast<XInitialization*>(this), 0); m_nArgumentsCount = aArguments.getLength(); @@ -238,13 +238,13 @@ void DocumentDigitalSignatures::initialize( const Sequence< Any >& aArguments) if (!(aArguments[0] >>= m_sODFVersion)) throw css::lang::IllegalArgumentException( - "DocumentDigitalSignatures::initialize: the first arguments must be a string", + u"DocumentDigitalSignatures::initialize: the first arguments must be a string"_ustr, static_cast<XInitialization*>(this), 0); if (aArguments.getLength() == 2 && !(aArguments[1] >>= m_bHasDocumentSignature)) throw css::lang::IllegalArgumentException( - "DocumentDigitalSignatures::initialize: the second arguments must be a bool", + u"DocumentDigitalSignatures::initialize: the second arguments must be a bool"_ustr, static_cast<XInitialization*>(this), 1); //the Version is supported as of ODF1.2, so for and 1.1 document or older we will receive the @@ -256,7 +256,7 @@ void DocumentDigitalSignatures::initialize( const Sequence< Any >& aArguments) OUString DocumentDigitalSignatures::getImplementationName() { - return "com.sun.star.security.DocumentDigitalSignatures"; + return u"com.sun.star.security.DocumentDigitalSignatures"_ustr; } sal_Bool DocumentDigitalSignatures::supportsService( @@ -268,7 +268,7 @@ sal_Bool DocumentDigitalSignatures::supportsService( css::uno::Sequence<OUString> DocumentDigitalSignatures::getSupportedServiceNames() { - Sequence<OUString> aRet{ "com.sun.star.security.DocumentDigitalSignatures" }; + Sequence<OUString> aRet{ u"com.sun.star.security.DocumentDigitalSignatures"_ustr }; return aRet; } @@ -710,8 +710,8 @@ DocumentDigitalSignatures::chooseCertificatesImpl(std::map<OUString, OUString>& return { Reference< css::security::XCertificate >(nullptr) }; uno::Sequence< Reference< css::security::XCertificate > > xCerts = aChooser->GetSelectedCertificates(); - rProperties["Description"] = aChooser->GetDescription(); - rProperties["Usage"] = aChooser->GetUsageText(); + rProperties[u"Description"_ustr] = aChooser->GetDescription(); + rProperties[u"Usage"_ustr] = aChooser->GetUsageText(); return xCerts; } @@ -725,7 +725,7 @@ Reference< css::security::XCertificate > DocumentDigitalSignatures::chooseSignin { std::map<OUString, OUString> aProperties; Reference< css::security::XCertificate > xCert = chooseCertificatesImpl( aProperties, CertificateChooserUserAction::Sign )[0]; - rDescription = aProperties["Description"]; + rDescription = aProperties[u"Description"_ustr]; return xCert; } @@ -733,7 +733,7 @@ Reference< css::security::XCertificate > DocumentDigitalSignatures::selectSignin { std::map<OUString, OUString> aProperties; Reference< css::security::XCertificate > xCert = chooseCertificatesImpl( aProperties, CertificateChooserUserAction::SelectSign )[0]; - rDescription = aProperties["Description"]; + rDescription = aProperties[u"Description"_ustr]; return xCert; } @@ -744,7 +744,7 @@ DocumentDigitalSignatures::selectSigningCertificateWithType(const CertificateKin std::map<OUString, OUString> aProperties; Reference<css::security::XCertificate> xCert = chooseCertificatesImpl(aProperties, CertificateChooserUserAction::SelectSign, certificateKind)[0]; - rDescription = aProperties["Description"]; + rDescription = aProperties[u"Description"_ustr]; return xCert; } @@ -885,7 +885,7 @@ bool DocumentDigitalSignatures::signWithCertificateImpl( sal_Int32 nSecurityId; - bool bSuccess = aSignatureManager.add(xCertificate, xSecurityContext, "", nSecurityId, true); + bool bSuccess = aSignatureManager.add(xCertificate, xSecurityContext, u""_ustr, nSecurityId, true); if (!bSuccess) return false; |