From 2431477337f4ac4384ba615f76bfb5904f1a3b47 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 11 Dec 2019 20:57:45 +0000 Subject: use covariant return type for SfxPoolItem::Clone MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit and can then remove some casting Change-Id: Id821c32ca2cbcdb7f57ef7a5fa1960042e630ffc Reviewed-on: https://gerrit.libreoffice.org/85022 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sc/source/ui/condformat/condformatdlg.cxx | 2 +- sc/source/ui/condformat/condformatdlgitem.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sc/source/ui/condformat') diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index d07eb9a49641..b588079f0103 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -415,7 +415,7 @@ ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW, (comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView())?OUString("modules/scalc/ui/conditionalformatdialogmobile.ui"):OUString("modules/scalc/ui/conditionalformatdialog.ui")), "ConditionalFormatDialog") , mpViewData(pViewData) - , mpDlgItem(static_cast(pItem->Clone())) + , mpDlgItem(pItem->Clone()) , mpLastEdit(nullptr) , mxBtnOk(m_xBuilder->weld_button("ok")) , mxBtnAdd(m_xBuilder->weld_button("add")) diff --git a/sc/source/ui/condformat/condformatdlgitem.cxx b/sc/source/ui/condformat/condformatdlgitem.cxx index ee1713b06f04..b0bf511c3b79 100644 --- a/sc/source/ui/condformat/condformatdlgitem.cxx +++ b/sc/source/ui/condformat/condformatdlgitem.cxx @@ -33,7 +33,7 @@ bool ScCondFormatDlgItem::operator==(const SfxPoolItem& rItem) const return false; } -SfxPoolItem* ScCondFormatDlgItem::Clone(SfxItemPool* /*pPool*/) const +ScCondFormatDlgItem* ScCondFormatDlgItem::Clone(SfxItemPool* /*pPool*/) const { return new ScCondFormatDlgItem(*this); } -- cgit