diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-05-02 14:20:15 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-05-03 11:19:51 +0200 |
| commit | 1c12e5fe5a458f4a4d4dd8080c2ade2f20ef17dc (patch) | |
| tree | aa526379a6f1921377cc9f33b8650812a8a9cacd | |
| parent | 669fe2f229df17a569ee8f87b654a26b1b770e8d (diff) | |
Just use Any ctor instead of makeAny in xmlsecurity
Change-Id: Ic2e9189d116b03122d24a477d9396ca3d49a0a25
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133698
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | xmlsecurity/qa/unit/signing/signing.cxx | 2 | ||||
| -rw-r--r-- | xmlsecurity/source/helper/xsecsign.cxx | 10 | ||||
| -rw-r--r-- | xmlsecurity/source/helper/xsecverify.cxx | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx index 90d0edf8973e..9e28f90d55d1 100644 --- a/xmlsecurity/qa/unit/signing/signing.cxx +++ b/xmlsecurity/qa/unit/signing/signing.cxx @@ -827,7 +827,7 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testPDFAddVisibleSignature) // Select it and assign a certificate. uno::Reference<view::XSelectionSupplier> xSelectionSupplier(pBaseModel->getCurrentController(), uno::UNO_QUERY); - xSelectionSupplier->select(uno::makeAny(xShape)); + xSelectionSupplier->select(uno::Any(xShape)); uno::Sequence<uno::Reference<security::XCertificate>> aCertificates = mxSecurityContext->getSecurityEnvironment()->getPersonalCertificates(); if (!aCertificates.hasElements()) diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx index fdbd0f614cfb..5634ed502e8b 100644 --- a/xmlsecurity/source/helper/xsecsign.cxx +++ b/xmlsecurity/source/helper/xsecsign.cxx @@ -69,13 +69,13 @@ css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener > XSecCon css::uno::Sequence<css::uno::Any> args { - makeAny(OUString::number(nSecurityId)), - makeAny(uno::Reference<xml::crypto::sax::XSecuritySAXEventKeeper>(m_xSAXEventKeeper)), - makeAny(OUString::number(nIdOfSignatureElementCollector)), + Any(OUString::number(nSecurityId)), + Any(uno::Reference<xml::crypto::sax::XSecuritySAXEventKeeper>(m_xSAXEventKeeper)), + Any(OUString::number(nIdOfSignatureElementCollector)), //for nss, the internal module is used for signing, which needs to be improved later - makeAny(m_xSecurityContext->getSecurityEnvironment()), - makeAny(m_xXMLSignature) + Any(m_xSecurityContext->getSecurityEnvironment()), + Any(m_xXMLSignature) }; xSignatureCreator->initialize(args); diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx index 6c676dc3825a..c45bece5fed9 100644 --- a/xmlsecurity/source/helper/xsecverify.cxx +++ b/xmlsecurity/source/helper/xsecverify.cxx @@ -75,11 +75,11 @@ css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener > XSecCon css::uno::Sequence<css::uno::Any> args { - makeAny(OUString::number(nSecurityId)), - makeAny(uno::Reference<xml::crypto::sax::XSecuritySAXEventKeeper>(m_xSAXEventKeeper)), - makeAny(OUString::number(nIdOfSignatureElementCollector)), - makeAny(m_xSecurityContext), - makeAny(m_xXMLSignature) + Any(OUString::number(nSecurityId)), + Any(uno::Reference<xml::crypto::sax::XSecuritySAXEventKeeper>(m_xSAXEventKeeper)), + Any(OUString::number(nIdOfSignatureElementCollector)), + Any(m_xSecurityContext), + Any(m_xXMLSignature) }; xInitialization->initialize(args); |