diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-24 11:22:18 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-28 10:17:47 +0000 |
commit | 198c41c4fe8be4ce8a6ddab43ae0c5f17a4889ac (patch) | |
tree | 041d55126e9770b81f68fadfaaa69e82313786b3 /xmlsecurity | |
parent | d3981b3e8c021ee03a2ca7103a73e56cca18df81 (diff) |
new loplugin unoany
Change-Id: I5d6c4a67cb2a09e7cd5bd620c6b262d188701b89
Reviewed-on: https://gerrit.libreoffice.org/34714
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmlsecurity')
-rw-r--r-- | xmlsecurity/qa/unit/signing/signing.cxx | 4 | ||||
-rw-r--r-- | xmlsecurity/source/helper/xsecctl.cxx | 2 | ||||
-rw-r--r-- | xmlsecurity/source/helper/xsecsign.cxx | 10 | ||||
-rw-r--r-- | xmlsecurity/source/helper/xsecverify.cxx | 10 |
4 files changed, 13 insertions, 13 deletions
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx index 31dc8f97ebfb..03c7c961d996 100644 --- a/xmlsecurity/qa/unit/signing/signing.cxx +++ b/xmlsecurity/qa/unit/signing/signing.cxx @@ -494,7 +494,7 @@ void SigningTest::test96097Calc() aTempFileSaveCopy.EnableKillingFile(); uno::Sequence<beans::PropertyValue> descSaveACopy(2); descSaveACopy[0].Name = "SaveACopy"; - descSaveACopy[0].Value = uno::makeAny(true); + descSaveACopy[0].Value <<= true; descSaveACopy[1].Name = "FilterName"; descSaveACopy[1].Value <<= OUString("calc8"); xDocStorable->storeToURL(aTempFileSaveCopy.GetURL(), descSaveACopy); @@ -542,7 +542,7 @@ void SigningTest::test96097Doc() aTempFileSaveCopy.EnableKillingFile(); uno::Sequence<beans::PropertyValue> descSaveACopy(2); descSaveACopy[0].Name = "SaveACopy"; - descSaveACopy[0].Value = uno::makeAny(true); + descSaveACopy[0].Value <<= true; descSaveACopy[1].Name = "FilterName"; descSaveACopy[1].Value <<= OUString("writer8"); xDocStorable->storeToURL(aTempFileSaveCopy.GetURL(), descSaveACopy); diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx index 319e08866669..578a3a6db713 100644 --- a/xmlsecurity/source/helper/xsecctl.cxx +++ b/xmlsecurity/source/helper/xsecctl.cxx @@ -149,7 +149,7 @@ void XSecController::createXSecComponent( ) cssu::Reference< cssl::XInitialization > xInitialization(m_xSAXEventKeeper, cssu::UNO_QUERY); cssu::Sequence <cssu::Any> arg(1); - arg[0] = cssu::makeAny(uno::Reference<xml::wrapper::XXMLDocumentWrapper>(m_xXMLDocumentWrapper.get())); + arg[0] <<= uno::Reference<xml::wrapper::XXMLDocumentWrapper>(m_xXMLDocumentWrapper.get()); xInitialization->initialize(arg); cssu::Reference<cssxc::sax::XSAXEventKeeperStatusChangeBroadcaster> diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx index f2db1bdd10ed..40e6f1b28c52 100644 --- a/xmlsecurity/source/helper/xsecsign.cxx +++ b/xmlsecurity/source/helper/xsecsign.cxx @@ -74,14 +74,14 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar cssu::Reference<cssl::XInitialization> xInitialization(xReferenceResolvedListener, cssu::UNO_QUERY); cssu::Sequence<cssu::Any> args(5); - args[0] = cssu::makeAny(OUString::number(nSecurityId)); - args[1] = cssu::makeAny(m_xSAXEventKeeper); - args[2] = cssu::makeAny(OUString::number(nIdOfSignatureElementCollector)); + args[0] <<= OUString::number(nSecurityId); + args[1] <<= m_xSAXEventKeeper; + args[2] <<= OUString::number(nIdOfSignatureElementCollector); //for nss, the internal module is used for signing, which needs to be improved later - args[3] = cssu::makeAny(m_xSecurityContext->getSecurityEnvironment()); + args[3] <<= m_xSecurityContext->getSecurityEnvironment(); - args[4] = cssu::makeAny(m_xXMLSignature); + args[4] <<= m_xXMLSignature; xInitialization->initialize(args); sal_Int32 nBlockerId = m_xSAXEventKeeper->addBlocker(); diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx index d6ce85be5f21..1646552c40f1 100644 --- a/xmlsecurity/source/helper/xsecverify.cxx +++ b/xmlsecurity/source/helper/xsecverify.cxx @@ -65,11 +65,11 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar cssu::Reference<cssl::XInitialization> xInitialization(xReferenceResolvedListener, cssu::UNO_QUERY); cssu::Sequence<cssu::Any> args(5); - args[0] = cssu::makeAny(OUString::number(nSecurityId)); - args[1] = cssu::makeAny(m_xSAXEventKeeper); - args[2] = cssu::makeAny(OUString::number(nIdOfSignatureElementCollector)); - args[3] = cssu::makeAny(m_xSecurityContext); - args[4] = cssu::makeAny(m_xXMLSignature); + args[0] <<= OUString::number(nSecurityId); + args[1] <<= m_xSAXEventKeeper; + args[2] <<= OUString::number(nIdOfSignatureElementCollector); + args[3] <<= m_xSecurityContext; + args[4] <<= m_xXMLSignature; xInitialization->initialize(args); cssu::Reference< cssxc::sax::XSignatureVerifyResultBroadcaster > |