xmlsecurity: can hold UriBindingHelper by rtl::Reference

... in XMLSignatureHelper and XSecController

Change-Id: Ie3817684c9ed9ed8a222e3ba56c8fbc389a68071
Reviewed-on: https://gerrit.libreoffice.org/44193
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>

4 files changed, 4 insertions, 64 deletions

diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index bcfc19936688..0f7630171285 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -22,7 +22,7 @@
 #include <documentsignaturehelper.hxx>
 #include <xsecctl.hxx>
 
-#include "xmlsignaturehelper2.hxx"
+#include <xmlsignaturehelper2.hxx>
 
 #include <tools/stream.hxx>
 #include <tools/datetime.hxx>
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
index d63052996763..49d9e84f74e4 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <xmlsignaturehelper.hxx>
-#include "xmlsignaturehelper2.hxx"
+#include <xmlsignaturehelper2.hxx>
 
 #include <tools/solar.h>
 #include <unotools/streamhelper.hxx>
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
deleted file mode 100644
index 1b62f601e509..000000000000
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_XMLSECURITY_SOURCE_HELPER_XMLSIGNATUREHELPER2_HXX
-#define INCLUDED_XMLSECURITY_SOURCE_HELPER_XMLSIGNATUREHELPER2_HXX
-
-#include <tools/link.hxx>
-#include <rtl/ustring.hxx>
-
-#include <cppuhelper/implbase.hxx>
-
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-
-namespace com {
-namespace sun {
-namespace star {
-namespace io {
-    class XInputStream; }
-namespace embed {
-    class XStorage; }
-}}}
-
-// XUriBinding
-
-class UriBindingHelper : public cppu::WeakImplHelper< css::xml::crypto::XUriBinding >
-{
-private:
-    css::uno::Reference < css::embed::XStorage > mxStorage;
-
-public:
-    UriBindingHelper();
-    explicit UriBindingHelper( const css::uno::Reference < css::embed::XStorage >& rxStorage );
-
-    void SAL_CALL setUriBinding( const OUString& uri, const css::uno::Reference< css::io::XInputStream >& aInputStream ) override;
-
-    css::uno::Reference< css::io::XInputStream > SAL_CALL getUriBinding( const OUString& uri ) override;
-
-    static css::uno::Reference < css::io::XInputStream > OpenInputStream( const css::uno::Reference < css::embed::XStorage >& rxStore, const OUString& rURI );
-};
-
-#endif // INCLUDED_XMLSECURITY_SOURCE_HELPER_XMLSIGNATUREHELPER2_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx
index 301085df668f..a64883d842b1 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -43,6 +43,7 @@
 #include <comphelper/ofopxmlhelper.hxx>
 #include <sax/tools/converter.hxx>
 #include "ooxmlsecexporter.hxx"
+#include <xmlsignaturehelper2.hxx>
 
 namespace cssu = com::sun::star::uno;
 namespace cssl = com::sun::star::lang;
@@ -410,9 +411,7 @@ sal_Int32 XSecController::getNewSecurityId(  )
     return nId;
 }
 
-void XSecController::startMission(
-    const cssu::Reference< cssxc::XUriBinding >& xUriBinding,
-    const cssu::Reference< cssxc::XXMLSecurityContext >& xSecurityContext )
+void XSecController::startMission(const rtl::Reference<UriBindingHelper>& xUriBinding, const cssu::Reference< cssxc::XXMLSecurityContext >& xSecurityContext )
 /****** XSecController/startMission *******************************************
  *
  *   NAME