diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 16:17:22 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 16:17:22 +0100 |
| commit | 1fb042333fe6287756ff1fac11d18cd7c150730d (patch) | |
| tree | 595de5d187177832ce656d7832af9dce9dce2d99 /uui/source/passworddlg.cxx | |
| parent | 5b3e910e926c7dd1e8dcfe8e0a5c6cb5bd17480a (diff) | |
| parent | cd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff) | |
rebase to DEV300_m100
Diffstat (limited to 'uui/source/passworddlg.cxx')
| -rw-r--r--[-rwxr-xr-x] | uui/source/passworddlg.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx index 348d2f833e15..a6fa5134c277 100755..100644 --- a/uui/source/passworddlg.cxx +++ b/uui/source/passworddlg.cxx @@ -71,8 +71,8 @@ PasswordDialog::PasswordDialog( { if( nDialogMode == task::PasswordRequestMode_PASSWORD_REENTER ) { - const USHORT nOpenToModifyErrStrId = bOpenToModify ? STR_ERROR_PASSWORD_TO_MODIFY_WRONG : STR_ERROR_PASSWORD_TO_OPEN_WRONG; - const USHORT nErrStrId = bIsSimplePasswordRequest ? STR_ERROR_SIMPLE_PASSWORD_WRONG : nOpenToModifyErrStrId; + const sal_uInt16 nOpenToModifyErrStrId = bOpenToModify ? STR_ERROR_PASSWORD_TO_MODIFY_WRONG : STR_ERROR_PASSWORD_TO_OPEN_WRONG; + const sal_uInt16 nErrStrId = bIsSimplePasswordRequest ? STR_ERROR_SIMPLE_PASSWORD_WRONG : nOpenToModifyErrStrId; String aErrorMsg( ResId( nErrStrId, *pResourceMgr )); ErrorBox aErrorBox( this, WB_OK, aErrorMsg ); aErrorBox.Execute(); @@ -82,8 +82,8 @@ PasswordDialog::PasswordDialog( String aTitle( ResId( STR_TITLE_ENTER_PASSWORD, *pResourceMgr ) ); aFTConfirmPassword.Hide(); aEDConfirmPassword.Hide(); - aFTConfirmPassword.Enable( FALSE ); - aEDConfirmPassword.Enable( FALSE ); + aFTConfirmPassword.Enable( sal_False ); + aEDConfirmPassword.Enable( sal_False ); // settings for create password if (nDialogMode == task::PasswordRequestMode_PASSWORD_CREATE) @@ -94,8 +94,8 @@ PasswordDialog::PasswordDialog( aFTConfirmPassword.Show(); aEDConfirmPassword.Show(); - aFTConfirmPassword.Enable( TRUE ); - aEDConfirmPassword.Enable( TRUE ); + aFTConfirmPassword.Enable( sal_True ); + aEDConfirmPassword.Enable( sal_True ); } else { @@ -115,7 +115,7 @@ PasswordDialog::PasswordDialog( SetText( aTitle ); - USHORT nStrId = bOpenToModify ? STR_ENTER_PASSWORD_TO_MODIFY : STR_ENTER_PASSWORD_TO_OPEN; + sal_uInt16 nStrId = bOpenToModify ? STR_ENTER_PASSWORD_TO_MODIFY : STR_ENTER_PASSWORD_TO_OPEN; aFTPassword.SetText( String( ResId( nStrId, *pResourceMgr ) ) ); aFTPassword.SetText( aFTPassword.GetText() + aDocURL ); if (bIsSimplePasswordRequest) |