Kaydet (Commit) 0da4cdea authored tarafından Miklos Vajna's avatar Miklos Vajna

xmlsecurity: clean up unused mxSecurityController

Change-Id: Ife64ab3683479baf152357a6167718f13c9b6089
Reviewed-on: https://gerrit.libreoffice.org/30964Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
üst 6264205e
......@@ -24,7 +24,9 @@
#include <tools/link.hxx>
#include <rtl/ustring.hxx>
#include <rtl/ref.hxx>
#include <sigstruct.hxx>
#include <xsecctl.hxx>
#include <xmlsecuritydllapi.h>
#include <com/sun/star/uno/XComponentContext.hpp>
......@@ -35,7 +37,6 @@
#include <com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.hpp>
#include <com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.hpp>
class XSecController;
class Date;
namespace tools { class Time; }
......@@ -91,20 +92,13 @@ class XMLSECURITY_DLLPUBLIC XMLSignatureHelper
{
private:
css::uno::Reference< css::uno::XComponentContext > mxCtx;
// FIXME: This field appears to be unused (it is only assigned to in the XMLSignatureHelper
// constructor), but it can't be removed as it is that very assignment which causes the object
// it to be acquired, and otherwise its reference counting will be borked and we get a
// crash. This is stupid of course. Probably we should just kill the separate XSecController
// class and move its contents inside this class. Nothing else uses XSecController anyway, as
// far as I see.
css::uno::Reference< css::xml::crypto::sax::XSecurityController > mxSecurityController;
css::uno::Reference< css::xml::crypto::XUriBinding > mxUriBinding;
std::vector<XMLSignatureCreationResult>
maCreationResults;
std::vector<XMLSignatureVerifyResult>
maVerifyResults;
XSecController* mpXSecController;
rtl::Reference<XSecController> mpXSecController;
bool mbError;
bool mbODFPre1_2;
Link<LinkParamNone*,bool> maStartVerifySignatureHdl;
......
......@@ -61,7 +61,6 @@ XMLSignatureHelper::XMLSignatureHelper( const uno::Reference< uno::XComponentCon
: mxCtx(rxCtx), mbODFPre1_2(false)
{
mpXSecController = new XSecController(rxCtx);
mxSecurityController = mpXSecController;
mbError = false;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment