From a4196fc3cf1e20e32cda9477a33ff56515f0c24e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 5 Jun 2013 11:32:31 +0200 Subject: fdo#46808, Convert XMultiServiceFactory in xmlsecurity module Change-Id: Ia134170d07f33c2649b2a2620f40bc7b45ec7e16 --- xmlsecurity/source/framework/decryptorimpl.cxx | 9 +-- xmlsecurity/source/framework/decryptorimpl.hxx | 8 +-- xmlsecurity/source/framework/encryptionengine.cxx | 20 +++---- xmlsecurity/source/framework/encryptionengine.hxx | 6 +- xmlsecurity/source/framework/encryptorimpl.cxx | 66 +++++++++++----------- xmlsecurity/source/framework/encryptorimpl.hxx | 9 +-- xmlsecurity/source/framework/securityengine.cxx | 5 +- xmlsecurity/source/framework/securityengine.hxx | 5 +- .../source/framework/signaturecreatorimpl.cxx | 11 ++-- .../source/framework/signaturecreatorimpl.hxx | 9 +-- xmlsecurity/source/framework/signatureengine.cxx | 7 ++- xmlsecurity/source/framework/signatureengine.hxx | 6 +- .../source/framework/signatureverifierimpl.cxx | 7 ++- .../source/framework/signatureverifierimpl.hxx | 9 ++- 14 files changed, 95 insertions(+), 82 deletions(-) (limited to 'xmlsecurity/source/framework') diff --git a/xmlsecurity/source/framework/decryptorimpl.cxx b/xmlsecurity/source/framework/decryptorimpl.cxx index ec35abeec0a2..7bc6bb6cdb3c 100644 --- a/xmlsecurity/source/framework/decryptorimpl.cxx +++ b/xmlsecurity/source/framework/decryptorimpl.cxx @@ -22,7 +22,9 @@ #include #include #include +#include +using namespace com::sun::star::uno; namespace cssu = com::sun::star::uno; namespace cssl = com::sun::star::lang; namespace cssxc = com::sun::star::xml::crypto; @@ -31,9 +33,8 @@ namespace cssxw = com::sun::star::xml::wrapper; #define SERVICE_NAME "com.sun.star.xml.crypto.sax.Decryptor" #define IMPLEMENTATION_NAME "com.sun.star.xml.security.framework.DecryptorImpl" -DecryptorImpl::DecryptorImpl( const cssu::Reference< cssl::XMultiServiceFactory >& rxMSF) +DecryptorImpl::DecryptorImpl(const Reference< XComponentContext > & xContext) : DecryptorImpl_Base(xContext) { - mxMSF = rxMSF; } DecryptorImpl::~DecryptorImpl() @@ -198,10 +199,10 @@ cssu::Sequence< OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames( ) } #undef SERVICE_NAME -cssu::Reference< cssu::XInterface > SAL_CALL DecryptorImpl_createInstance( const cssu::Reference< cssl::XMultiServiceFactory >& rSMgr) +cssu::Reference< cssu::XInterface > SAL_CALL DecryptorImpl_createInstance( const cssu::Reference< cssl::XMultiServiceFactory >& xMSF) throw( cssu::Exception ) { - return (cppu::OWeakObject*) new DecryptorImpl(rSMgr); + return (cppu::OWeakObject*) new DecryptorImpl( comphelper::getComponentContext( xMSF ) ); } /* XServiceInfo */ diff --git a/xmlsecurity/source/framework/decryptorimpl.hxx b/xmlsecurity/source/framework/decryptorimpl.hxx index 1a9b110a7fae..d9502fb15c31 100644 --- a/xmlsecurity/source/framework/decryptorimpl.hxx +++ b/xmlsecurity/source/framework/decryptorimpl.hxx @@ -29,13 +29,14 @@ #include "encryptionengine.hxx" -class DecryptorImpl : public cppu::ImplInheritanceHelper3 +typedef cppu::ImplInheritanceHelper3 < EncryptionEngine, com::sun::star::xml::crypto::sax::XDecryptionResultBroadcaster, com::sun::star::lang::XInitialization, com::sun::star::lang::XServiceInfo -> +> DecryptorImpl_Base; +class DecryptorImpl : public DecryptorImpl_Base /****** DecryptorImpl.hxx/CLASS DecryptorImpl ********************************* * * NAME @@ -63,8 +64,7 @@ private: throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); public: - explicit DecryptorImpl( const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory >& rxMSF); + explicit DecryptorImpl(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & xContext); virtual ~DecryptorImpl(); /* XDecryptionResultBroadcaster */ diff --git a/xmlsecurity/source/framework/encryptionengine.cxx b/xmlsecurity/source/framework/encryptionengine.cxx index a46b7eb2d234..e0c8fc356b10 100644 --- a/xmlsecurity/source/framework/encryptionengine.cxx +++ b/xmlsecurity/source/framework/encryptionengine.cxx @@ -23,14 +23,14 @@ #include #include -namespace cssu = com::sun::star::uno; +using namespace com::sun::star::uno; namespace cssxc = com::sun::star::xml::crypto; namespace cssxw = com::sun::star::xml::wrapper; #define ENCRYPTION_TEMPLATE "com.sun.star.xml.crypto.XMLEncryptionTemplate" -EncryptionEngine::EncryptionEngine( ) - :m_nIdOfBlocker(-1) +EncryptionEngine::EncryptionEngine( const Reference & xContext) + :m_xContext(xContext), m_nIdOfBlocker(-1) { } @@ -82,7 +82,7 @@ bool EncryptionEngine::checkReady() const } void EncryptionEngine::tryToPerform( ) - throw (cssu::Exception, cssu::RuntimeException) + throw (Exception, RuntimeException) /****** EncryptionEngine/tryToPerform **************************************** * * NAME @@ -113,12 +113,12 @@ void EncryptionEngine::tryToPerform( ) if (checkReady()) { const OUString sEncryptionTemplate ( ENCRYPTION_TEMPLATE ); - cssu::Reference < cssxc::XXMLEncryptionTemplate > xEncryptionTemplate( - mxMSF->createInstance( sEncryptionTemplate ), cssu::UNO_QUERY ); + Reference < cssxc::XXMLEncryptionTemplate > xEncryptionTemplate( + m_xContext->getServiceManager()->createInstanceWithContext( sEncryptionTemplate, m_xContext ), UNO_QUERY ); OSL_ASSERT( xEncryptionTemplate.is() ); - cssu::Reference< cssxw::XXMLElementWrapper > xXMLElement + Reference< cssxw::XXMLElementWrapper > xXMLElement = m_xSAXEventKeeper->getElement( m_nIdOfTemplateEC ); xEncryptionTemplate->setTemplate(xXMLElement); @@ -162,12 +162,12 @@ void EncryptionEngine::clearUp( ) const * Email: michael.mi@sun.com ******************************************************************************/ { - cssu::Reference < cssxc::sax::XReferenceResolvedBroadcaster > - xReferenceResolvedBroadcaster( m_xSAXEventKeeper, cssu::UNO_QUERY ); + Reference < cssxc::sax::XReferenceResolvedBroadcaster > + xReferenceResolvedBroadcaster( m_xSAXEventKeeper, UNO_QUERY ); xReferenceResolvedBroadcaster->removeReferenceResolvedListener( m_nIdOfTemplateEC, - (const cssu::Reference < cssxc::sax::XReferenceResolvedListener >)((SecurityEngine *)this)); + (const Reference < cssxc::sax::XReferenceResolvedListener >)((SecurityEngine *)this)); m_xSAXEventKeeper->removeElementCollector(m_nIdOfTemplateEC); diff --git a/xmlsecurity/source/framework/encryptionengine.hxx b/xmlsecurity/source/framework/encryptionengine.hxx index 1203ede96435..6407e136f320 100644 --- a/xmlsecurity/source/framework/encryptionengine.hxx +++ b/xmlsecurity/source/framework/encryptionengine.hxx @@ -50,6 +50,10 @@ class EncryptionEngine : public cppu::ImplInheritanceHelper1 * Email: michael.mi@sun.com ******************************************************************************/ { +private: + com::sun::star::uno::Reference< + com::sun::star::uno::XComponentContext > m_xContext; + protected: /* * the Encryption bridge component, which performs encrypt and decrypt @@ -64,7 +68,7 @@ protected: sal_Int32 m_nIdOfBlocker; protected: - EncryptionEngine( ); + EncryptionEngine( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & xContext ); virtual ~EncryptionEngine(){}; virtual void tryToPerform( ) diff --git a/xmlsecurity/source/framework/encryptorimpl.cxx b/xmlsecurity/source/framework/encryptorimpl.cxx index 39f73c614b43..e2790ac86570 100644 --- a/xmlsecurity/source/framework/encryptorimpl.cxx +++ b/xmlsecurity/source/framework/encryptorimpl.cxx @@ -22,8 +22,9 @@ #include #include #include +#include -namespace cssu = com::sun::star::uno; +using namespace com::sun::star::uno; namespace cssl = com::sun::star::lang; namespace cssxc = com::sun::star::xml::crypto; namespace cssxw = com::sun::star::xml::wrapper; @@ -31,10 +32,9 @@ namespace cssxw = com::sun::star::xml::wrapper; #define SERVICE_NAME "com.sun.star.xml.crypto.sax.Encryptor" #define IMPLEMENTATION_NAME "com.sun.star.xml.security.framework.EncryptorImpl" -EncryptorImpl::EncryptorImpl( const cssu::Reference< cssl::XMultiServiceFactory >& rxMSF) +EncryptorImpl::EncryptorImpl(const Reference & xContext) : EncryptorImpl(xContext) { m_nReferenceId = -1; - mxMSF = rxMSF; } EncryptorImpl::~EncryptorImpl() @@ -79,7 +79,7 @@ bool EncryptorImpl::checkReady() const } void EncryptorImpl::notifyResultListener() const - throw (cssu::Exception, cssu::RuntimeException) + throw (Exception, RuntimeException) /****** DecryptorImpl/notifyResultListener *********************************** * * NAME @@ -103,16 +103,16 @@ void EncryptorImpl::notifyResultListener() const * Email: michael.mi@sun.com ******************************************************************************/ { - cssu::Reference< cssxc::sax::XEncryptionResultListener > - xEncryptionResultListener ( m_xResultListener , cssu::UNO_QUERY ) ; + Reference< cssxc::sax::XEncryptionResultListener > + xEncryptionResultListener ( m_xResultListener , UNO_QUERY ) ; xEncryptionResultListener->encrypted( m_nSecurityId, m_nStatus ); } -void EncryptorImpl::startEngine( const cssu::Reference< +void EncryptorImpl::startEngine( const Reference< cssxc::XXMLEncryptionTemplate >& xEncryptionTemplate) - throw (cssu::Exception, cssu::RuntimeException) + throw (Exception, RuntimeException) /****** EncryptorImpl/startEngine ******************************************** * * NAME @@ -137,9 +137,9 @@ void EncryptorImpl::startEngine( const cssu::Reference< * Email: michael.mi@sun.com ******************************************************************************/ { - cssu::Reference < cssxc::XXMLEncryptionTemplate > xResultTemplate; + Reference < cssxc::XXMLEncryptionTemplate > xResultTemplate; - cssu::Reference< cssxw::XXMLElementWrapper > + Reference< cssxw::XXMLElementWrapper > xXMLElement = m_xSAXEventKeeper->getElement( m_nReferenceId ); xEncryptionTemplate->setTarget(xXMLElement); @@ -149,14 +149,14 @@ void EncryptorImpl::startEngine( const cssu::Reference< xEncryptionTemplate, m_xSecurityEnvironment); m_nStatus = xResultTemplate->getStatus(); } - catch( cssu::Exception& ) + catch( Exception& ) { m_nStatus = cssxc::SecurityOperationStatus_RUNTIMEERROR_FAILED; } if (m_nStatus == cssxc::SecurityOperationStatus_OPERATION_SUCCEEDED) { - cssu::Reference < cssxw::XXMLElementWrapper > xResultEncryption + Reference < cssxw::XXMLElementWrapper > xResultEncryption = xResultTemplate->getTemplate(); m_xSAXEventKeeper->setElement(m_nIdOfTemplateEC, xResultEncryption); m_xSAXEventKeeper->setElement(m_nReferenceId, NULL); @@ -165,7 +165,7 @@ void EncryptorImpl::startEngine( const cssu::Reference< /* XReferenceCollector */ void SAL_CALL EncryptorImpl::setReferenceCount(sal_Int32) - throw (cssu::Exception, cssu::RuntimeException) + throw (Exception, RuntimeException) { /* * dummp method, because there is only one reference in @@ -175,27 +175,27 @@ void SAL_CALL EncryptorImpl::setReferenceCount(sal_Int32) } void SAL_CALL EncryptorImpl::setReferenceId( sal_Int32 id ) - throw (cssu::Exception, cssu::RuntimeException) + throw (Exception, RuntimeException) { m_nReferenceId = id; } /* XEncryptionResultBroadcaster */ -void SAL_CALL EncryptorImpl::addEncryptionResultListener( const cssu::Reference< cssxc::sax::XEncryptionResultListener >& listener ) - throw (cssu::Exception, cssu::RuntimeException) +void SAL_CALL EncryptorImpl::addEncryptionResultListener( const Reference< cssxc::sax::XEncryptionResultListener >& listener ) + throw (Exception, RuntimeException) { m_xResultListener = listener; tryToPerform(); } -void SAL_CALL EncryptorImpl::removeEncryptionResultListener( const cssu::Reference< cssxc::sax::XEncryptionResultListener >&) - throw (cssu::RuntimeException) +void SAL_CALL EncryptorImpl::removeEncryptionResultListener( const Reference< cssxc::sax::XEncryptionResultListener >&) + throw (RuntimeException) { } /* XInitialization */ -void SAL_CALL EncryptorImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments ) - throw (cssu::Exception, cssu::RuntimeException) +void SAL_CALL EncryptorImpl::initialize( const Sequence< Any >& aArguments ) + throw (Exception, RuntimeException) { OSL_ASSERT(aArguments.getLength() == 5); @@ -212,47 +212,47 @@ void SAL_CALL EncryptorImpl::initialize( const cssu::Sequence< cssu::Any >& aArg OUString EncryptorImpl_getImplementationName () - throw (cssu::RuntimeException) + throw (RuntimeException) { return OUString ( IMPLEMENTATION_NAME ); } sal_Bool SAL_CALL EncryptorImpl_supportsService( const OUString& ServiceName ) - throw (cssu::RuntimeException) + throw (RuntimeException) { return ServiceName == SERVICE_NAME; } -cssu::Sequence< OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames( ) - throw (cssu::RuntimeException) +Sequence< OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames( ) + throw (RuntimeException) { - cssu::Sequence < OUString > aRet(1); + Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); pArray[0] = OUString ( SERVICE_NAME ); return aRet; } #undef SERVICE_NAME -cssu::Reference< cssu::XInterface > SAL_CALL EncryptorImpl_createInstance( - const cssu::Reference< cssl::XMultiServiceFactory >& rSMgr) - throw( cssu::Exception ) +Reference< XInterface > SAL_CALL EncryptorImpl_createInstance( + const Reference< cssl::XMultiServiceFactory >& xMSF) + throw( Exception ) { - return (cppu::OWeakObject*) new EncryptorImpl(rSMgr); + return (cppu::OWeakObject*) new EncryptorImpl( comphelper::getComponentContext( xMSF ) ); } /* XServiceInfo */ OUString SAL_CALL EncryptorImpl::getImplementationName( ) - throw (cssu::RuntimeException) + throw (RuntimeException) { return EncryptorImpl_getImplementationName(); } sal_Bool SAL_CALL EncryptorImpl::supportsService( const OUString& rServiceName ) - throw (cssu::RuntimeException) + throw (RuntimeException) { return EncryptorImpl_supportsService( rServiceName ); } -cssu::Sequence< OUString > SAL_CALL EncryptorImpl::getSupportedServiceNames( ) - throw (cssu::RuntimeException) +Sequence< OUString > SAL_CALL EncryptorImpl::getSupportedServiceNames( ) + throw (RuntimeException) { return EncryptorImpl_getSupportedServiceNames(); } diff --git a/xmlsecurity/source/framework/encryptorimpl.hxx b/xmlsecurity/source/framework/encryptorimpl.hxx index 572dc61f2f18..b4f42381225b 100644 --- a/xmlsecurity/source/framework/encryptorimpl.hxx +++ b/xmlsecurity/source/framework/encryptorimpl.hxx @@ -30,14 +30,16 @@ #include "encryptionengine.hxx" -class EncryptorImpl : public cppu::ImplInheritanceHelper4 +typedef cppu::ImplInheritanceHelper4 < EncryptionEngine, com::sun::star::xml::crypto::sax::XEncryptionResultBroadcaster, com::sun::star::xml::crypto::sax::XReferenceCollector, com::sun::star::lang::XInitialization, com::sun::star::lang::XServiceInfo -> +> EncryptorImpl_Base; + +class EncryptorImpl : public EncryptorImpl_Base /****** EncryptorImpl.hxx/CLASS EncryptorImpl ********************************* * * NAME @@ -70,8 +72,7 @@ private: throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); public: - explicit EncryptorImpl( const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory >& rxMSF); + explicit EncryptorImpl(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & xContext); virtual ~EncryptorImpl(); /* XEncryptionResultBroadcaster */ diff --git a/xmlsecurity/source/framework/securityengine.cxx b/xmlsecurity/source/framework/securityengine.cxx index 035301b16b56..cefefbfbc6a7 100644 --- a/xmlsecurity/source/framework/securityengine.cxx +++ b/xmlsecurity/source/framework/securityengine.cxx @@ -24,9 +24,8 @@ namespace cssu = com::sun::star::uno; namespace cssl = com::sun::star::lang; -SecurityEngine::SecurityEngine( const cssu::Reference< cssl::XMultiServiceFactory >& rxMSF ) - :mxMSF( rxMSF ), - m_nIdOfTemplateEC(-1), +SecurityEngine::SecurityEngine() + :m_nIdOfTemplateEC(-1), m_nNumOfResolvedReferences(0), m_nIdOfKeyEC(-1), m_bMissionDone(false), diff --git a/xmlsecurity/source/framework/securityengine.hxx b/xmlsecurity/source/framework/securityengine.hxx index ffba6b7719c1..3aaac7b94ea3 100644 --- a/xmlsecurity/source/framework/securityengine.hxx +++ b/xmlsecurity/source/framework/securityengine.hxx @@ -50,8 +50,6 @@ class SecurityEngine : public cppu::WeakImplHelper3 ******************************************************************************/ { protected: - com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory > mxMSF; /* * A SAXEventKeeper internally maintians all resources that a security @@ -106,8 +104,7 @@ protected: m_xResultListener; protected: - explicit SecurityEngine( const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory >& rxMSF = NULL ); + explicit SecurityEngine(); virtual ~SecurityEngine() {}; /* diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx b/xmlsecurity/source/framework/signaturecreatorimpl.cxx index c2a3e25520d7..d8f71bf99110 100644 --- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx +++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx @@ -22,7 +22,9 @@ #include #include #include +#include +using namespace com::sun::star::uno; namespace cssu = com::sun::star::uno; namespace cssl = com::sun::star::lang; namespace cssxc = com::sun::star::xml::crypto; @@ -31,10 +33,9 @@ namespace cssxw = com::sun::star::xml::wrapper; #define SERVICE_NAME "com.sun.star.xml.crypto.sax.SignatureCreator" #define IMPLEMENTATION_NAME "com.sun.star.xml.security.framework.SignatureCreatorImpl" -SignatureCreatorImpl::SignatureCreatorImpl( const cssu::Reference< cssl::XMultiServiceFactory >& rxMSF ) - :m_nIdOfBlocker(-1) +SignatureCreatorImpl::SignatureCreatorImpl( const Reference & xContext ) + : SignatureCreatorImpl_Base(xContext), m_nIdOfBlocker(-1) { - mxMSF = rxMSF; } SignatureCreatorImpl::~SignatureCreatorImpl( ) @@ -247,10 +248,10 @@ cssu::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceName #undef SERVICE_NAME cssu::Reference< cssu::XInterface > SAL_CALL SignatureCreatorImpl_createInstance( - const cssu::Reference< cssl::XMultiServiceFactory >& rSMgr) + const cssu::Reference< cssl::XMultiServiceFactory >& xMSF ) throw( cssu::Exception ) { - return (cppu::OWeakObject*) new SignatureCreatorImpl( rSMgr ); + return (cppu::OWeakObject*) new SignatureCreatorImpl( comphelper::getComponentContext( xMSF ) ); } /* XServiceInfo */ diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.hxx b/xmlsecurity/source/framework/signaturecreatorimpl.hxx index 5256d07f0654..d2123062e54e 100644 --- a/xmlsecurity/source/framework/signaturecreatorimpl.hxx +++ b/xmlsecurity/source/framework/signaturecreatorimpl.hxx @@ -30,14 +30,16 @@ #include "signatureengine.hxx" -class SignatureCreatorImpl : public cppu::ImplInheritanceHelper4 +typedef cppu::ImplInheritanceHelper4 < SignatureEngine, com::sun::star::xml::crypto::sax::XBlockerMonitor, com::sun::star::xml::crypto::sax::XSignatureCreationResultBroadcaster, com::sun::star::lang::XInitialization, com::sun::star::lang::XServiceInfo -> +> SignatureCreatorImpl_Base; + +class SignatureCreatorImpl : public SignatureCreatorImpl_Base /****** SignatureCreatorImpl.hxx/CLASS SignatureCreatorImpl ******************* * * NAME @@ -71,8 +73,7 @@ private: throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); public: - explicit SignatureCreatorImpl( const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory >& rxMSF); + explicit SignatureCreatorImpl( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & xContext ); virtual ~SignatureCreatorImpl(); /* XBlockerMonitor */ diff --git a/xmlsecurity/source/framework/signatureengine.cxx b/xmlsecurity/source/framework/signatureengine.cxx index bf2046211c54..e3b462879e9d 100644 --- a/xmlsecurity/source/framework/signatureengine.cxx +++ b/xmlsecurity/source/framework/signatureengine.cxx @@ -23,6 +23,7 @@ #include #include +using namespace com::sun::star::uno; namespace cssu = com::sun::star::uno; namespace cssl = com::sun::star::lang; namespace cssxc = com::sun::star::xml::crypto; @@ -30,8 +31,8 @@ namespace cssxw = com::sun::star::xml::wrapper; #define SIGNATURE_TEMPLATE "com.sun.star.xml.crypto.XMLSignatureTemplate" -SignatureEngine::SignatureEngine( ) - :m_nTotalReferenceNumber(-1) +SignatureEngine::SignatureEngine( const Reference & xContext) + : m_xContext(xContext), m_nTotalReferenceNumber(-1) { } @@ -115,7 +116,7 @@ void SignatureEngine::tryToPerform( ) { const OUString ouSignatureTemplate ( SIGNATURE_TEMPLATE ); cssu::Reference < cssxc::XXMLSignatureTemplate > - xSignatureTemplate( mxMSF->createInstance( ouSignatureTemplate ), cssu::UNO_QUERY ); + xSignatureTemplate( m_xContext->getServiceManager()->createInstanceWithContext( ouSignatureTemplate, m_xContext ), cssu::UNO_QUERY ); OSL_ASSERT( xSignatureTemplate.is() ); diff --git a/xmlsecurity/source/framework/signatureengine.hxx b/xmlsecurity/source/framework/signatureengine.hxx index 7844269977c0..ce3d1376d423 100644 --- a/xmlsecurity/source/framework/signatureengine.hxx +++ b/xmlsecurity/source/framework/signatureengine.hxx @@ -30,6 +30,7 @@ #include #include #include +#include #include @@ -56,6 +57,9 @@ class SignatureEngine : public cppu::ImplInheritanceHelper2 * Email: michael.mi@sun.com ******************************************************************************/ { +private: + com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; + protected: /* @@ -87,7 +91,7 @@ protected: com::sun::star::io::XInputStream > > m_vXInputStreams; protected: - SignatureEngine( ); + SignatureEngine( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & xContext); virtual ~SignatureEngine() {}; virtual void tryToPerform( ) diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx b/xmlsecurity/source/framework/signatureverifierimpl.cxx index 246c5e2310e1..43a0a739a24f 100644 --- a/xmlsecurity/source/framework/signatureverifierimpl.cxx +++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx @@ -22,6 +22,7 @@ #include #include #include +#include namespace cssu = com::sun::star::uno; namespace cssl = com::sun::star::lang; @@ -30,9 +31,9 @@ namespace cssxc = com::sun::star::xml::crypto; #define SERVICE_NAME "com.sun.star.xml.crypto.sax.SignatureVerifier" #define IMPLEMENTATION_NAME "com.sun.star.xml.security.framework.SignatureVerifierImpl" -SignatureVerifierImpl::SignatureVerifierImpl( const cssu::Reference< cssl::XMultiServiceFactory >& rxMSF) +SignatureVerifierImpl::SignatureVerifierImpl( const cssu::Reference< css::uno::XComponentContext >& xContext) + : SignatureVerifierImpl_Base(xContext) { - mxMSF = rxMSF; } SignatureVerifierImpl::~SignatureVerifierImpl() @@ -196,7 +197,7 @@ cssu::Reference< cssu::XInterface > SAL_CALL SignatureVerifierImpl_createInstanc const cssu::Reference< cssl::XMultiServiceFactory >& rSMgr) throw( cssu::Exception ) { - return (cppu::OWeakObject*) new SignatureVerifierImpl(rSMgr); + return (cppu::OWeakObject*) new SignatureVerifierImpl( comphelper::getComponentContext(rSMgr) ); } /* XServiceInfo */ diff --git a/xmlsecurity/source/framework/signatureverifierimpl.hxx b/xmlsecurity/source/framework/signatureverifierimpl.hxx index bc46c23a6648..fce78335f499 100644 --- a/xmlsecurity/source/framework/signatureverifierimpl.hxx +++ b/xmlsecurity/source/framework/signatureverifierimpl.hxx @@ -25,17 +25,20 @@ #include #include #include +#include #include #include "signatureengine.hxx" -class SignatureVerifierImpl : public cppu::ImplInheritanceHelper3 +typedef cppu::ImplInheritanceHelper3 < SignatureEngine, com::sun::star::xml::crypto::sax::XSignatureVerifyResultBroadcaster, com::sun::star::lang::XInitialization, com::sun::star::lang::XServiceInfo -> +> SignatureVerifierImpl_Base; + +class SignatureVerifierImpl : public SignatureVerifierImpl_Base /****** SignatureVerifier.hxx/CLASS SignatureVerifierImpl ********************* * * NAME @@ -64,7 +67,7 @@ private: public: explicit SignatureVerifierImpl( const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory >& rxMSF); + com::sun::star::uno::XComponentContext >& rxContext); virtual ~SignatureVerifierImpl(); /* XSignatureVerifyResultBroadcaster */ -- cgit