diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-04-14 16:42:29 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-04-15 08:38:02 +0200 |
commit | f87fab6310bee5a8df2a95ebc962072bdeb5faff (patch) | |
tree | 1412a98e0105f811ccb2f399e87c3ed2fe4c0d23 /xmlsecurity | |
parent | b52f309f2b9037ee53ab8ac2d66967c012ba82f1 (diff) |
loplugin:sequentialassign in writerfilter..xmlsecurity
Change-Id: I41028c704eca08b71746c3c87e38926b95449775
Reviewed-on: https://gerrit.libreoffice.org/70735
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmlsecurity')
-rw-r--r-- | xmlsecurity/source/dialogs/macrosecurity.cxx | 3 | ||||
-rw-r--r-- | xmlsecurity/source/helper/xmlsignaturehelper.cxx | 6 | ||||
-rw-r--r-- | xmlsecurity/source/xmlsec/saxhelper.cxx | 4 |
3 files changed, 4 insertions, 9 deletions
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 3e61b21dfa2a..70a9b32d88a8 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -314,10 +314,9 @@ void MacroSecurityTrustedSourcesTP::FillCertLB() for( sal_uInt32 nEntry = 0 ; nEntry < nEntries ; ++nEntry ) { css::uno::Sequence< OUString >& rEntry = m_aTrustedAuthors[ nEntry ]; - uno::Reference< css::security::XCertificate > xCert; // create from RawData - xCert = m_pDlg->m_xSecurityEnvironment->createCertificateFromAscii( rEntry[ 2 ] ); + uno::Reference< css::security::XCertificate > xCert = m_pDlg->m_xSecurityEnvironment->createCertificateFromAscii( rEntry[ 2 ] ); m_xTrustCertLB->append(OUString::number(nEntry), xmlsec::GetContentPart(xCert->getSubjectName())); m_xTrustCertLB->set_text(nEntry, xmlsec::GetContentPart(xCert->getIssuerName()), 1); diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx index db80016f84e0..1754d25b8167 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx @@ -331,8 +331,7 @@ bool XMLSignatureHelper::ReadAndVerifySignatureStorage(const uno::Reference<embe uno::Reference<embed::XStorage> xSubStorage = xStorage->openStorageElement("_rels", nOpenMode); uno::Reference<io::XInputStream> xRelStream(xSubStorage->openStreamElement("origin.sigs.rels", nOpenMode), uno::UNO_QUERY); - uno::Sequence< uno::Sequence<beans::StringPair> > aRelationsInfo; - aRelationsInfo = comphelper::OFOPXMLHelper::ReadRelationsInfoSequence(xRelStream, "origin.sigs.rels", mxCtx); + uno::Sequence< uno::Sequence<beans::StringPair> > aRelationsInfo = comphelper::OFOPXMLHelper::ReadRelationsInfoSequence(xRelStream, "origin.sigs.rels", mxCtx); for (sal_Int32 i = 0; i < aRelationsInfo.getLength(); ++i) { @@ -421,8 +420,7 @@ void XMLSignatureHelper::EnsureSignaturesRelation(const css::uno::Reference<css: sal_Int32 nOpenMode = embed::ElementModes::READWRITE; uno::Reference<embed::XStorage> xSubStorage = xStorage->openStorageElement("_rels", nOpenMode); uno::Reference<io::XInputStream> xRelStream(xSubStorage->openStreamElement(".rels", nOpenMode), uno::UNO_QUERY); - std::vector< uno::Sequence<beans::StringPair> > aRelationsInfo; - aRelationsInfo = comphelper::sequenceToContainer< std::vector< uno::Sequence<beans::StringPair> > >(comphelper::OFOPXMLHelper::ReadRelationsInfoSequence(xRelStream, ".rels", mxCtx)); + std::vector< uno::Sequence<beans::StringPair> > aRelationsInfo = comphelper::sequenceToContainer< std::vector< uno::Sequence<beans::StringPair> > >(comphelper::OFOPXMLHelper::ReadRelationsInfoSequence(xRelStream, ".rels", mxCtx)); // Do we have a relation already? bool bHaveRelation = false; diff --git a/xmlsecurity/source/xmlsec/saxhelper.cxx b/xmlsecurity/source/xmlsec/saxhelper.cxx index 30811dbfac00..091773992324 100644 --- a/xmlsecurity/source/xmlsec/saxhelper.cxx +++ b/xmlsecurity/source/xmlsec/saxhelper.cxx @@ -286,9 +286,7 @@ void SAXHelper::startElement( */ void SAXHelper::endElement( const OUString& aName ) { - xmlChar* fullname = nullptr ; - - fullname = ous_to_xmlstr( aName ) ; + xmlChar* fullname = ous_to_xmlstr( aName ) ; m_pSaxHandler->endElement( m_pParserCtxt , fullname ) ; if( fullname != nullptr ) |