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

Miklos Vajna vmiklos at collabora.co.uk
Thu Apr 13 08:13:13 UTC 2017


 xmlsecurity/source/helper/xmlsignaturehelper2.cxx |    6 ------
 xmlsecurity/source/helper/xmlsignaturehelper2.hxx |    6 ------
 2 files changed, 12 deletions(-)

New commits:
commit 611f536e0ee527115203e3bdef687b05dd6c8e84
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Apr 13 09:18:50 2017 +0200

    xmlsecurity: remove unused ImplXMLSignatureListener::signatureVerified()
    
    ImplXMLSignatureListener doesn't have to implement
    XSignatureVerifyResultListener, signatureVerified() is only called at
    SignatureVerifierImpl::notifyResultListener(), on an object set by
    SignatureVerifierImpl::addSignatureVerifyResultListener(). But
    addSignatureVerifyResultListener() is only called from
    XSecController::prepareSignatureToRead() where the argument is of type
    XSecController.
    
    Change-Id: I6741e6a4ce5cf800b09189cd8b7814cd72d602ab
    Reviewed-on: https://gerrit.libreoffice.org/36504
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
index f8e2dfc73242..aa8ac7b4515d 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
@@ -47,12 +47,6 @@ void ImplXMLSignatureListener::setNextHandler(
     m_xNextHandler = xNextHandler;
 }
 
-void SAL_CALL ImplXMLSignatureListener::signatureVerified( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus nResult )
-{
-    XMLSignatureVerifyResult aResult( securityId, nResult );
-    m_rXMLSignatureHelper.SignatureVerifyResultListener(aResult);
-}
-
 // XDocumentHandler
 void SAL_CALL ImplXMLSignatureListener::startDocument(  )
 {
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
index 0a560cab7e97..d460c292c137 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
@@ -26,8 +26,6 @@
 #include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.hpp>
-#include <com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.hpp>
 
 namespace com {
 namespace sun {
@@ -46,7 +44,6 @@ namespace embed {
 
 class ImplXMLSignatureListener : public cppu::WeakImplHelper
 <
-    css::xml::crypto::sax::XSignatureVerifyResultListener,
     css::xml::sax::XDocumentHandler
 >
 {
@@ -62,9 +59,6 @@ public:
 
     void setNextHandler(const css::uno::Reference< css::xml::sax::XDocumentHandler >& xNextHandler);
 
-    // css::xml::crypto::sax::XSignatureVerifyResultListener
-    virtual void SAL_CALL signatureVerified( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus verifyResult ) override;
-
     // css::xml::sax::XDocumentHandler
     virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) override;
 


More information about the Libreoffice-commits mailing list