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

[Caolán McNamara]

 uui/source/iahndl-locking.cxx |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

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

    VclPtr: presumably these also leak
    
    Change-Id: Ib92a1d91464bc95a80415e1651bac78a65a8b31d

diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx
index cd55c38..db43be7 100644
--- a/uui/source/iahndl-locking.cxx
+++ b/uui/source/iahndl-locking.cxx
@@ -160,8 +160,7 @@ handleChangedByOthersRequest_(
         if (!xManager.get())
             return;
 
-        VclPtr< FileChangedQueryBox > xDialog(
-            VclPtr<FileChangedQueryBox>::Create( pParent, xManager.get() ) );
+        ScopedVclPtrInstance< FileChangedQueryBox > xDialog(pParent, xManager.get());
         sal_Int32 nResult = xDialog->Execute();
 
         if ( nResult == RET_YES )
@@ -195,8 +194,7 @@ handleLockFileIgnoreRequest_(
         if (!xManager.get())
             return;
 
-        VclPtr< LockFailedQueryBox > xDialog(
-            VclPtr<LockFailedQueryBox>::Create( pParent, xManager.get() ) );
+        ScopedVclPtrInstance< LockFailedQueryBox > xDialog(pParent, xManager.get());
         sal_Int32 nResult = xDialog->Execute();
 
         if ( nResult == RET_OK )
commit fdb363b43f515827a6b98877ea28a7ed0958ca69
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri May 8 12:49:30 2015 +0100

    VclPtr: AlreadyOpenQueryBox doesn't get deleted
    
    Change-Id: I793b4377067bd3abc92c943aa0005fd4771b1460

diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx
index 0b7c5cf..cd55c38 100644
--- a/uui/source/iahndl-locking.cxx
+++ b/uui/source/iahndl-locking.cxx
@@ -120,11 +120,10 @@ handleLockedDocumentRequest_(
             aMessage = UUIInteractionHelper::replaceMessageWithArguments(
                 aMessage, aArguments );
 
-            VclPtr< AlreadyOpenQueryBox > xDialog(
-                VclPtr<AlreadyOpenQueryBox>::Create( pParent,
+            ScopedVclPtrInstance< AlreadyOpenQueryBox > xDialog( pParent,
                                          xManager.get(),
                                          aMessage,
-                                         nMode == UUI_DOC_OWN_SAVE_LOCK ) );
+                                         nMode == UUI_DOC_OWN_SAVE_LOCK );
             nResult = xDialog->Execute();
         }