simplify calls to *DialogFactory::Create methods

we don't need to check for nullptr here, it's never null.

Change-Id: I3cc5337a8f4dec6747821679e39ccba3cec20f56
Reviewed-on: https://gerrit.libreoffice.org/55114
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 13 insertions, 16 deletions

diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx
index df6e0f96cc3e..7350da59c6ea 100644
--- a/sd/source/ui/func/fucushow.cxx
+++ b/sd/source/ui/func/fucushow.cxx
@@ -56,25 +56,22 @@ void FuCustomShowDlg::DoExecute( SfxRequest& )
 {
     SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
     vcl::Window* pWin = mpViewShell->GetActiveWindow();
-    ScopedVclPtr<AbstractSdCustomShowDlg> pDlg(pFact ? pFact->CreateSdCustomShowDlg(pWin ? pWin->GetFrameWeld() : nullptr, *mpDoc) : nullptr);
-    if( pDlg )
+    ScopedVclPtr<AbstractSdCustomShowDlg> pDlg( pFact->CreateSdCustomShowDlg(pWin ? pWin->GetFrameWeld() : nullptr, *mpDoc) );
+    sal_uInt16 nRet = pDlg->Execute();
+    if( pDlg->IsModified() )
     {
-        sal_uInt16 nRet = pDlg->Execute();
-        if( pDlg->IsModified() )
-        {
-            mpDoc->SetChanged();
-            sd::PresentationSettings& rSettings = mpDoc->getPresentationSettings();
-            rSettings.mbCustomShow = pDlg->IsCustomShow();
-        }
-        pDlg.disposeAndClear();
+        mpDoc->SetChanged();
+        sd::PresentationSettings& rSettings = mpDoc->getPresentationSettings();
+        rSettings.mbCustomShow = pDlg->IsCustomShow();
+    }
+    pDlg.disposeAndClear();
 
-        if( nRet == RET_YES )
-        {
-            mpViewShell->SetStartShowWithDialog(true);
+    if( nRet == RET_YES )
+    {
+        mpViewShell->SetStartShowWithDialog(true);
 
-            mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_PRESENTATION,
-                    SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
-        }
+        mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_PRESENTATION,
+                SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
     }
 }