summaryrefslogtreecommitdiff
path: root/uui/source/iahndl-authentication.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-04-09 16:27:42 +0200
committerStephan Bergmann <sbergman@redhat.com>2018-04-09 21:25:18 +0200
commit0b0bc5eb77ac735573482dddd6814c9763f8c6e1 (patch)
tree0c3b5c8fdb61b43454ac2cedc271127e4c14826e /uui/source/iahndl-authentication.cxx
parent0a4c1fb68c3619e61099a7c548f550b0d3fd7a53 (diff)
Remove std::bad_alloc -> css::uno::RuntimeException mappings
...that are no longer needed now that the dynamic exception specifications are gone from C++ UNO, so won't cause std::unexpected any more. Change-Id: Ie3418658f5a84e6cec1ac48e3413f523f87497fe Reviewed-on: https://gerrit.libreoffice.org/52641 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'uui/source/iahndl-authentication.cxx')
-rw-r--r--uui/source/iahndl-authentication.cxx174
1 files changed, 77 insertions, 97 deletions
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index 1852e67b6a6d..a9f0d8d3cca4 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -62,67 +62,60 @@ executeLoginDialog(
LoginErrorInfo & rInfo,
OUString const & rRealm)
{
- try
- {
- SolarMutexGuard aGuard;
-
- bool bAccount = (rInfo.GetFlags() & LOGINERROR_FLAG_MODIFY_ACCOUNT) != 0;
- bool bSavePassword = rInfo.GetCanRememberPassword();
- bool bCanUseSysCreds = rInfo.GetCanUseSystemCredentials();
-
- LoginFlags nFlags = LoginFlags::NONE;
- if (rInfo.GetErrorText().isEmpty())
- nFlags |= LoginFlags::NoErrorText;
- if (!bAccount)
- nFlags |= LoginFlags::NoAccount;
- if (!(rInfo.GetFlags() & LOGINERROR_FLAG_MODIFY_USER_NAME))
- nFlags |= LoginFlags::UsernameReadonly;
-
- if (!bSavePassword)
- nFlags |= LoginFlags::NoSavePassword;
-
- if (!bCanUseSysCreds)
- nFlags |= LoginFlags::NoUseSysCreds;
-
- ScopedVclPtrInstance< LoginDialog > xDialog(pParent, nFlags, rInfo.GetServer(), rRealm);
- if (!rInfo.GetErrorText().isEmpty())
- xDialog->SetErrorText(rInfo.GetErrorText());
- xDialog->SetName(rInfo.GetUserName());
- if (bAccount)
- xDialog->ClearAccount();
- else
- xDialog->ClearPassword();
- xDialog->SetPassword(rInfo.GetPassword());
+ SolarMutexGuard aGuard;
+
+ bool bAccount = (rInfo.GetFlags() & LOGINERROR_FLAG_MODIFY_ACCOUNT) != 0;
+ bool bSavePassword = rInfo.GetCanRememberPassword();
+ bool bCanUseSysCreds = rInfo.GetCanUseSystemCredentials();
+
+ LoginFlags nFlags = LoginFlags::NONE;
+ if (rInfo.GetErrorText().isEmpty())
+ nFlags |= LoginFlags::NoErrorText;
+ if (!bAccount)
+ nFlags |= LoginFlags::NoAccount;
+ if (!(rInfo.GetFlags() & LOGINERROR_FLAG_MODIFY_USER_NAME))
+ nFlags |= LoginFlags::UsernameReadonly;
+
+ if (!bSavePassword)
+ nFlags |= LoginFlags::NoSavePassword;
+
+ if (!bCanUseSysCreds)
+ nFlags |= LoginFlags::NoUseSysCreds;
+
+ ScopedVclPtrInstance< LoginDialog > xDialog(pParent, nFlags, rInfo.GetServer(), rRealm);
+ if (!rInfo.GetErrorText().isEmpty())
+ xDialog->SetErrorText(rInfo.GetErrorText());
+ xDialog->SetName(rInfo.GetUserName());
+ if (bAccount)
+ xDialog->ClearAccount();
+ else
+ xDialog->ClearPassword();
+ xDialog->SetPassword(rInfo.GetPassword());
- if (bSavePassword)
- {
- std::locale aLocale(Translate::Create("uui"));
- xDialog->SetSavePasswordText(
- Translate::get(rInfo.GetIsRememberPersistent()
- ? RID_SAVE_PASSWORD
- : RID_KEEP_PASSWORD,
- aLocale));
-
- xDialog->SetSavePassword(rInfo.GetIsRememberPassword());
- }
+ if (bSavePassword)
+ {
+ std::locale aLocale(Translate::Create("uui"));
+ xDialog->SetSavePasswordText(
+ Translate::get(rInfo.GetIsRememberPersistent()
+ ? RID_SAVE_PASSWORD
+ : RID_KEEP_PASSWORD,
+ aLocale));
+
+ xDialog->SetSavePassword(rInfo.GetIsRememberPassword());
+ }
- if ( bCanUseSysCreds )
- xDialog->SetUseSystemCredentials( rInfo.GetIsUseSystemCredentials() );
+ if ( bCanUseSysCreds )
+ xDialog->SetUseSystemCredentials( rInfo.GetIsUseSystemCredentials() );
- rInfo.SetResult(xDialog->Execute() == RET_OK ? DialogMask::ButtonsOk :
- DialogMask::ButtonsCancel);
- rInfo.SetUserName(xDialog->GetName());
- rInfo.SetPassword(xDialog->GetPassword());
- rInfo.SetAccount(xDialog->GetAccount());
- rInfo.SetIsRememberPassword(xDialog->IsSavePassword());
+ rInfo.SetResult(xDialog->Execute() == RET_OK ? DialogMask::ButtonsOk :
+ DialogMask::ButtonsCancel);
+ rInfo.SetUserName(xDialog->GetName());
+ rInfo.SetPassword(xDialog->GetPassword());
+ rInfo.SetAccount(xDialog->GetAccount());
+ rInfo.SetIsRememberPassword(xDialog->IsSavePassword());
- if ( bCanUseSysCreds )
- rInfo.SetIsUseSystemCredentials( xDialog->IsUseSystemCredentials() );
- }
- catch (std::bad_alloc const &)
- {
- throw uno::RuntimeException("out of memory");
- }
+ if ( bCanUseSysCreds )
+ rInfo.SetIsUseSystemCredentials( xDialog->IsUseSystemCredentials() );
}
void getRememberModes(
@@ -405,7 +398,6 @@ executeMasterPasswordDialog(
task::PasswordRequestMode nMode)
{
OString aMaster;
- try
{
SolarMutexGuard aGuard;
@@ -429,10 +421,6 @@ executeMasterPasswordDialog(
xDialog->GetMasterPassword(), RTL_TEXTENCODING_UTF8);
}
}
- catch (std::bad_alloc const &)
- {
- throw uno::RuntimeException("out of memory");
- }
sal_uInt8 aKey[RTL_DIGEST_LENGTH_MD5];
// FIXME this is subject to the SHA1-bug tdf#114939 - but this
@@ -506,51 +494,43 @@ executePasswordDialog(
bool bIsPasswordToModify,
bool bIsSimplePasswordRequest )
{
- try
- {
- SolarMutexGuard aGuard;
+ SolarMutexGuard aGuard;
- std::locale aResLocale(Translate::Create("uui"));
- if( nMode == task::PasswordRequestMode_PASSWORD_CREATE )
- {
- if (bIsSimplePasswordRequest)
- {
- std::unique_ptr<PasswordDialog> xDialog(new PasswordDialog(pParent, nMode,
- aResLocale, aDocName, bIsPasswordToModify, bIsSimplePasswordRequest));
- xDialog->SetMinLen(0);
-
- rInfo.SetResult(xDialog->run() == RET_OK ? DialogMask::ButtonsOk : DialogMask::ButtonsCancel);
- rInfo.SetPassword(xDialog->GetPassword());
- }
- else
- {
- const sal_uInt16 nMaxPasswdLen = bMSCryptoMode ? 15 : 0; // 0 -> allow any length
-
- VclAbstractDialogFactory * pFact = VclAbstractDialogFactory::Create();
- ScopedVclPtr<AbstractPasswordToOpenModifyDialog> const pDialog(
- pFact->CreatePasswordToOpenModifyDialog(pParent, nMaxPasswdLen, bIsPasswordToModify));
-
- rInfo.SetResult( pDialog->Execute() == RET_OK ? DialogMask::ButtonsOk : DialogMask::ButtonsCancel );
- rInfo.SetPassword( pDialog->GetPasswordToOpen() );
- rInfo.SetPasswordToModify( pDialog->GetPasswordToModify() );
- rInfo.SetRecommendToOpenReadonly( pDialog->IsRecommendToOpenReadonly() );
- }
- }
- else // enter password or reenter password
+ std::locale aResLocale(Translate::Create("uui"));
+ if( nMode == task::PasswordRequestMode_PASSWORD_CREATE )
+ {
+ if (bIsSimplePasswordRequest)
{
std::unique_ptr<PasswordDialog> xDialog(new PasswordDialog(pParent, nMode,
aResLocale, aDocName, bIsPasswordToModify, bIsSimplePasswordRequest));
xDialog->SetMinLen(0);
rInfo.SetResult(xDialog->run() == RET_OK ? DialogMask::ButtonsOk : DialogMask::ButtonsCancel);
- rInfo.SetPassword(bIsPasswordToModify ? OUString() : xDialog->GetPassword());
- rInfo.SetPasswordToModify(bIsPasswordToModify ? xDialog->GetPassword() : OUString());
+ rInfo.SetPassword(xDialog->GetPassword());
+ }
+ else
+ {
+ const sal_uInt16 nMaxPasswdLen = bMSCryptoMode ? 15 : 0; // 0 -> allow any length
+
+ VclAbstractDialogFactory * pFact = VclAbstractDialogFactory::Create();
+ ScopedVclPtr<AbstractPasswordToOpenModifyDialog> const pDialog(
+ pFact->CreatePasswordToOpenModifyDialog(pParent, nMaxPasswdLen, bIsPasswordToModify));
+
+ rInfo.SetResult( pDialog->Execute() == RET_OK ? DialogMask::ButtonsOk : DialogMask::ButtonsCancel );
+ rInfo.SetPassword( pDialog->GetPasswordToOpen() );
+ rInfo.SetPasswordToModify( pDialog->GetPasswordToModify() );
+ rInfo.SetRecommendToOpenReadonly( pDialog->IsRecommendToOpenReadonly() );
}
}
- catch (std::bad_alloc const &)
+ else // enter password or reenter password
{
- throw uno::RuntimeException("out of memory",
- uno::Reference< uno::XInterface>());
+ std::unique_ptr<PasswordDialog> xDialog(new PasswordDialog(pParent, nMode,
+ aResLocale, aDocName, bIsPasswordToModify, bIsSimplePasswordRequest));
+ xDialog->SetMinLen(0);
+
+ rInfo.SetResult(xDialog->run() == RET_OK ? DialogMask::ButtonsOk : DialogMask::ButtonsCancel);
+ rInfo.SetPassword(bIsPasswordToModify ? OUString() : xDialog->GetPassword());
+ rInfo.SetPasswordToModify(bIsPasswordToModify ? xDialog->GetPassword() : OUString());
}
}
generated by cgit (git 2.34.1) at 2025-03-25 13:11:34 +0000