summaryrefslogtreecommitdiff
path: root/xmlsecurity
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-08-18 12:12:20 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-08-18 12:12:20 +0000
commit43e7cb1e5df0671e95e649c52c3c45db54235ea7 (patch)
tree8d864ee82eca14410e96aba7f001d1e048f7cff1 /xmlsecurity
parente89243af790daa3a5393fac0c0691f04595d9bb3 (diff)
INTEGRATION: CWS cmcfixes48 (1.12.16); FILE MERGED
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
Diffstat (limited to 'xmlsecurity')
-rw-r--r--xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx5
-rw-r--r--xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx9
2 files changed, 7 insertions, 7 deletions
diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
index 942df5cf4e85..9e1f8d1667c2 100644
--- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: digitalsignaturesdialog.hxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
* This file is part of OpenOffice.org.
*
@@ -63,6 +63,7 @@ class HeaderBar;
class DigitalSignaturesDialog : public ModalDialog
{
private:
+ cssu::Reference< cssu::XComponentContext >& mxCtx;
XMLSignatureHelper maSignatureHelper;
css::uno::Reference < css::embed::XStorage > mxStore;
@@ -112,7 +113,7 @@ private:
public:
DigitalSignaturesDialog( Window* pParent, cssu::Reference<
- css::lang::XMultiServiceFactory >& rxMSF, DocumentSignatureMode eMode,
+ cssu::XComponentContext >& rxCtx, DocumentSignatureMode eMode,
sal_Bool bReadOnly );
~DigitalSignaturesDialog();
diff --git a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
index 0feae0e5ad77..0b98ae55306f 100644
--- a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: xmlsignaturehelper.hxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
* This file is part of OpenOffice.org.
*
@@ -41,6 +41,7 @@
#include <xmlsecurity/sigstruct.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/xml/crypto/XUriBinding.hpp>
#include <com/sun/star/xml/crypto/XSEInitializer.hpp>
@@ -55,8 +56,6 @@ class Time;
namespace com {
namespace sun {
namespace star {
-namespace lang {
- class XMultiServiceFactory; }
namespace io {
class XOutputStream;
class XInputStream; }
@@ -109,7 +108,7 @@ typedef ::std::vector<XMLSignatureVerifyResult> XMLSignatureVerifyResults;
class XMLSignatureHelper
{
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::XUriBinding > mxUriBinding;
@@ -133,7 +132,7 @@ private:
XMLSignatureHelper(const XMLSignatureHelper&);
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();
// Initialize the security context with given crypto token.