diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-09-22 20:44:41 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-09-23 09:41:31 +0200 |
| commit | 02ab482b8fb8faa04e62f97d952f7e98cf0490fb (patch) | |
| tree | ef8535acbd906fe8e0c7279983d0604e3722a04c /sc/source/ui/attrdlg | |
| parent | 8db6083692e92389d50565bbf8643c60572e4aca (diff) | |
ScRefAddress::GetRefString never passed a null ScDocument*
so the nullptr check can be removed
and some more along that vein
Change-Id: Ic0c1f98564b6bd457edd0d3ba2a4382b7945e806
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103217
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui/attrdlg')
| -rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index a9e9ae359993..fc68fdcac16b 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -973,9 +973,9 @@ VclPtr<AbstractScSortWarningDlg> ScAbstractDialogFactory_Impl::CreateScSortWarni return VclPtr<AbstractScSortWarningDlg_Impl>::Create(std::make_unique<ScSortWarningDlg>(pParent, rExtendText, rCurrentText)); } -VclPtr<AbstractScCondFormatManagerDlg> ScAbstractDialogFactory_Impl::CreateScCondFormatMgrDlg(weld::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList ) +VclPtr<AbstractScCondFormatManagerDlg> ScAbstractDialogFactory_Impl::CreateScCondFormatMgrDlg(weld::Window* pParent, ScDocument& rDoc, const ScConditionalFormatList* pFormatList ) { - return VclPtr<AbstractScCondFormatManagerDlg_Impl>::Create(std::make_shared<ScCondFormatManagerDlg>(pParent, pDoc, pFormatList)); + return VclPtr<AbstractScCondFormatManagerDlg_Impl>::Create(std::make_shared<ScCondFormatManagerDlg>(pParent, rDoc, pFormatList)); } VclPtr<AbstractScDataPilotDatabaseDlg> ScAbstractDialogFactory_Impl::CreateScDataPilotDatabaseDlg(weld::Window* pParent) diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 65853602d8c5..fc2e992ee4be 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -690,7 +690,7 @@ public: virtual VclPtr<AbstractScSortWarningDlg> CreateScSortWarningDlg(weld::Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) override; - virtual VclPtr<AbstractScCondFormatManagerDlg> CreateScCondFormatMgrDlg(weld::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList ) override; + virtual VclPtr<AbstractScCondFormatManagerDlg> CreateScCondFormatMgrDlg(weld::Window* pParent, ScDocument& rDoc, const ScConditionalFormatList* pFormatList ) override; virtual VclPtr<AbstractScDataPilotDatabaseDlg> CreateScDataPilotDatabaseDlg(weld::Window* pParent) override; |