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

[Miklos Vajna]

 xmlsecurity/inc/xmlsignaturehelper.hxx            |    4 ++--
 xmlsecurity/inc/xmlsignaturehelper2.hxx           |    6 +++---
 xmlsecurity/inc/xsecctl.hxx                       |   10 ++++------
 xmlsecurity/source/helper/xmlsignaturehelper.cxx  |    2 +-
 xmlsecurity/source/helper/xmlsignaturehelper2.cxx |    2 +-
 xmlsecurity/source/helper/xsecctl.cxx             |    5 ++---
 6 files changed, 13 insertions(+), 16 deletions(-)

New commits:
commit 6cf3ef823a6419212e69f0ad308e0ef8efe31481
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Nov 2 14:11:49 2017 +0100

    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 at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/xmlsecurity/inc/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsignaturehelper.hxx
index 97d73bfb3619..6f9784f4a690 100644
--- a/xmlsecurity/inc/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsignaturehelper.hxx
@@ -28,10 +28,10 @@
 #include <svl/sigstruct.hxx>
 #include "xsecctl.hxx"
 #include "xmlsecuritydllapi.h"
+#include "xmlsignaturehelper.hxx"
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/xml/sax/XWriter.hpp>
-#include <com/sun/star/xml/crypto/XUriBinding.hpp>
 #include <com/sun/star/xml/crypto/XSEInitializer.hpp>
 #include <com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.hpp>
 #include <com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.hpp>
@@ -66,7 +66,7 @@ class XMLSECURITY_DLLPUBLIC XMLSignatureHelper
 {
 private:
     css::uno::Reference< css::uno::XComponentContext > mxCtx;
-    css::uno::Reference< css::xml::crypto::XUriBinding > mxUriBinding;
+    rtl::Reference<UriBindingHelper> mxUriBinding;
 
     rtl::Reference<XSecController> mpXSecController;
     bool                        mbError;
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx b/xmlsecurity/inc/xmlsignaturehelper2.hxx
similarity index 90%
rename from xmlsecurity/source/helper/xmlsignaturehelper2.hxx
rename to xmlsecurity/inc/xmlsignaturehelper2.hxx
index 1b62f601e509..867118ba8da9 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
+++ b/xmlsecurity/inc/xmlsignaturehelper2.hxx
@@ -17,8 +17,8 @@
  *   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
+#ifndef INCLUDED_XMLSECURITY_INC_XMLSIGNATUREHELPER2_HXX
+#define INCLUDED_XMLSECURITY_INC_XMLSIGNATUREHELPER2_HXX
 
 #include <tools/link.hxx>
 #include <rtl/ustring.hxx>
@@ -54,6 +54,6 @@ public:
     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
+#endif // INCLUDED_XMLSECURITY_INC_XMLSIGNATUREHELPER2_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/inc/xsecctl.hxx b/xmlsecurity/inc/xsecctl.hxx
index 68968a2bb2f0..a041bd3b7069 100644
--- a/xmlsecurity/inc/xsecctl.hxx
+++ b/xmlsecurity/inc/xsecctl.hxx
@@ -41,11 +41,12 @@
 
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ref.hxx>
-
 #include <cppuhelper/implbase.hxx>
 
 #include <vector>
 
+#include "xmlsignaturehelper2.hxx"
+
 #define NS_XMLDSIG "http://www.w3.org/2000/09/xmldsig#"
 #define NS_DC      "http://purl.org/dc/elements/1.1/"
 #define NS_XD      "http://uri.etsi.org/01903/v1.3.2#"
@@ -219,7 +220,7 @@ public:
     /*
      * An xUriBinding is provided to map Uris to XInputStream interfaces.
      */
-    css::uno::Reference< css::xml::crypto::XUriBinding > m_xUriBinding;
+    rtl::Reference<UriBindingHelper> m_xUriBinding;
 
 private:
 
@@ -289,10 +290,7 @@ public:
 
     sal_Int32 getNewSecurityId(  );
 
-    void startMission( const css::uno::Reference<
-        css::xml::crypto::XUriBinding >& xUriBinding,
-        const css::uno::Reference<
-            css::xml::crypto::XXMLSecurityContext >& xSecurityContext );
+    void startMission(const rtl::Reference<UriBindingHelper>& xUriBinding, const css::uno::Reference<css::xml::crypto::XXMLSecurityContext>& xSecurityContext);
 
     void setSAXChainConnector(const css::uno::Reference< css::lang::XInitialization >& xInitialization);
 
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/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