ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Just use Any ctor instead of makeAny in xmlsecurity

Browse Source 
Change-Id: Ic2e9189d116b03122d24a477d9396ca3d49a0a25
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133698
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2022-05-03 11:19:51 +02:00
parent 669fe2f229
commit 1c12e5fe5a
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xmlsecurity/qa/unit/signing/signing.cxx
+1 -1
View File
@@ -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())
xmlsecurity/source/helper/xsecsign.cxx
+5 -5
View File
@@ -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);
xmlsecurity/source/helper/xsecverify.cxx
+5 -5
View File
@@ -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);