diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-10 15:00:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-14 09:04:05 +0100 |
| commit | de63114d76433b5a1f1ed0286e28545c72330630 (patch) | |
| tree | c5f5a94ef26475021a88f3d2b11f5af1eed6a7da /sd | |
| parent | b0f22a54c4c6f45f173b91d051b34d176cbab629 (diff) | |
no need to test for the presence of the dialog factory
Change-Id: I3994b2fcd552ce616d8a2e6fa144069853966a61
Reviewed-on: https://gerrit.libreoffice.org/66100
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/drviews3.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/outlnvs2.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview2.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 7d0d48fed5d3..90ec37b63b08 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -295,7 +295,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) case SID_INSERT_DATE_TIME: { SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); - VclPtr<AbstractHeaderFooterDialog> pDlg(pFact ? pFact->CreateHeaderFooterDialog( this, GetActiveWindow(), GetDoc(), mpActualPage ) : nullptr); + VclPtr<AbstractHeaderFooterDialog> pDlg(pFact->CreateHeaderFooterDialog( this, GetActiveWindow(), GetDoc(), mpActualPage )); std::shared_ptr<SfxRequest> xRequest(new SfxRequest(rReq)); rReq.Ignore(); // the 'old' request is not relevant any more pDlg->StartExecuteAsync([this, xRequest](sal_Int32 /*nResult*/){ diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index 7526d58275e0..867ebe45bc4f 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -570,7 +570,7 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq) // Dialog... SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); vcl::Window* pWin = GetActiveWindow(); - ScopedVclPtr<AbstractSdModifyFieldDlg> pDlg(pFact ? pFact->CreateSdModifyFieldDlg(pWin ? pWin->GetFrameWeld() : nullptr, pFldItem->GetField(), pOutlinerView->GetAttribs() ) : nullptr); + ScopedVclPtr<AbstractSdModifyFieldDlg> pDlg(pFact->CreateSdModifyFieldDlg(pWin ? pWin->GetFrameWeld() : nullptr, pFldItem->GetField(), pOutlinerView->GetAttribs() )); if( pDlg->Execute() == RET_OK ) { std::unique_ptr<SvxFieldData> pField(pDlg->GetField()); diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index e9fd56d3d8d0..8b7975bfabf6 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -874,7 +874,7 @@ bool View::GetExchangeList (std::vector<OUString> &rExchangeList, OUString aDesc(SdResId(STR_DESC_NAMEGROUP)); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact ? pFact->CreateSvxNameDialog(mpViewSh->GetFrameWeld(), aNewName, aDesc) : nullptr); + ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(mpViewSh->GetFrameWeld(), aNewName, aDesc)); pDlg->SetEditHelpId( HID_SD_NAMEDIALOG_OBJECT ); |