diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-18 12:12:09 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-18 12:12:09 +0000 |
commit | e89243af790daa3a5393fac0c0691f04595d9bb3 (patch) | |
tree | 6ab7c1becfff0c14d700123a64716082e00c0ad6 /xmlsecurity/inc | |
parent | 9a214b6bcfd0168f524d4d0c5bb503b89df9295f (diff) |
INTEGRATION: CWS cmcfixes48 (1.14.22); FILE MERGED
2008/08/01 13:54:30 cmc 1.14.22.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/inc')
-rw-r--r-- | xmlsecurity/inc/xmlsecurity/macrosecurity.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx index 1ec09e87eb83..8fb05fdaa895 100644 --- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx +++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: macrosecurity.hxx,v $ - * $Revision: 1.14 $ + * $Revision: 1.15 $ * * This file is part of OpenOffice.org. * @@ -76,6 +76,7 @@ private: HelpButton maHelpBtn; PushButton maResetBtn; + cssu::Reference< cssu::XComponentContext > mxCtx; cssu::Reference< dcss::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment; SvtSecurityOptions maSecOptions; @@ -84,7 +85,7 @@ private: DECL_LINK( OkBtnHdl, void* ); public: - MacroSecurity( Window* pParent, const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment ); + MacroSecurity( Window* pParent, const cssu::Reference< cssu::XComponentContext>& rxCtx, const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment ); virtual ~MacroSecurity(); inline void EnableReset( bool _bEnable = true ); |