[Libreoffice-commits] core.git: xmlsecurity/source

[Miklos Vajna]

 xmlsecurity/source/helper/xsecparser.cxx |    4 +---
 xmlsecurity/source/helper/xsecparser.hxx |    4 +---
 xmlsecurity/source/helper/xsecverify.cxx |    2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit d26a74f0836e81de1113d6ec70aa5893acfcd3c3
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri May 19 09:13:21 2017 +0200

    xmlsecurity: remove unused parameter in XSecParser ctor
    
    Change-Id: I91caacf6476003477a76e583c2aa512c1446f9e4
    Reviewed-on: https://gerrit.libreoffice.org/37804
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/xmlsecurity/source/helper/xsecparser.cxx b/xmlsecurity/source/helper/xsecparser.cxx
index 6e6bfc45c426..61c2395aae27 100644
--- a/xmlsecurity/source/helper/xsecparser.cxx
+++ b/xmlsecurity/source/helper/xsecparser.cxx
@@ -30,8 +30,7 @@ namespace cssxc = com::sun::star::xml::crypto;
 namespace cssxs = com::sun::star::xml::sax;
 
 XSecParser::XSecParser(XMLSignatureHelper& rXMLSignatureHelper,
-    XSecController* pXSecController,
-    const cssu::Reference< cssxs::XDocumentHandler >& xNextHandler)
+    XSecController* pXSecController)
     : m_bInX509IssuerName(false)
     , m_bInX509SerialNumber(false)
     , m_bInX509Certificate(false)
@@ -43,7 +42,6 @@ XSecParser::XSecParser(XMLSignatureHelper& rXMLSignatureHelper,
     , m_bInDate(false)
     , m_bInDescription(false)
     , m_pXSecController(pXSecController)
-    , m_xNextHandler(xNextHandler)
     , m_bReferenceUnresolved(false)
     , m_nReferenceDigestID(cssxc::DigestID::SHA1)
     , m_rXMLSignatureHelper(rXMLSignatureHelper)
diff --git a/xmlsecurity/source/helper/xsecparser.hxx b/xmlsecurity/source/helper/xsecparser.hxx
index 1fc01b74123e..dcfbead56a4c 100644
--- a/xmlsecurity/source/helper/xsecparser.hxx
+++ b/xmlsecurity/source/helper/xsecparser.hxx
@@ -110,9 +110,7 @@ private:
             css::xml::sax::XAttributeList >& xAttribs );
 
 public:
-    XSecParser(XMLSignatureHelper& rXMLSignatureHelper, XSecController* pXSecController,
-        const css::uno::Reference<
-            css::xml::sax::XDocumentHandler >& xNextHandler );
+    XSecParser(XMLSignatureHelper& rXMLSignatureHelper, XSecController* pXSecController);
 
     /*
      * XDocumentHandler
diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx
index 138a0026928a..2dfa54aa5302 100644
--- a/xmlsecurity/source/helper/xsecverify.cxx
+++ b/xmlsecurity/source/helper/xsecverify.cxx
@@ -404,7 +404,7 @@ cssu::Reference< cssxs::XDocumentHandler > const & XSecController::createSignatu
     if (nType == embed::StorageFormats::OFOPXML)
         m_xSecParser = new OOXMLSecParser(rXMLSignatureHelper, this);
     else
-        m_xSecParser = new XSecParser(rXMLSignatureHelper, this, nullptr);
+        m_xSecParser = new XSecParser(rXMLSignatureHelper, this);
     cssu::Reference< cssl::XInitialization > xInitialization(m_xSecParser, uno::UNO_QUERY);
 
     setSAXChainConnector(xInitialization, nullptr, nullptr);