diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-08 11:12:00 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-09 05:47:36 +0000 |
commit | bcad173faaffd3a3c1e6737d94d2108cf590338d (patch) | |
tree | 8370b2186548de7302eb9109ce6ac520ecf17c3b /uui/source/iahndl-authentication.cxx | |
parent | afc755fa61cfd9645c4ed2507bdc3a06b721ed5c (diff) |
Reapply "create ErrorHandlerFlags scoped enum for error handling flags""
This effectively reverts commit 32cae6a2eaa41568888df9c8fc5605debd8d704a.
Change-Id: I15bb0a5c4acaeee6d47dd93a71601d9687d701bc
Reviewed-on: https://gerrit.libreoffice.org/34028
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'uui/source/iahndl-authentication.cxx')
-rw-r--r-- | uui/source/iahndl-authentication.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx index 9e07550ee5db..3701f73886c7 100644 --- a/uui/source/iahndl-authentication.cxx +++ b/uui/source/iahndl-authentication.cxx @@ -113,8 +113,8 @@ executeLoginDialog( if ( bCanUseSysCreds ) xDialog->SetUseSystemCredentials( rInfo.GetIsUseSystemCredentials() ); - rInfo.SetResult(xDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : - ERRCODE_BUTTON_CANCEL); + rInfo.SetResult(xDialog->Execute() == RET_OK ? ErrorHandlerFlags::ButtonsOk : + ErrorHandlerFlags::ButtonsCancel); rInfo.SetUserName(xDialog->GetName()); rInfo.SetPassword(xDialog->GetPassword()); rInfo.SetAccount(xDialog->GetAccount()); @@ -276,7 +276,7 @@ handleAuthenticationRequest_( rRequest.HasRealm ? rRequest.Realm : OUString()); switch (aInfo.GetResult()) { - case ERRCODE_BUTTON_OK: + case ErrorHandlerFlags::ButtonsOk: if (xSupplyAuthentication.is()) { if (xSupplyAuthentication->canSetUserName()) @@ -390,7 +390,7 @@ handleAuthenticationRequest_( } break; - case ERRCODE_BUTTON_RETRY: + case ErrorHandlerFlags::ButtonsRetry: if (xRetry.is()) xRetry->select(); break; @@ -419,7 +419,7 @@ executeMasterPasswordDialog( ScopedVclPtrInstance< MasterPasswordCreateDialog > xDialog( pParent, xManager.get()); rInfo.SetResult(xDialog->Execute() - == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL); + == RET_OK ? ErrorHandlerFlags::ButtonsOk : ErrorHandlerFlags::ButtonsCancel); aMaster = OUStringToOString( xDialog->GetMasterPassword(), RTL_TEXTENCODING_UTF8); } @@ -428,7 +428,7 @@ executeMasterPasswordDialog( ScopedVclPtrInstance< MasterPasswordDialog > xDialog( pParent, nMode, xManager.get()); rInfo.SetResult(xDialog->Execute() - == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL); + == RET_OK ? ErrorHandlerFlags::ButtonsOk : ErrorHandlerFlags::ButtonsCancel); aMaster = OUStringToOString( xDialog->GetMasterPassword(), RTL_TEXTENCODING_UTF8); } @@ -476,7 +476,7 @@ handleMasterPasswordRequest_( switch (aInfo.GetResult()) { - case ERRCODE_BUTTON_OK: + case ErrorHandlerFlags::ButtonsOk: if (xSupplyAuthentication.is()) { if (xSupplyAuthentication->canSetPassword()) @@ -485,7 +485,7 @@ handleMasterPasswordRequest_( } break; - case ERRCODE_BUTTON_RETRY: + case ErrorHandlerFlags::ButtonsRetry: if (xRetry.is()) xRetry->select(); break; @@ -520,7 +520,7 @@ executePasswordDialog( bIsPasswordToModify, bIsSimplePasswordRequest); xDialog->SetMinLen(0); - rInfo.SetResult(xDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL); + rInfo.SetResult(xDialog->Execute() == RET_OK ? ErrorHandlerFlags::ButtonsOk : ErrorHandlerFlags::ButtonsCancel); rInfo.SetPassword(xDialog->GetPassword()); } else @@ -531,7 +531,7 @@ executePasswordDialog( ScopedVclPtr<AbstractPasswordToOpenModifyDialog> const pDialog( pFact->CreatePasswordToOpenModifyDialog(pParent, nMaxPasswdLen, bIsPasswordToModify)); - rInfo.SetResult( pDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL ); + rInfo.SetResult( pDialog->Execute() == RET_OK ? ErrorHandlerFlags::ButtonsOk : ErrorHandlerFlags::ButtonsCancel ); rInfo.SetPassword( pDialog->GetPasswordToOpen() ); rInfo.SetPasswordToModify( pDialog->GetPasswordToModify() ); rInfo.SetRecommendToOpenReadonly( pDialog->IsRecommendToOpenReadonly() ); @@ -543,7 +543,7 @@ executePasswordDialog( bIsPasswordToModify, bIsSimplePasswordRequest); xDialog->SetMinLen(0); - rInfo.SetResult(xDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL); + rInfo.SetResult(xDialog->Execute() == RET_OK ? ErrorHandlerFlags::ButtonsOk : ErrorHandlerFlags::ButtonsCancel); rInfo.SetPassword(bIsPasswordToModify ? OUString() : xDialog->GetPassword()); rInfo.SetPasswordToModify(bIsPasswordToModify ? xDialog->GetPassword() : OUString()); } @@ -582,7 +582,7 @@ handlePasswordRequest_( switch (aInfo.GetResult()) { - case ERRCODE_BUTTON_OK: + case ErrorHandlerFlags::ButtonsOk: OSL_ENSURE( !bIsPasswordToModify || xPassword2.is(), "PasswordToModify is requested, but there is no Interaction!" ); if (xPassword.is()) { @@ -597,7 +597,7 @@ handlePasswordRequest_( } break; - case ERRCODE_BUTTON_RETRY: + case ErrorHandlerFlags::ButtonsRetry: if (xRetry.is()) xRetry->select(); break; |