Skip to content

C
core
Kaydet (Commit) cd3e9457 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

VclPtr: presumably these also leak 

Change-Id: I6118e908e2c56f67593315e8d8499b28b9489810
üst 94cd5204
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
uui/source/iahndl-authentication.cxx
Dosyayı görüntüle @ cd3e9457
...@@ -88,8 +88,7 @@ executeLoginDialog( ...@@ -88,8 +88,7 @@ executeLoginDialog(
if (!bCanUseSysCreds) if (!bCanUseSysCreds)
nFlags |= LF_NO_USESYSCREDS; nFlags |= LF_NO_USESYSCREDS;
VclPtr< LoginDialog > xDialog( ScopedVclPtrInstance< LoginDialog > xDialog(pParent, nFlags, rInfo.GetServer(), rRealm);
VclPtr<LoginDialog>::Create(pParent, nFlags, rInfo.GetServer(), rRealm));
if (!rInfo.GetErrorText().isEmpty()) if (!rInfo.GetErrorText().isEmpty())
xDialog->SetErrorText(rInfo.GetErrorText()); xDialog->SetErrorText(rInfo.GetErrorText());
xDialog->SetName(rInfo.GetUserName()); xDialog->SetName(rInfo.GetUserName());
...@@ -417,8 +416,8 @@ executeMasterPasswordDialog( ...@@ -417,8 +416,8 @@ executeMasterPasswordDialog(
boost::scoped_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui")); boost::scoped_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui"));
if( nMode == task::PasswordRequestMode_PASSWORD_CREATE ) if( nMode == task::PasswordRequestMode_PASSWORD_CREATE )
{ {
VclPtr< MasterPasswordCreateDialog > xDialog( ScopedVclPtrInstance< MasterPasswordCreateDialog > xDialog(
VclPtr<MasterPasswordCreateDialog>::Create(pParent, xManager.get())); pParent, xManager.get());
rInfo.SetResult(xDialog->Execute() rInfo.SetResult(xDialog->Execute()
== RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL); == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL);
aMaster = OUStringToOString( aMaster = OUStringToOString(
...@@ -426,8 +425,8 @@ executeMasterPasswordDialog( ...@@ -426,8 +425,8 @@ executeMasterPasswordDialog(
} }
else else
{ {
VclPtr< MasterPasswordDialog > xDialog( ScopedVclPtrInstance< MasterPasswordDialog > xDialog(
VclPtr<MasterPasswordDialog>::Create(pParent, nMode, xManager.get())); pParent, nMode, xManager.get());
rInfo.SetResult(xDialog->Execute() rInfo.SetResult(xDialog->Execute()
== RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL); == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL);
aMaster = OUStringToOString( aMaster = OUStringToOString(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment