diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-02-14 23:04:56 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-02-15 08:50:08 +0000 |
| commit | c163123e1f1ffb7bcaa8f2f09f2830fdfabcaef3 (patch) | |
| tree | 3b614e9ce8deed886d844799b8c6f73fd59d821f /xmlsecurity/inc | |
| parent | 62726df969887cf6578a0f69c6c3dc8f689a3b06 (diff) | |
adapt macro security dialog code to .ui
Change-Id: I0527ff30508bd7fd9182ff0bfec87aef7907f1fb
Diffstat (limited to 'xmlsecurity/inc')
| -rw-r--r-- | xmlsecurity/inc/xmlsecurity/global.hrc | 3 | ||||
| -rw-r--r-- | xmlsecurity/inc/xmlsecurity/macrosecurity.hxx | 27 |
2 files changed, 14 insertions, 16 deletions
diff --git a/xmlsecurity/inc/xmlsecurity/global.hrc b/xmlsecurity/inc/xmlsecurity/global.hrc index e4393b24f682..4675f7e6e1e3 100644 --- a/xmlsecurity/inc/xmlsecurity/global.hrc +++ b/xmlsecurity/inc/xmlsecurity/global.hrc @@ -25,9 +25,6 @@ #define RID_XMLSECTP_GENERAL 1003 #define RID_XMLSECTP_DETAILS 1004 #define RID_XMLSECTP_CERTPATH 1005 -#define RID_XMLSECTP_MACROSEC 1006 -#define RID_XMLSECTP_SECLEVEL 1007 -#define RID_XMLSECTP_TRUSTSOURCES 1008 #define RID_XMLSECTP_MACROWARN 1009 #define RID_XMLSECTP_READONLY_CONFIG_TIP 1010 #define RID_XMLSECTP_LOCK 1011 diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx index 4b500dcda4d1..42cc9a741cbb 100644 --- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx +++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx @@ -58,32 +58,33 @@ private: friend class MacroSecurityLevelTP; friend class MacroSecurityTrustedSourcesTP; - TabControl maTabCtrl; - OKButton maOkBtn; - CancelButton maCancelBtn; - HelpButton maHelpBtn; - PushButton maResetBtn; + TabControl* m_pTabCtrl; + OKButton* m_pOkBtn; + PushButton* m_pResetBtn; cssu::Reference< cssu::XComponentContext > mxCtx; cssu::Reference< dcss::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment; SvtSecurityOptions maSecOptions; + sal_uInt16 m_nSecLevelId; + sal_uInt16 m_nSecTrustId; + MacroSecurityTP* mpLevelTP; MacroSecurityTP* mpTrustSrcTP; DECL_LINK( OkBtnHdl, void* ); public: - MacroSecurity( Window* pParent, const cssu::Reference< cssu::XComponentContext>& rxCtx, const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment ); - virtual ~MacroSecurity(); + 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 ); + inline void EnableReset(bool _bEnable = true) + { + m_pResetBtn->Enable ( _bEnable ); + } }; -inline void MacroSecurity::EnableReset( bool _bEnable ) -{ - maResetBtn.Enable ( _bEnable ); -} - class MacroSecurityTP : public TabPage { protected: |