diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-02-14 23:14:31 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-02-15 08:50:08 +0000 |
commit | 0ea32acfa5f7d3ab78d4c01ef2cd03ff04503ef8 (patch) | |
tree | d5ba44ad74bbbe5c8cbb1f911f150faeaf636fab /cui/source/options | |
parent | c163123e1f1ffb7bcaa8f2f09f2830fdfabcaef3 (diff) |
move security options dialog to cui and adapt code
Change-Id: Ie1f5c5eb437c55844a524c1219b1e30e5f07b3c3
Diffstat (limited to 'cui/source/options')
-rw-r--r-- | cui/source/options/securityoptions.cxx | 14 | ||||
-rw-r--r-- | cui/source/options/securityoptions.hxx | 7 | ||||
-rw-r--r-- | cui/source/options/securityoptions.src | 1 |
3 files changed, 3 insertions, 19 deletions
diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx index f36f86349733..d0196d3219aa 100644 --- a/cui/source/options/securityoptions.cxx +++ b/cui/source/options/securityoptions.cxx @@ -43,10 +43,9 @@ namespace svx { //........................................................................ -SecurityOptionsDialog::SecurityOptionsDialog( Window* pParent, SvtSecurityOptions* pOptions ) : - ModalDialog( pParent, CUI_RES( RID_SVXDLG_SECURITY_OPTIONS ) ) - ,m_aWarningsFL ( this, CUI_RES( FL_WARNINGS ) ) - ,m_aWarningsFI ( this, CUI_RES( FI_WARNINGS ) ) +SecurityOptionsDialog::SecurityOptionsDialog(Window* pParent, SvtSecurityOptions* pOptions) + : ModalDialog(pParent, "SecurityOptionsDialog", "cui/ui/securityoptionsdialog.ui") + ,m_aSaveOrSendDocsFI( this, CUI_RES( FI_SAVESENDDOCS ) ) ,m_aSaveOrSendDocsCB( this, CUI_RES( CB_SAVESENDDOCS ) ) ,m_aSignDocsFI ( this, CUI_RES( FI_SIGNDOCS ) ) @@ -55,7 +54,6 @@ SecurityOptionsDialog::SecurityOptionsDialog( Window* pParent, SvtSecurityOption ,m_aPrintDocsCB ( this, CUI_RES( CB_PRINTDOCS ) ) ,m_aCreatePdfFI ( this, CUI_RES( FI_CREATEPDF ) ) ,m_aCreatePdfCB ( this, CUI_RES( CB_CREATEPDF ) ) - ,m_aOptionsFL ( this, CUI_RES( FL_OPTIONS ) ) ,m_aRemovePersInfoFI( this, CUI_RES( FI_REMOVEINFO ) ) ,m_aRemovePersInfoCB( this, CUI_RES( CB_REMOVEINFO ) ) ,m_aRecommPasswdFI ( this, CUI_RES( FI_RECOMMENDPWD ) ) @@ -63,13 +61,7 @@ SecurityOptionsDialog::SecurityOptionsDialog( Window* pParent, SvtSecurityOption ,m_aCtrlHyperlinkFI ( this, CUI_RES( FI_CTRLHYPERLINK ) ) ,m_aCtrlHyperlinkCB ( this, CUI_RES( CB_CTRLHYPERLINK ) ) - ,m_aButtonsFL ( this, CUI_RES( FL_BUTTONS ) ) - ,m_aOKBtn ( this, CUI_RES( PB_OK ) ) - ,m_aCancelBtn ( this, CUI_RES( PB_CANCEL ) ) - ,m_aHelpBtn ( this, CUI_RES( PB_HELP ) ) - { - FreeResource(); DBG_ASSERT( pOptions, "SecurityOptionsDialog::SecurityOptionsDialog(): invalid SvtSecurityOptions" ); enableAndSet( *pOptions, SvtSecurityOptions::E_DOCWARN_SAVEORSEND, m_aSaveOrSendDocsCB, m_aSaveOrSendDocsFI ); diff --git a/cui/source/options/securityoptions.hxx b/cui/source/options/securityoptions.hxx index b9ec14e89843..dc9cd0611df8 100644 --- a/cui/source/options/securityoptions.hxx +++ b/cui/source/options/securityoptions.hxx @@ -38,8 +38,6 @@ namespace svx class SecurityOptionsDialog : public ModalDialog { private: - FixedLine m_aWarningsFL; - FixedInfo m_aWarningsFI; ReadOnlyImage m_aSaveOrSendDocsFI; CheckBox m_aSaveOrSendDocsCB; ReadOnlyImage m_aSignDocsFI; @@ -49,7 +47,6 @@ namespace svx ReadOnlyImage m_aCreatePdfFI; CheckBox m_aCreatePdfCB; - FixedLine m_aOptionsFL; ReadOnlyImage m_aRemovePersInfoFI; CheckBox m_aRemovePersInfoCB; ReadOnlyImage m_aRecommPasswdFI; @@ -57,10 +54,6 @@ namespace svx ReadOnlyImage m_aCtrlHyperlinkFI; CheckBox m_aCtrlHyperlinkCB; - FixedLine m_aButtonsFL; - OKButton m_aOKBtn; - CancelButton m_aCancelBtn; - HelpButton m_aHelpBtn; public: SecurityOptionsDialog( Window* pParent, SvtSecurityOptions* pOptions ); diff --git a/cui/source/options/securityoptions.src b/cui/source/options/securityoptions.src index d0f333dbed97..956f0934e2c0 100644 --- a/cui/source/options/securityoptions.src +++ b/cui/source/options/securityoptions.src @@ -23,7 +23,6 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS { - HelpID = HID_DLG_SECURITY_OPTIONS ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( DLG_WIDTH , ROW_10 ) ; |