From 6cf3ef823a6419212e69f0ad308e0ef8efe31481 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 2 Nov 2017 14:11:49 +0100 Subject: 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 Tested-by: Jenkins --- xmlsecurity/inc/xmlsignaturehelper.hxx | 4 +- xmlsecurity/inc/xmlsignaturehelper2.hxx | 59 +++++++++++++++++++++++ xmlsecurity/inc/xsecctl.hxx | 10 ++-- xmlsecurity/source/helper/xmlsignaturehelper.cxx | 2 +- xmlsecurity/source/helper/xmlsignaturehelper2.cxx | 2 +- xmlsecurity/source/helper/xmlsignaturehelper2.hxx | 59 ----------------------- xmlsecurity/source/helper/xsecctl.cxx | 5 +- 7 files changed, 69 insertions(+), 72 deletions(-) create mode 100644 xmlsecurity/inc/xmlsignaturehelper2.hxx delete mode 100644 xmlsecurity/source/helper/xmlsignaturehelper2.hxx (limited to 'xmlsecurity') 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 #include "xsecctl.hxx" #include "xmlsecuritydllapi.h" +#include "xmlsignaturehelper.hxx" #include #include -#include #include #include #include @@ -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 mxUriBinding; rtl::Reference mpXSecController; bool mbError; diff --git a/xmlsecurity/inc/xmlsignaturehelper2.hxx b/xmlsecurity/inc/xmlsignaturehelper2.hxx new file mode 100644 index 000000000000..867118ba8da9 --- /dev/null +++ b/xmlsecurity/inc/xmlsignaturehelper2.hxx @@ -0,0 +1,59 @@ +/* -*- 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_INC_XMLSIGNATUREHELPER2_HXX +#define INCLUDED_XMLSECURITY_INC_XMLSIGNATUREHELPER2_HXX + +#include +#include + +#include + +#include + +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_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 #include - #include #include +#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 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& xUriBinding, const css::uno::Reference& 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 #include -#include "xmlsignaturehelper2.hxx" +#include #include #include 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 -#include "xmlsignaturehelper2.hxx" +#include #include #include 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 -#include - -#include - -#include - -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 #include #include "ooxmlsecexporter.hxx" +#include 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& xUriBinding, const cssu::Reference< cssxc::XXMLSecurityContext >& xSecurityContext ) /****** XSecController/startMission ******************************************* * * NAME -- cgit