mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS cmcfixes48 (1.12.16); FILE MERGED

Browse Source 
2008/08/01 13:54:30 cmc 1.12.16.1: #i92247# remove duplication of object code, link only the single library to libxmlsec1, and update some stuff to new api
This commit is contained in:
Vladimir Glazounov
2008-08-18 12:12:20 +00:00
parent e89243af79
commit 43e7cb1e5d
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: digitalsignaturesdialog.hxx,v $ * $RCSfile: digitalsignaturesdialog.hxx,v $
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -63,6 +63,7 @@ class HeaderBar;
class DigitalSignaturesDialog : public ModalDialog class DigitalSignaturesDialog : public ModalDialog
{ {
private: private:
cssu::Reference< cssu::XComponentContext >& mxCtx;
XMLSignatureHelper maSignatureHelper; XMLSignatureHelper maSignatureHelper;
css::uno::Reference < css::embed::XStorage > mxStore; css::uno::Reference < css::embed::XStorage > mxStore;
@@ -112,7 +113,7 @@ private:
public: public:
DigitalSignaturesDialog( Window* pParent, cssu::Reference< DigitalSignaturesDialog( Window* pParent, cssu::Reference<
css::lang::XMultiServiceFactory >& rxMSF, DocumentSignatureMode eMode, cssu::XComponentContext >& rxCtx, DocumentSignatureMode eMode,
sal_Bool bReadOnly ); sal_Bool bReadOnly );
~DigitalSignaturesDialog(); ~DigitalSignaturesDialog();

9
xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: xmlsignaturehelper.hxx,v $ * $RCSfile: xmlsignaturehelper.hxx,v $
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -41,6 +41,7 @@
#include <xmlsecurity/sigstruct.hxx> #include <xmlsecurity/sigstruct.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/xml/crypto/XUriBinding.hpp> #include <com/sun/star/xml/crypto/XUriBinding.hpp>
#include <com/sun/star/xml/crypto/XSEInitializer.hpp> #include <com/sun/star/xml/crypto/XSEInitializer.hpp>
@@ -55,8 +56,6 @@ class Time;
namespace com { namespace com {
namespace sun { namespace sun {
namespace star { namespace star {
namespace lang {
class XMultiServiceFactory; }
namespace io { namespace io {
class XOutputStream; class XOutputStream;
class XInputStream; } class XInputStream; }
@@ -109,7 +108,7 @@ typedef ::std::vector<XMLSignatureVerifyResult> XMLSignatureVerifyResults;
class XMLSignatureHelper class XMLSignatureHelper
{ {
private: private:
::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory> mxMSF; ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxCtx;
::com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XSecurityController > mxSecurityController; ::com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XSecurityController > mxSecurityController;
::com::sun::star::uno::Reference< com::sun::star::xml::crypto::XUriBinding > mxUriBinding; ::com::sun::star::uno::Reference< com::sun::star::xml::crypto::XUriBinding > mxUriBinding;
@@ -133,7 +132,7 @@ private:
XMLSignatureHelper(const XMLSignatureHelper&); XMLSignatureHelper(const XMLSignatureHelper&);
public: public:
XMLSignatureHelper(const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory>& rxMSF ); XMLSignatureHelper(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& mrCtx );
~XMLSignatureHelper(); ~XMLSignatureHelper();
// Initialize the security context with given crypto token. // Initialize the security context with given crypto token.