diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-01-26 23:47:39 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-01-27 01:54:07 +0000 |
| commit | 7595340a63be2e0fc4362c0f57451830e4017d98 (patch) | |
| tree | 00969cde76e5c35f5c0219a85bed6642e7c08f1b /uui/source/masterpassworddlg.cxx | |
| parent | 5e11ed7c4383d1b546e694d9b566690a581d589f (diff) | |
move entermasterpassword.ui to right place and adapt code
Change-Id: Ia0308990eaf1b87de1c7fd673a2a25a45fcfb366
Diffstat (limited to 'uui/source/masterpassworddlg.cxx')
| -rw-r--r-- | uui/source/masterpassworddlg.cxx | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx index a2f5c285dd40..07f11af3f554 100644 --- a/uui/source/masterpassworddlg.cxx +++ b/uui/source/masterpassworddlg.cxx @@ -20,7 +20,6 @@ #include <vcl/msgbox.hxx> #include <ids.hrc> -#include <masterpassworddlg.hrc> #include <masterpassworddlg.hxx> // MasterPasswordDialog--------------------------------------------------- @@ -40,19 +39,13 @@ MasterPasswordDialog::MasterPasswordDialog Window* pParent, ::com::sun::star::task::PasswordRequestMode aDialogMode, ResMgr* pResMgr -) : - - ModalDialog( pParent, ResId( DLG_UUI_MASTERPASSWORD, *pResMgr ) ), - - aFTMasterPassword ( this, ResId( FT_MASTERPASSWORD, *pResMgr ) ), - aEDMasterPassword ( this, ResId( ED_MASTERPASSWORD, *pResMgr ) ), - aFL ( this, ResId( FL_FIXED_LINE, *pResMgr ) ), - aOKBtn ( this, ResId( BTN_MASTERPASSWORD_OK, *pResMgr ) ), - aCancelBtn ( this, ResId( BTN_MASTERPASSWORD_CANCEL, *pResMgr ) ), - aHelpBtn ( this, ResId( BTN_MASTERPASSWORD_HELP, *pResMgr ) ), - nDialogMode ( aDialogMode ), - pResourceMgr ( pResMgr ) +) + : ModalDialog(pParent, "MasterPasswordDialog", "uui/ui/masterpassworddlg.ui") + , nDialogMode(aDialogMode) + , pResourceMgr(pResMgr) { + get(m_pEDMasterPassword, "password"); + get(m_pOKBtn, "ok"); if( nDialogMode == ::com::sun::star::task::PasswordRequestMode_PASSWORD_REENTER ) { String aErrorMsg( ResId( STR_ERROR_MASTERPASSWORD_WRONG, *pResourceMgr )); @@ -60,9 +53,7 @@ MasterPasswordDialog::MasterPasswordDialog aErrorBox.Execute(); } - FreeResource(); - - aOKBtn.SetClickHdl( LINK( this, MasterPasswordDialog, OKHdl_Impl ) ); + m_pOKBtn->SetClickHdl( LINK( this, MasterPasswordDialog, OKHdl_Impl ) ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |