diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-12-11 20:57:45 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-12-12 21:12:10 +0100 |
commit | 2431477337f4ac4384ba615f76bfb5904f1a3b47 (patch) | |
tree | 6f676441983e9b3c8440600d09a49478353e1faf /sc | |
parent | 23cfd3d1004f5ddda8cd79878c00b6c64f20068c (diff) |
use covariant return type for SfxPoolItem::Clone
and can then remove some casting
Change-Id: Id821c32ca2cbcdb7f57ef7a5fa1960042e630ffc
Reviewed-on: https://gerrit.libreoffice.org/85022
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/attrib.hxx | 10 | ||||
-rw-r--r-- | sc/inc/defaultsoptions.hxx | 2 | ||||
-rw-r--r-- | sc/inc/docoptio.hxx | 2 | ||||
-rw-r--r-- | sc/inc/formulaopt.hxx | 2 | ||||
-rw-r--r-- | sc/inc/patattr.hxx | 2 | ||||
-rw-r--r-- | sc/inc/printopt.hxx | 2 | ||||
-rw-r--r-- | sc/inc/viewopti.hxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/attrib.cxx | 10 | ||||
-rw-r--r-- | sc/source/core/data/global.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/patattr.cxx | 14 | ||||
-rw-r--r-- | sc/source/core/tool/defaultsoptions.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/docoptio.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/formulaopt.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/printopt.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/viewopti.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/app/uiitems.cxx | 18 | ||||
-rw-r--r-- | sc/source/ui/condformat/condformatdlg.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/condformat/condformatdlgitem.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/drtxtob.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/condformatdlgitem.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/uiitems.hxx | 18 | ||||
-rw-r--r-- | sc/source/ui/view/editsh.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwsha.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/viewfunc.cxx | 4 |
24 files changed, 56 insertions, 56 deletions
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index 5227a361834d..12f6d0256d49 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -64,7 +64,7 @@ public: virtual ~ScMergeAttr() override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual ScMergeAttr* Clone( SfxItemPool *pPool = nullptr ) const override; SCCOL GetColMerge() const {return nColMerge; } SCROW GetRowMerge() const {return nRowMerge; } @@ -93,7 +93,7 @@ public: ScMergeFlagAttr & operator =(ScMergeFlagAttr const &) = delete; // due to SfxInt16Item ScMergeFlagAttr & operator =(ScMergeFlagAttr &&) = delete; // due to SfxInt16Item - SfxPoolItem * Clone(SfxItemPool * pPool = nullptr) const override; + ScMergeFlagAttr* Clone(SfxItemPool * pPool = nullptr) const override; ScMF GetValue() const { return static_cast<ScMF>(SfxInt16Item::GetValue()); } @@ -136,7 +136,7 @@ public: const IntlWrapper& rIntl ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual ScProtectionAttr* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -177,7 +177,7 @@ public: virtual ~ScPageHFItem() override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual ScPageHFItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -206,7 +206,7 @@ public: ScViewObjectModeItem & operator =(ScViewObjectModeItem &&) = delete; // due to SfxEnumItem<ScVObjMode> virtual sal_uInt16 GetValueCount() const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual ScViewObjectModeItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx index 1afef1a58b34..c1fbdcde7bc8 100644 --- a/sc/inc/defaultsoptions.hxx +++ b/sc/inc/defaultsoptions.hxx @@ -52,7 +52,7 @@ public: ScTpDefaultsItem & operator =(ScTpDefaultsItem &&) = delete; // due to SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual ScTpDefaultsItem* Clone( SfxItemPool *pPool = nullptr ) const override; const ScDefaultsOptions& GetDefaultsOptions() const { return theOptions; } diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx index 215ba4ee29a3..9af25f3a2af4 100644 --- a/sc/inc/docoptio.hxx +++ b/sc/inc/docoptio.hxx @@ -146,7 +146,7 @@ public: ScTpCalcItem & operator =(ScTpCalcItem &&) = delete; // due to SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual ScTpCalcItem* Clone( SfxItemPool *pPool = nullptr ) const override; const ScDocOptions& GetDocOptions() const { return theOptions; } diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx index ba38c8735d4e..3c6685d38b75 100644 --- a/sc/inc/formulaopt.hxx +++ b/sc/inc/formulaopt.hxx @@ -87,7 +87,7 @@ public: ScTpFormulaItem & operator =(ScTpFormulaItem &&) = delete; // due to SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual ScTpFormulaItem* Clone( SfxItemPool *pPool = nullptr ) const override; const ScFormulaOptions& GetFormulaOptions() const { return theOptions; } diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx index 7c6b6058520d..9ecc7c0d4e22 100644 --- a/sc/inc/patattr.hxx +++ b/sc/inc/patattr.hxx @@ -62,7 +62,7 @@ public: virtual ~ScPatternAttr() override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual ScPatternAttr* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==(const SfxPoolItem& rCmp) const override; diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx index 20ed1ede5968..d305a8830dd9 100644 --- a/sc/inc/printopt.hxx +++ b/sc/inc/printopt.hxx @@ -60,7 +60,7 @@ public: ScTpPrintItem & operator =(ScTpPrintItem &&) = delete; // due to SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual ScTpPrintItem* Clone( SfxItemPool *pPool = nullptr ) const override; const ScPrintOptions& GetPrintOptions() const { return theOptions; } diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index b3dc9608bdbe..75484cd7e109 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -123,7 +123,7 @@ public: ScTpViewItem & operator =(ScTpViewItem &&) = delete; // due to SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual ScTpViewItem* Clone( SfxItemPool *pPool = nullptr ) const override; const ScViewOptions& GetViewOptions() const { return theOptions; } diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index 04a607bf7a10..1a155a8fa13d 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -108,7 +108,7 @@ bool ScMergeAttr::operator==( const SfxPoolItem& rItem ) const && (nRowMerge == static_cast<const ScMergeAttr&>(rItem).nRowMerge); } -SfxPoolItem* ScMergeAttr::Clone( SfxItemPool * ) const +ScMergeAttr* ScMergeAttr::Clone( SfxItemPool * ) const { return new ScMergeAttr(*this); } @@ -139,7 +139,7 @@ ScMergeFlagAttr::~ScMergeFlagAttr() { } -SfxPoolItem * ScMergeFlagAttr::Clone(SfxItemPool *) const +ScMergeFlagAttr* ScMergeFlagAttr::Clone(SfxItemPool *) const { return new ScMergeFlagAttr(*this); } @@ -341,7 +341,7 @@ bool ScProtectionAttr::operator==( const SfxPoolItem& rItem ) const && (bHidePrint == static_cast<const ScProtectionAttr&>(rItem).bHidePrint); } -SfxPoolItem* ScProtectionAttr::Clone( SfxItemPool * ) const +ScProtectionAttr* ScProtectionAttr::Clone( SfxItemPool * ) const { return new ScProtectionAttr(*this); } @@ -464,7 +464,7 @@ bool ScPageHFItem::operator==( const SfxPoolItem& rItem ) const && ScGlobal::EETextObjEqual(pRightArea.get(), r.pRightArea.get()); } -SfxPoolItem* ScPageHFItem::Clone( SfxItemPool* ) const +ScPageHFItem* ScPageHFItem::Clone( SfxItemPool* ) const { return new ScPageHFItem( *this ); } @@ -553,7 +553,7 @@ sal_uInt16 ScViewObjectModeItem::GetValueCount() const return 2; } -SfxPoolItem* ScViewObjectModeItem::Clone( SfxItemPool* ) const +ScViewObjectModeItem* ScViewObjectModeItem::Clone( SfxItemPool* ) const { return new ScViewObjectModeItem( *this ); } diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 050fd823b4ee..c657bd81defc 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -229,7 +229,7 @@ void ScGlobal::SetSearchItem( const SvxSearchItem& rNew ) assert(!bThreadedGroupCalcInProgress); // FIXME: An assignment operator would be nice here delete pSearchItem; - pSearchItem = static_cast<SvxSearchItem*>(rNew.Clone()); + pSearchItem = rNew.Clone(); pSearchItem->SetWhich( SID_SEARCH_ITEM ); pSearchItem->SetAppFlag( SvxSearchApp::CALC ); diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index d7fc012873ae..c2a293cc04b4 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -100,7 +100,7 @@ ScPatternAttr::~ScPatternAttr() { } -SfxPoolItem* ScPatternAttr::Clone( SfxItemPool *pPool ) const +ScPatternAttr* ScPatternAttr::Clone( SfxItemPool *pPool ) const { ScPatternAttr* pPattern = new ScPatternAttr( GetItemSet().Clone(true, pPool) ); @@ -671,10 +671,10 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r } else // Everything directly from Pattern { - aColorItem.reset(static_cast<SvxColorItem*>(rSrcSet.Get(ATTR_FONT_COLOR).Clone())); - aFontItem.reset(static_cast<SvxFontItem*>(rSrcSet.Get(ATTR_FONT).Clone())); - aCjkFontItem.reset(static_cast<SvxFontItem*>(rSrcSet.Get(ATTR_CJK_FONT).Clone())); - aCtlFontItem.reset(static_cast<SvxFontItem*>(rSrcSet.Get(ATTR_CTL_FONT).Clone())); + aColorItem.reset(rSrcSet.Get(ATTR_FONT_COLOR).Clone()); + aFontItem.reset(rSrcSet.Get(ATTR_FONT).Clone()); + aCjkFontItem.reset(rSrcSet.Get(ATTR_CJK_FONT).Clone()); + aCtlFontItem.reset(rSrcSet.Get(ATTR_CTL_FONT).Clone()); nTHeight = rSrcSet.Get( ATTR_FONT_HEIGHT ).GetHeight(); nCjkTHeight = rSrcSet.Get( ATTR_CJK_FONT_HEIGHT ).GetHeight(); nCtlTHeight = rSrcSet.Get( ATTR_CTL_FONT_HEIGHT ).GetHeight(); @@ -684,8 +684,8 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r eItalic = rSrcSet.Get( ATTR_FONT_POSTURE ).GetValue(); eCjkItalic = rSrcSet.Get( ATTR_CJK_FONT_POSTURE ).GetValue(); eCtlItalic = rSrcSet.Get( ATTR_CTL_FONT_POSTURE ).GetValue(); - aUnderlineItem.reset(static_cast<SvxUnderlineItem*>(rSrcSet.Get(ATTR_FONT_UNDERLINE).Clone())); - aOverlineItem.reset(static_cast<SvxOverlineItem*>(rSrcSet.Get(ATTR_FONT_OVERLINE).Clone())); + aUnderlineItem.reset(rSrcSet.Get(ATTR_FONT_UNDERLINE).Clone()); + aOverlineItem.reset(rSrcSet.Get(ATTR_FONT_OVERLINE).Clone()); bWordLine = rSrcSet.Get( ATTR_FONT_WORDLINE ).GetValue(); eStrike = rSrcSet.Get( ATTR_FONT_CROSSEDOUT ).GetValue(); bOutline = rSrcSet.Get( ATTR_FONT_CONTOUR ).GetValue(); diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx index af8b5fc7b60b..e0221fcdda73 100644 --- a/sc/source/core/tool/defaultsoptions.cxx +++ b/sc/source/core/tool/defaultsoptions.cxx @@ -60,7 +60,7 @@ bool ScTpDefaultsItem::operator==( const SfxPoolItem& rItem ) const return ( theOptions == rPItem.theOptions ); } -SfxPoolItem* ScTpDefaultsItem::Clone( SfxItemPool * ) const +ScTpDefaultsItem* ScTpDefaultsItem::Clone( SfxItemPool * ) const { return new ScTpDefaultsItem( *this ); } diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx index d374fab692da..5d289f416631 100644 --- a/sc/source/core/tool/docoptio.cxx +++ b/sc/source/core/tool/docoptio.cxx @@ -129,7 +129,7 @@ bool ScTpCalcItem::operator==( const SfxPoolItem& rItem ) const return ( theOptions == rPItem.theOptions ); } -SfxPoolItem* ScTpCalcItem::Clone( SfxItemPool * ) const +ScTpCalcItem* ScTpCalcItem::Clone( SfxItemPool * ) const { return new ScTpCalcItem( *this ); } diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx index aba7aa06587a..cee35333f0a9 100644 --- a/sc/source/core/tool/formulaopt.cxx +++ b/sc/source/core/tool/formulaopt.cxx @@ -142,7 +142,7 @@ bool ScTpFormulaItem::operator==( const SfxPoolItem& rItem ) const return ( theOptions == rPItem.theOptions ); } -SfxPoolItem* ScTpFormulaItem::Clone( SfxItemPool * ) const +ScTpFormulaItem* ScTpFormulaItem::Clone( SfxItemPool * ) const { return new ScTpFormulaItem( *this ); } diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx index 5d0cb087ffcb..16b5222a3887 100644 --- a/sc/source/core/tool/printopt.cxx +++ b/sc/source/core/tool/printopt.cxx @@ -66,7 +66,7 @@ bool ScTpPrintItem::operator==( const SfxPoolItem& rItem ) const return ( theOptions == rPItem.theOptions ); } -SfxPoolItem* ScTpPrintItem::Clone( SfxItemPool * ) const +ScTpPrintItem* ScTpPrintItem::Clone( SfxItemPool * ) const { return new ScTpPrintItem( *this ); } diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index 3e532252d7df..192d6c61f1bf 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -194,7 +194,7 @@ bool ScTpViewItem::operator==( const SfxPoolItem& rItem ) const return ( theOptions == rPItem.theOptions ); } -SfxPoolItem* ScTpViewItem::Clone( SfxItemPool * ) const +ScTpViewItem* ScTpViewItem::Clone( SfxItemPool * ) const { return new ScTpViewItem( *this ); } diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index bd938e9611c0..0e0c2c502d9c 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.cxx @@ -68,7 +68,7 @@ bool ScInputStatusItem::operator==( const SfxPoolItem& rItem ) const //TODO: Compare Edit data! } -SfxPoolItem* ScInputStatusItem::Clone( SfxItemPool * ) const +ScInputStatusItem* ScInputStatusItem::Clone( SfxItemPool * ) const { return new ScInputStatusItem( *this ); } @@ -147,7 +147,7 @@ bool ScSortItem::operator==( const SfxPoolItem& rItem ) const && (theSortData == rOther.theSortData) ); } -SfxPoolItem* ScSortItem::Clone( SfxItemPool * ) const +ScSortItem* ScSortItem::Clone( SfxItemPool * ) const { return new ScSortItem( *this ); } @@ -234,7 +234,7 @@ bool ScQueryItem::operator==( const SfxPoolItem& rItem ) const && (*mpQueryData == *rQueryItem.mpQueryData) ); } -SfxPoolItem* ScQueryItem::Clone( SfxItemPool * ) const +ScQueryItem* ScQueryItem::Clone( SfxItemPool * ) const { return new ScQueryItem( *this ); } @@ -269,7 +269,7 @@ bool ScSubTotalItem::operator==( const SfxPoolItem& rItem ) const && (theSubTotalData == rSTItem.theSubTotalData) ); } -SfxPoolItem* ScSubTotalItem::Clone( SfxItemPool * ) const +ScSubTotalItem* ScSubTotalItem::Clone( SfxItemPool * ) const { return new ScSubTotalItem( *this ); } @@ -315,7 +315,7 @@ bool ScUserListItem::operator==( const SfxPoolItem& rItem ) const return bEqual; } -SfxPoolItem* ScUserListItem::Clone( SfxItemPool * ) const +ScUserListItem* ScUserListItem::Clone( SfxItemPool * ) const { return new ScUserListItem( *this ); } @@ -345,7 +345,7 @@ bool ScConsolidateItem::operator==( const SfxPoolItem& rItem ) const return ( theConsData == rCItem.theConsData); } -SfxPoolItem* ScConsolidateItem::Clone( SfxItemPool * ) const +ScConsolidateItem* ScConsolidateItem::Clone( SfxItemPool * ) const { return new ScConsolidateItem( *this ); } @@ -390,7 +390,7 @@ bool ScPivotItem::operator==( const SfxPoolItem& rItem ) const bNewSheet == rPItem.bNewSheet ); } -SfxPoolItem* ScPivotItem::Clone( SfxItemPool * ) const +ScPivotItem* ScPivotItem::Clone( SfxItemPool * ) const { return new ScPivotItem( *this ); } @@ -414,7 +414,7 @@ bool ScSolveItem::operator==( const SfxPoolItem& rItem ) const return ( theSolveData == rPItem.theSolveData ); } -SfxPoolItem* ScSolveItem::Clone( SfxItemPool * ) const +ScSolveItem* ScSolveItem::Clone( SfxItemPool * ) const { return new ScSolveItem( *this ); } @@ -438,7 +438,7 @@ bool ScTabOpItem::operator==( const SfxPoolItem& rItem ) const return ( theTabOpData == rPItem.theTabOpData ); } -SfxPoolItem* ScTabOpItem::Clone( SfxItemPool * ) const +ScTabOpItem* ScTabOpItem::Clone( SfxItemPool * ) const { return new ScTabOpItem( *this ); } 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<ScCondFormatDlgItem*>(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); } diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 6cc27d4368c3..f3bd9f7cb9cf 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -232,7 +232,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) } else { - aNewItem.reset(static_cast<SvxFontItem*>(rItem.Clone())); + aNewItem.reset(rItem.Clone()); } } else diff --git a/sc/source/ui/inc/condformatdlgitem.hxx b/sc/source/ui/inc/condformatdlgitem.hxx index 89523b9c237b..52c4f4ddc944 100644 --- a/sc/source/ui/inc/condformatdlgitem.hxx +++ b/sc/source/ui/inc/condformatdlgitem.hxx @@ -48,7 +48,7 @@ public: ScCondFormatDlgItem & operator =(ScCondFormatDlgItem &&) = delete; // due to SfxPoolItem virtual bool operator==(const SfxPoolItem&) const override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual ScCondFormatDlgItem* Clone(SfxItemPool* pPool = nullptr) const override; bool IsManaged() const; condformat::dialog::ScCondFormatDialogType GetDialogType() const; diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 7ed2c35c6233..5c4284101215 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -62,7 +62,7 @@ public: virtual ~ScInputStatusItem() override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual ScInputStatusItem* Clone( SfxItemPool *pPool = nullptr ) const override; const ScAddress& GetPos() const { return aCursorPos; } @@ -135,7 +135,7 @@ public: const ScSortParam* pSortData ); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual ScSortItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; ScViewData* GetViewData () const { return pViewData; } @@ -158,7 +158,7 @@ public: virtual ~ScQueryItem() override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual ScQueryItem* Clone( SfxItemPool *pPool = nullptr ) const override; ScViewData* GetViewData () const { return pViewData; } const ScQueryParam& GetQueryData() const; @@ -183,7 +183,7 @@ public: const ScSubTotalParam* pSubTotalData ); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual ScSubTotalItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; ScViewData* GetViewData () const { return pViewData; } @@ -202,7 +202,7 @@ public: virtual ~ScUserListItem() override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual ScUserListItem* Clone( SfxItemPool *pPool = nullptr ) const override; void SetUserList ( const ScUserList& rUserList ); ScUserList* GetUserList () const { return pUserList.get(); } @@ -218,7 +218,7 @@ public: const ScConsolidateParam* pParam ); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual ScConsolidateItem* Clone( SfxItemPool *pPool = nullptr ) const override; const ScConsolidateParam& GetData() const { return theConsData; } @@ -235,7 +235,7 @@ public: virtual ~ScPivotItem() override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual ScPivotItem* Clone( SfxItemPool *pPool = nullptr ) const override; const ScDPSaveData& GetData() const { return *pSaveData; } const ScRange& GetDestRange() const { return aDestRange; } @@ -254,7 +254,7 @@ public: const ScSolveParam* pParam ); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual ScSolveItem* Clone( SfxItemPool *pPool = nullptr ) const override; const ScSolveParam& GetData() const { return theSolveData; } @@ -269,7 +269,7 @@ public: const ScTabOpParam* pParam ); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual ScTabOpItem* Clone( SfxItemPool *pPool = nullptr ) const override; const ScTabOpParam& GetData() const { return theTabOpData; } diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 61888c663ef4..c5d94206969d 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -414,7 +414,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) } else { - aNewItem.reset(static_cast<SvxFontItem*>(rItem.Clone())); + aNewItem.reset(rItem.Clone()); } // tdf#125054 force Item to correct intended ID diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index 76b7e288c803..37d7fc1e2100 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -505,8 +505,8 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OString &rName //Fix border incorrect for RTL fdo#62399 if( pDoc->IsLayoutRTL( GetViewData().GetTabNo() ) ) { - std::shared_ptr<SvxBoxItem> aNewFrame(static_cast<SvxBoxItem*>(aLineOuter->Clone())); - std::shared_ptr<SvxBoxInfoItem> aTempInfo(static_cast<SvxBoxInfoItem*>(aLineInner->Clone())); + std::shared_ptr<SvxBoxItem> aNewFrame(aLineOuter->Clone()); + std::shared_ptr<SvxBoxInfoItem> aTempInfo(aLineInner->Clone()); if ( aLineInner->IsValid(SvxBoxInfoItemValidFlags::LEFT) ) aNewFrame->SetLine( aLineOuter->GetLeft(), SvxBoxItemLine::RIGHT ); diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 1dbb1c17221e..34ab3558c791 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -874,8 +874,8 @@ void ScViewFunc::GetSelectionFrame( GetViewData().GetCurY(), GetViewData().GetTabNo() ); - rLineOuter.reset(static_cast<SvxBoxItem*>(pAttrs->GetItem(ATTR_BORDER).Clone())); - rLineInner.reset(static_cast<SvxBoxInfoItem*>(pAttrs->GetItem(ATTR_BORDER_INNER).Clone())); + rLineOuter.reset(pAttrs->GetItem(ATTR_BORDER).Clone()); + rLineInner.reset(pAttrs->GetItem(ATTR_BORDER_INNER).Clone()); rLineInner->SetTable(false); rLineInner->SetDist(true); |