ScopedVclPtr vs std::unique_ptr for VclAbstractDialog derivatives

Change-Id: I5e43312b6f42ce0c63946f366eaf1e6dcb9629b2
Reviewed-on: https://gerrit.libreoffice.org/30344
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 3 insertions, 8 deletions

diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx
index 023660ad827e..e71d93a17378 100644
--- a/sd/source/ui/func/fuscale.cxx
+++ b/sd/source/ui/func/fuscale.cxx
@@ -109,14 +109,9 @@ void FuScale::DoExecute( SfxRequest& rReq )
         pZoomItem->SetValueSet( nZoomValues );
         aNewAttr.Put( *pZoomItem );
 
-        std::unique_ptr<AbstractSvxZoomDialog> pDlg;
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-        if(pFact)
-        {
-            pDlg.reset(pFact->CreateSvxZoomDialog(nullptr, aNewAttr));
-        }
-
-        if( pDlg )
+        ScopedVclPtr<AbstractSvxZoomDialog> pDlg(pFact ? pFact->CreateSvxZoomDialog(nullptr, aNewAttr) : nullptr);
+        if (pDlg)
         {
             pDlg->SetLimits( (sal_uInt16)mpWindow->GetMinZoom(), (sal_uInt16)mpWindow->GetMaxZoom() );
             sal_uInt16 nResult = pDlg->Execute();
@@ -136,7 +131,7 @@ void FuScale::DoExecute( SfxRequest& rReq )
 
             const SfxItemSet aArgs (*(pDlg->GetOutputItemSet ()));
 
-            pDlg.reset();
+            pDlg.disposeAndClear();
 
             if (!mpViewShell)
                 return;