[Libreoffice-commits] core.git: uui/source

[Caolán McNamara]

 uui/source/iahndl-authentication.cxx |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit cd3e9457dac61766791adb59032b0202c0037505
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri May 8 12:56:07 2015 +0100

    VclPtr: presumably these also leak
    
    Change-Id: I6118e908e2c56f67593315e8d8499b28b9489810

diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index 47ed642..3249e9d 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -88,8 +88,7 @@ executeLoginDialog(
         if (!bCanUseSysCreds)
             nFlags |= LF_NO_USESYSCREDS;
 
-        VclPtr< LoginDialog > xDialog(
-                VclPtr<LoginDialog>::Create(pParent, nFlags, rInfo.GetServer(), rRealm));
+        ScopedVclPtrInstance< LoginDialog > xDialog(pParent, nFlags, rInfo.GetServer(), rRealm);
         if (!rInfo.GetErrorText().isEmpty())
             xDialog->SetErrorText(rInfo.GetErrorText());
         xDialog->SetName(rInfo.GetUserName());
@@ -417,8 +416,8 @@ executeMasterPasswordDialog(
         boost::scoped_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui"));
         if( nMode == task::PasswordRequestMode_PASSWORD_CREATE )
         {
-            VclPtr< MasterPasswordCreateDialog > xDialog(
-                VclPtr<MasterPasswordCreateDialog>::Create(pParent, xManager.get()));
+            ScopedVclPtrInstance< MasterPasswordCreateDialog > xDialog(
+                pParent, xManager.get());
             rInfo.SetResult(xDialog->Execute()
                 == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL);
             aMaster = OUStringToOString(
@@ -426,8 +425,8 @@ executeMasterPasswordDialog(
         }
         else
         {
-            VclPtr< MasterPasswordDialog > xDialog(
-                VclPtr<MasterPasswordDialog>::Create(pParent, nMode, xManager.get()));
+            ScopedVclPtrInstance< MasterPasswordDialog > xDialog(
+                pParent, nMode, xManager.get());
             rInfo.SetResult(xDialog->Execute()
                 == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL);
             aMaster = OUStringToOString(