diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-12-21 08:06:10 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-12-21 08:06:26 +0000 |
| commit | 517994c640ac83d48b9e5f238bc4d219ebd6abbd (patch) | |
| tree | c12b4458cc255643b6b888bd23ce3e4a0f321e04 /xmlsecurity/source/helper/xsecsign.cxx | |
| parent | b55c205460fe7e7b133e179cd567764df7ac3508 (diff) | |
xmlsecurity: instantiate SignatureCreatorImpl directly in XSecController
Going via UNO for a class in the same module is an overkill.
Change-Id: I3a24bc770e40be5b0a6fc34206e92f968de060ae
Reviewed-on: https://gerrit.libreoffice.org/32271
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'xmlsecurity/source/helper/xsecsign.cxx')
| -rw-r--r-- | xmlsecurity/source/helper/xsecsign.cxx | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx index 40d1fd0e3848..eabae475bb02 100644 --- a/xmlsecurity/source/helper/xsecsign.cxx +++ b/xmlsecurity/source/helper/xsecsign.cxx @@ -30,7 +30,7 @@ #include <com/sun/star/embed/StorageFormats.hpp> #include <rtl/uuid.h> -#include <stdio.h> +#include "framework/signaturecreatorimpl.hxx" using namespace com::sun::star; namespace cssu = com::sun::star::uno; @@ -38,9 +38,6 @@ namespace cssl = com::sun::star::lang; namespace cssxc = com::sun::star::xml::crypto; namespace cssxs = com::sun::star::xml::sax; -/* xml security framework components */ -#define SIGNATURECREATOR_COMPONENT "com.sun.star.xml.crypto.sax.SignatureCreator" - /* protected: for signature generation */ OUString XSecController::createId() { @@ -66,20 +63,13 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar SignatureReferenceInformations& vReferenceInfors = internalSignatureInfor.signatureInfor.vSignatureReferenceInfors; sal_Int32 nIdOfSignatureElementCollector; - cssu::Reference< cssxc::sax::XReferenceResolvedListener > xReferenceResolvedListener; nIdOfSignatureElementCollector = m_xSAXEventKeeper->addSecurityElementCollector( cssxc::sax::ElementMarkPriority_AFTERMODIFY, true ); m_xSAXEventKeeper->setSecurityId(nIdOfSignatureElementCollector, nSecurityId); - /* - * create a SignatureCreator - */ - cssu::Reference< cssl::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() ); - xReferenceResolvedListener.set( - xMCF->createInstanceWithContext(SIGNATURECREATOR_COMPONENT, mxCtx), - cssu::UNO_QUERY); + uno::Reference<xml::crypto::sax::XReferenceResolvedListener> xReferenceResolvedListener(new SignatureCreatorImpl(mxCtx)); cssu::Reference<cssl::XInitialization> xInitialization(xReferenceResolvedListener, cssu::UNO_QUERY); |