summaryrefslogtreecommitdiff
path: root/uui/source/iahndl-authentication.cxx
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2017-04-17 09:37:31 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2017-04-25 23:27:56 +0200
commit41f5c11c3b5f5b57f480dd809b850fe563b53691 (patch)
treedf139718c1c5249de728e697b6aea74152874fe0 /uui/source/iahndl-authentication.cxx
parentc67a0d0f7ddd8ababa3197d86998979c1ce725d0 (diff)
vcl: change ErrorHandlerFlags to DialogMask
Change-Id: I1959ac97f679d8d719f851f9869962b39a20ded9 Reviewed-on: https://gerrit.libreoffice.org/36841 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'uui/source/iahndl-authentication.cxx')
-rw-r--r--uui/source/iahndl-authentication.cxx26
1 files changed, 13 insertions, 13 deletions
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index 11b1062dbc08..d4ee48a759c2 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -114,8 +114,8 @@ executeLoginDialog(
if ( bCanUseSysCreds )
xDialog->SetUseSystemCredentials( rInfo.GetIsUseSystemCredentials() );
- rInfo.SetResult(xDialog->Execute() == RET_OK ? ErrorHandlerFlags::ButtonsOk :
- ErrorHandlerFlags::ButtonsCancel);
+ rInfo.SetResult(xDialog->Execute() == RET_OK ? DialogMask::ButtonsOk :
+ DialogMask::ButtonsCancel);
rInfo.SetUserName(xDialog->GetName());
rInfo.SetPassword(xDialog->GetPassword());
rInfo.SetAccount(xDialog->GetAccount());
@@ -277,7 +277,7 @@ handleAuthenticationRequest_(
rRequest.HasRealm ? rRequest.Realm : OUString());
switch (aInfo.GetResult())
{
- case ErrorHandlerFlags::ButtonsOk:
+ case DialogMask::ButtonsOk:
if (xSupplyAuthentication.is())
{
if (xSupplyAuthentication->canSetUserName())
@@ -391,7 +391,7 @@ handleAuthenticationRequest_(
}
break;
- case ErrorHandlerFlags::ButtonsRetry:
+ case DialogMask::ButtonsRetry:
if (xRetry.is())
xRetry->select();
break;
@@ -420,7 +420,7 @@ executeMasterPasswordDialog(
ScopedVclPtrInstance< MasterPasswordCreateDialog > xDialog(
pParent, xManager.get());
rInfo.SetResult(xDialog->Execute()
- == RET_OK ? ErrorHandlerFlags::ButtonsOk : ErrorHandlerFlags::ButtonsCancel);
+ == RET_OK ? DialogMask::ButtonsOk : DialogMask::ButtonsCancel);
aMaster = OUStringToOString(
xDialog->GetMasterPassword(), RTL_TEXTENCODING_UTF8);
}
@@ -429,7 +429,7 @@ executeMasterPasswordDialog(
ScopedVclPtrInstance< MasterPasswordDialog > xDialog(
pParent, nMode, xManager.get());
rInfo.SetResult(xDialog->Execute()
- == RET_OK ? ErrorHandlerFlags::ButtonsOk : ErrorHandlerFlags::ButtonsCancel);
+ == RET_OK ? DialogMask::ButtonsOk : DialogMask::ButtonsCancel);
aMaster = OUStringToOString(
xDialog->GetMasterPassword(), RTL_TEXTENCODING_UTF8);
}
@@ -477,7 +477,7 @@ handleMasterPasswordRequest_(
switch (aInfo.GetResult())
{
- case ErrorHandlerFlags::ButtonsOk:
+ case DialogMask::ButtonsOk:
if (xSupplyAuthentication.is())
{
if (xSupplyAuthentication->canSetPassword())
@@ -486,7 +486,7 @@ handleMasterPasswordRequest_(
}
break;
- case ErrorHandlerFlags::ButtonsRetry:
+ case DialogMask::ButtonsRetry:
if (xRetry.is())
xRetry->select();
break;
@@ -521,7 +521,7 @@ executePasswordDialog(
bIsPasswordToModify, bIsSimplePasswordRequest);
xDialog->SetMinLen(0);
- rInfo.SetResult(xDialog->Execute() == RET_OK ? ErrorHandlerFlags::ButtonsOk : ErrorHandlerFlags::ButtonsCancel);
+ rInfo.SetResult(xDialog->Execute() == RET_OK ? DialogMask::ButtonsOk : DialogMask::ButtonsCancel);
rInfo.SetPassword(xDialog->GetPassword());
}
else
@@ -532,7 +532,7 @@ executePasswordDialog(
ScopedVclPtr<AbstractPasswordToOpenModifyDialog> const pDialog(
pFact->CreatePasswordToOpenModifyDialog(pParent, nMaxPasswdLen, bIsPasswordToModify));
- rInfo.SetResult( pDialog->Execute() == RET_OK ? ErrorHandlerFlags::ButtonsOk : ErrorHandlerFlags::ButtonsCancel );
+ rInfo.SetResult( pDialog->Execute() == RET_OK ? DialogMask::ButtonsOk : DialogMask::ButtonsCancel );
rInfo.SetPassword( pDialog->GetPasswordToOpen() );
rInfo.SetPasswordToModify( pDialog->GetPasswordToModify() );
rInfo.SetRecommendToOpenReadonly( pDialog->IsRecommendToOpenReadonly() );
@@ -544,7 +544,7 @@ executePasswordDialog(
bIsPasswordToModify, bIsSimplePasswordRequest);
xDialog->SetMinLen(0);
- rInfo.SetResult(xDialog->Execute() == RET_OK ? ErrorHandlerFlags::ButtonsOk : ErrorHandlerFlags::ButtonsCancel);
+ rInfo.SetResult(xDialog->Execute() == RET_OK ? DialogMask::ButtonsOk : DialogMask::ButtonsCancel);
rInfo.SetPassword(bIsPasswordToModify ? OUString() : xDialog->GetPassword());
rInfo.SetPasswordToModify(bIsPasswordToModify ? xDialog->GetPassword() : OUString());
}
@@ -583,7 +583,7 @@ handlePasswordRequest_(
switch (aInfo.GetResult())
{
- case ErrorHandlerFlags::ButtonsOk:
+ case DialogMask::ButtonsOk:
OSL_ENSURE( !bIsPasswordToModify || xPassword2.is(), "PasswordToModify is requested, but there is no Interaction!" );
if (xPassword.is())
{
@@ -598,7 +598,7 @@ handlePasswordRequest_(
}
break;
- case ErrorHandlerFlags::ButtonsRetry:
+ case DialogMask::ButtonsRetry:
if (xRetry.is())
xRetry->select();
break;