diff options
437 files changed, 988 insertions, 1188 deletions
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx index c092b3c67fe2..d89300971664 100644 --- a/avmedia/source/framework/mediaitem.cxx +++ b/avmedia/source/framework/mediaitem.cxx @@ -113,7 +113,7 @@ bool MediaItem::operator==( const SfxPoolItem& rItem ) const && m_pImpl->m_eZoom == rOther.m_pImpl->m_eZoom; } -SfxPoolItem* MediaItem::Clone( SfxItemPool* ) const +MediaItem* MediaItem::Clone( SfxItemPool* ) const { return new MediaItem( *this ); } diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index a59fbcca7048..3e2b585ad320 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -83,7 +83,7 @@ void Shell::ExecuteSearch( SfxRequest& rReq ) case SID_SEARCH_OPTIONS: break; case SID_SEARCH_ITEM: - mpSearchItem.reset( static_cast<SvxSearchItem*>( pArgs->Get(SID_SEARCH_ITEM).Clone() )); + mpSearchItem.reset(pArgs->Get(SID_SEARCH_ITEM).Clone()); break; case FID_SEARCH_ON: mbJustOpened = true; @@ -106,7 +106,7 @@ void Shell::ExecuteSearch( SfxRequest& rReq ) // Get SearchItem from request if it is the first searching if ( pArgs ) { - mpSearchItem.reset( static_cast<SvxSearchItem*>( pArgs->Get( SID_SEARCH_ITEM ).Clone() )); + mpSearchItem.reset(pArgs->Get(SID_SEARCH_ITEM).Clone()); } } diff --git a/basctl/source/basicide/sbxitem.cxx b/basctl/source/basicide/sbxitem.cxx index 0de7757a52c4..db012ec6c4fa 100644 --- a/basctl/source/basicide/sbxitem.cxx +++ b/basctl/source/basicide/sbxitem.cxx @@ -53,7 +53,7 @@ SbxItem::SbxItem ( m_eType(eType) { } -SfxPoolItem *SbxItem::Clone(SfxItemPool*) const +SbxItem* SbxItem::Clone(SfxItemPool*) const { return new SbxItem(*this); } diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx index 4e97389906fd..1d70c5dc43db 100644 --- a/basctl/source/inc/sbxitem.hxx +++ b/basctl/source/inc/sbxitem.hxx @@ -48,7 +48,7 @@ public: SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, ItemType); SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, const OUString& aMethodName, ItemType eType); - virtual SfxPoolItem* Clone(SfxItemPool *pPool = nullptr) const override; + virtual SbxItem* Clone(SfxItemPool *pPool = nullptr) const override; virtual bool operator==(const SfxPoolItem&) const override; ScriptDocument const& GetDocument () const { return m_aDocument; } diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index a077506363ee..660241519110 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -264,7 +264,7 @@ SvxChartColorTableItem::SvxChartColorTableItem( sal_uInt16 nWhich_, const SvxCha { } -SfxPoolItem* SvxChartColorTableItem::Clone( SfxItemPool * ) const +SvxChartColorTableItem* SvxChartColorTableItem::Clone( SfxItemPool * ) const { return new SvxChartColorTableItem( *this ); } diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx index 57060ba594e5..4984d1bd31e8 100644 --- a/cui/source/options/cfgchart.hxx +++ b/cui/source/options/cfgchart.hxx @@ -89,7 +89,7 @@ class SvxChartColorTableItem : public SfxPoolItem public: SvxChartColorTableItem( sal_uInt16 nWhich, const SvxChartColorTable& ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxChartColorTableItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; const SvxChartColorTable & GetColorList() const { return m_aColorTable;} diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx index f794f669f659..46742d826aa5 100644 --- a/cui/source/options/connpoolsettings.cxx +++ b/cui/source/options/connpoolsettings.cxx @@ -70,8 +70,7 @@ namespace offapp return true; } - - SfxPoolItem* DriverPoolingSettingsItem::Clone( SfxItemPool * ) const + DriverPoolingSettingsItem* DriverPoolingSettingsItem::Clone( SfxItemPool * ) const { return new DriverPoolingSettingsItem(*this); } diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx index 153ff94597e4..45c38cb9a6d7 100644 --- a/cui/source/options/connpoolsettings.hxx +++ b/cui/source/options/connpoolsettings.hxx @@ -76,7 +76,7 @@ namespace offapp DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings ); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual DriverPoolingSettingsItem* Clone( SfxItemPool *pPool = nullptr ) const override; const DriverPoolingSettings& getSettings() const { return m_aSettings; } }; diff --git a/cui/source/options/dbregistersettings.cxx b/cui/source/options/dbregistersettings.cxx index e9e2ae0fb167..f7739a1092cc 100644 --- a/cui/source/options/dbregistersettings.cxx +++ b/cui/source/options/dbregistersettings.cxx @@ -25,14 +25,12 @@ namespace svx { - DatabaseMapItem::DatabaseMapItem( sal_uInt16 _nId, const DatabaseRegistrations& _rRegistrations ) :SfxPoolItem( _nId ) ,m_aRegistrations( _rRegistrations ) { } - bool DatabaseMapItem::operator==( const SfxPoolItem& _rCompare ) const { if (!SfxPoolItem::operator==(_rCompare)) @@ -47,14 +45,11 @@ namespace svx return m_aRegistrations == pItem->m_aRegistrations; } - - SfxPoolItem* DatabaseMapItem::Clone( SfxItemPool* ) const + DatabaseMapItem* DatabaseMapItem::Clone( SfxItemPool* ) const { return new DatabaseMapItem( *this ); } - } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx index 05e1f5fadc37..ce1322a101db 100644 --- a/cui/source/options/dbregistersettings.hxx +++ b/cui/source/options/dbregistersettings.hxx @@ -68,7 +68,7 @@ namespace svx DatabaseMapItem( sal_uInt16 _nId, const DatabaseRegistrations& _rRegistrations ); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual DatabaseMapItem* Clone( SfxItemPool *pPool = nullptr ) const override; const DatabaseRegistrations& getRegistrations() const { return m_aRegistrations; } diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index d0dbae16e685..6af362814cbd 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -216,7 +216,7 @@ bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet ) const SfxUInt16Item* pIndentItem = static_cast<const SfxUInt16Item*>(GetOldItem( *rSet, SID_ATTR_ALIGN_INDENT)); assert(pIndentItem); - std::unique_ptr<SfxUInt16Item> pNewIndentItem(static_cast<SfxUInt16Item*>(pIndentItem->Clone())); + std::unique_ptr<SfxUInt16Item> pNewIndentItem(pIndentItem->Clone()); pNewIndentItem->SetValue(m_xEdIndent->get_value(FieldUnit::TWIP)); rSet->Put(*pNewIndentItem); bChanged = true; @@ -259,7 +259,7 @@ bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet ) const SdrAngleItem* pAngleItem = static_cast<const SdrAngleItem*>(GetOldItem( *rSet, SID_ATTR_ALIGN_DEGREES)); assert(pAngleItem); - std::unique_ptr<SdrAngleItem> pNewAngleItem(static_cast<SdrAngleItem*>(pAngleItem->Clone())); + std::unique_ptr<SdrAngleItem> pNewAngleItem(pAngleItem->Clone()); pNewAngleItem->SetValue(m_aCtrlDial.GetRotation()); rSet->Put(*pNewAngleItem); bChanged = true; @@ -296,7 +296,7 @@ bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet ) const SfxBoolItem* pStackItem = static_cast<const SfxBoolItem*>(GetOldItem( *rSet, SID_ATTR_ALIGN_STACKED)); assert(pStackItem); - std::unique_ptr<SfxBoolItem> pNewStackItem(static_cast<SfxBoolItem*>(pStackItem->Clone())); + std::unique_ptr<SfxBoolItem> pNewStackItem(pStackItem->Clone()); pNewStackItem->SetValue(m_xCbStacked->get_active()); rSet->Put(*pNewStackItem); bChanged = true; @@ -319,7 +319,7 @@ bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet ) const SfxBoolItem* pWrapItem = static_cast<const SfxBoolItem*>(GetOldItem( *rSet, SID_ATTR_ALIGN_LINEBREAK)); assert(pWrapItem); - std::unique_ptr<SfxBoolItem> pNewWrapItem(static_cast<SfxBoolItem*>(pWrapItem->Clone())); + std::unique_ptr<SfxBoolItem> pNewWrapItem(pWrapItem->Clone()); pNewWrapItem->SetValue(m_xBtnWrap->get_active()); rSet->Put(*pNewWrapItem); bChanged = true; @@ -333,7 +333,7 @@ bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet ) const SfxBoolItem* pHyphItem = static_cast<const SfxBoolItem*>(GetOldItem( *rSet, SID_ATTR_ALIGN_HYPHENATION)); assert(pHyphItem); - std::unique_ptr<SfxBoolItem> pNewHyphItem(static_cast<SfxBoolItem*>(pHyphItem->Clone())); + std::unique_ptr<SfxBoolItem> pNewHyphItem(pHyphItem->Clone()); pNewHyphItem->SetValue(m_xBtnHyphen->get_active()); rSet->Put(*pNewHyphItem); bChanged = true; @@ -347,7 +347,7 @@ bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet ) const SfxBoolItem* pShrinkItem = static_cast<const SfxBoolItem*>(GetOldItem( *rSet, SID_ATTR_ALIGN_SHRINKTOFIT)); assert(pShrinkItem); - std::unique_ptr<SfxBoolItem> pNewShrinkItem(static_cast<SfxBoolItem*>(pShrinkItem->Clone())); + std::unique_ptr<SfxBoolItem> pNewShrinkItem(pShrinkItem->Clone()); pNewShrinkItem->SetValue(m_xBtnShrink->get_active()); rSet->Put(*pNewShrinkItem); bChanged = true; diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index a4b4169a793c..273386c5724b 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -1728,7 +1728,7 @@ void SvxNumberFormatTabPage::PageCreated(const SfxAllItemSet& aSet) { const SvxNumberInfoItem* pNumberInfoItem = aSet.GetItem<SvxNumberInfoItem>(SID_ATTR_NUMBERFORMAT_INFO, false); if (pNumberInfoItem && !pNumItem) - pNumItem.reset( static_cast<SvxNumberInfoItem*>(pNumberInfoItem->Clone()) ); + pNumItem.reset(pNumberInfoItem->Clone()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 99d1fcb67bcd..c2592f0d944b 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -752,7 +752,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet ) (m_xRegisterCB->get_active() || m_xRegisterCB->get_state_changed_from_saved())) { const SfxBoolItem& rRegItem = static_cast<const SfxBoolItem&>(rOldSet.Get(SID_SWREGISTER_MODE)); - std::unique_ptr<SfxBoolItem> pRegItem(static_cast<SfxBoolItem*>(rRegItem.Clone())); + std::unique_ptr<SfxBoolItem> pRegItem(rRegItem.Clone()); bool bCheck = m_xRegisterCB->get_active(); pRegItem->SetValue(bCheck); rSet->Put(std::move(pRegItem)); diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 0c9734d197b4..c8ef51b1245c 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -400,7 +400,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) *rOutSet, SID_ATTR_PARA_REGISTER)); if (!pBoolItem) return bModified; - std::unique_ptr<SfxBoolItem> pRegItem(static_cast<SfxBoolItem*>(pBoolItem->Clone())); + std::unique_ptr<SfxBoolItem> pRegItem(pBoolItem->Clone()); sal_uInt16 _nWhich = GetWhich( SID_ATTR_PARA_REGISTER ); bool bSet = pRegItem->GetValue(); diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index f9b7205247cb..70ede0a40e3d 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -183,7 +183,7 @@ bool SvxTabulatorTabPage::FillItemSet(SfxItemSet* rSet) aNewTabs->Insert(aNull); } - std::unique_ptr<SvxTabStopItem> aTmp(static_cast<SvxTabStopItem*>(aNewTabs->Clone())); + std::unique_ptr<SvxTabStopItem> aTmp(aNewTabs->Clone()); aTmp->Remove(0, aTmp->Count()); for (sal_uInt16 i = 0; i < aNewTabs->Count(); ++i) diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 40efd0d7485b..d61c75314ecb 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -1071,7 +1071,7 @@ bool DbuTypeCollectionItem::operator==(const SfxPoolItem& _rItem) const static_cast<const DbuTypeCollectionItem&>( _rItem ).getCollection() == getCollection(); } -SfxPoolItem* DbuTypeCollectionItem::Clone(SfxItemPool* /*_pPool*/) const +DbuTypeCollectionItem* DbuTypeCollectionItem::Clone(SfxItemPool* /*_pPool*/) const { return new DbuTypeCollectionItem(*this); } diff --git a/dbaccess/source/ui/dlg/dsnItem.hxx b/dbaccess/source/ui/dlg/dsnItem.hxx index 7ca47d036db7..41103f8de4b8 100644 --- a/dbaccess/source/ui/dlg/dsnItem.hxx +++ b/dbaccess/source/ui/dlg/dsnItem.hxx @@ -40,7 +40,7 @@ namespace dbaui DbuTypeCollectionItem(const DbuTypeCollectionItem& _rSource); virtual bool operator==(const SfxPoolItem& _rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* _pPool = nullptr) const override; + virtual DbuTypeCollectionItem* Clone(SfxItemPool* _pPool = nullptr) const override; ::dbaccess::ODsnTypeCollection* getCollection() const { return m_pCollection; } }; diff --git a/dbaccess/source/ui/dlg/optionalboolitem.cxx b/dbaccess/source/ui/dlg/optionalboolitem.cxx index b0b4aff525b1..5eb4b1272a15 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.cxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.cxx @@ -35,7 +35,7 @@ namespace dbaui static_cast<const OptionalBoolItem&>( _rItem ).m_aValue == m_aValue; } - SfxPoolItem* OptionalBoolItem::Clone( SfxItemPool* /*_pPool*/ ) const + OptionalBoolItem* OptionalBoolItem::Clone( SfxItemPool* /*_pPool*/ ) const { return new OptionalBoolItem( *this ); } diff --git a/dbaccess/source/ui/dlg/optionalboolitem.hxx b/dbaccess/source/ui/dlg/optionalboolitem.hxx index ce0a8f0659b6..008d59046921 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.hxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.hxx @@ -36,7 +36,7 @@ namespace dbaui explicit OptionalBoolItem( sal_uInt16 nWhich ); virtual bool operator==( const SfxPoolItem& _rItem ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* _pPool = nullptr ) const override; + virtual OptionalBoolItem* Clone( SfxItemPool* _pPool = nullptr ) const override; bool HasValue() const { return !!m_aValue; } void ClearValue() { m_aValue.reset(); } diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx index 9ed631a6b7d9..7601f3030cb9 100644 --- a/dbaccess/source/ui/inc/stringlistitem.hxx +++ b/dbaccess/source/ui/inc/stringlistitem.hxx @@ -40,7 +40,7 @@ public: OStringListItem(const OStringListItem& _rSource); virtual bool operator==(const SfxPoolItem& _rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* _pPool = nullptr) const override; + virtual OStringListItem* Clone(SfxItemPool* _pPool = nullptr) const override; const css::uno::Sequence< OUString >& getList() const { return m_aList; } }; diff --git a/dbaccess/source/ui/misc/stringlistitem.cxx b/dbaccess/source/ui/misc/stringlistitem.cxx index 1d821edd2076..c5da8c21968e 100644 --- a/dbaccess/source/ui/misc/stringlistitem.cxx +++ b/dbaccess/source/ui/misc/stringlistitem.cxx @@ -53,7 +53,7 @@ bool OStringListItem::operator==(const SfxPoolItem& _rItem) const return true; } -SfxPoolItem* OStringListItem::Clone(SfxItemPool* /* _pPool */) const +OStringListItem* OStringListItem::Clone(SfxItemPool* /* _pPool */) const { return new OStringListItem(*this); } diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index 2b87196da1b6..2788572adcc8 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -59,13 +59,11 @@ SvxBulletItem::~SvxBulletItem() { } - -SfxPoolItem* SvxBulletItem::Clone( SfxItemPool * /*pPool*/ ) const +SvxBulletItem* SvxBulletItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SvxBulletItem( *this ); } - void SvxBulletItem::CopyValidProperties( const SvxBulletItem& rCopyFrom ) { vcl::Font _aFont = GetFont(); diff --git a/editeng/source/items/charhiddenitem.cxx b/editeng/source/items/charhiddenitem.cxx index ca298c717fef..8d0753c91e68 100644 --- a/editeng/source/items/charhiddenitem.cxx +++ b/editeng/source/items/charhiddenitem.cxx @@ -27,7 +27,7 @@ SvxCharHiddenItem::SvxCharHiddenItem( const bool bHidden, const sal_uInt16 nId ) { } -SfxPoolItem* SvxCharHiddenItem::Clone( SfxItemPool * ) const +SvxCharHiddenItem* SvxCharHiddenItem::Clone( SfxItemPool * ) const { return new SvxCharHiddenItem( *this ); } diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 873e82380914..3325eec528bb 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -293,18 +293,15 @@ SvxFieldItem::SvxFieldItem( const SvxFieldItem& rItem ) : { } - SvxFieldItem::~SvxFieldItem() { } - -SfxPoolItem* SvxFieldItem::Clone( SfxItemPool* ) const +SvxFieldItem* SvxFieldItem::Clone( SfxItemPool* ) const { return new SvxFieldItem(*this); } - bool SvxFieldItem::operator==( const SfxPoolItem& rItem ) const { assert(SfxPoolItem::operator==(rItem)); diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index f74b53732ce2..3c93e0b2266a 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -111,13 +111,11 @@ SfxPoolItem* SvxFormatBreakItem::CreateDefault() { return new SvxFormatBreakIte SfxPoolItem* SvxFormatKeepItem::CreateDefault() { return new SvxFormatKeepItem(false, 0);} SfxPoolItem* SvxLineItem::CreateDefault() { return new SvxLineItem(0);} - -SfxPoolItem* SvxPaperBinItem::Clone( SfxItemPool* ) const +SvxPaperBinItem* SvxPaperBinItem::Clone( SfxItemPool* ) const { return new SvxPaperBinItem( *this ); } - bool SvxPaperBinItem::GetPresentation ( SfxItemPresentation ePres, @@ -249,13 +247,11 @@ bool SvxSizeItem::operator==( const SfxPoolItem& rAttr ) const return ( m_aSize == static_cast<const SvxSizeItem&>( rAttr ).GetSize() ); } - -SfxPoolItem* SvxSizeItem::Clone( SfxItemPool* ) const +SvxSizeItem* SvxSizeItem::Clone( SfxItemPool* ) const { return new SvxSizeItem( *this ); } - bool SvxSizeItem::GetPresentation ( SfxItemPresentation ePres, @@ -503,13 +499,11 @@ bool SvxLRSpaceItem::operator==( const SfxPoolItem& rAttr ) const bExplicitZeroMarginValLeft == rOther.IsExplicitZeroMarginValLeft() ); } - -SfxPoolItem* SvxLRSpaceItem::Clone( SfxItemPool* ) const +SvxLRSpaceItem* SvxLRSpaceItem::Clone( SfxItemPool* ) const { return new SvxLRSpaceItem( *this ); } - bool SvxLRSpaceItem::GetPresentation ( SfxItemPresentation ePres, @@ -779,13 +773,11 @@ bool SvxULSpaceItem::operator==( const SfxPoolItem& rAttr ) const nPropLower == rSpaceItem.nPropLower ); } - -SfxPoolItem* SvxULSpaceItem::Clone( SfxItemPool* ) const +SvxULSpaceItem* SvxULSpaceItem::Clone( SfxItemPool* ) const { return new SvxULSpaceItem( *this ); } - bool SvxULSpaceItem::GetPresentation ( SfxItemPresentation ePres, @@ -896,13 +888,11 @@ boost::property_tree::ptree SvxULSpaceItem::dumpAsJSON() const return aTree; } - -SfxPoolItem* SvxPrintItem::Clone( SfxItemPool* ) const +SvxPrintItem* SvxPrintItem::Clone( SfxItemPool* ) const { return new SvxPrintItem( *this ); } - bool SvxPrintItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -919,13 +909,11 @@ bool SvxPrintItem::GetPresentation return true; } - -SfxPoolItem* SvxOpaqueItem::Clone( SfxItemPool* ) const +SvxOpaqueItem* SvxOpaqueItem::Clone( SfxItemPool* ) const { return new SvxOpaqueItem( *this ); } - bool SvxOpaqueItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -989,13 +977,11 @@ bool SvxProtectItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return true; } - -SfxPoolItem* SvxProtectItem::Clone( SfxItemPool* ) const +SvxProtectItem* SvxProtectItem::Clone( SfxItemPool* ) const { return new SvxProtectItem( *this ); } - bool SvxProtectItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1155,13 +1141,11 @@ bool SvxShadowItem::operator==( const SfxPoolItem& rAttr ) const ( eLocation == rItem.GetLocation() ) ); } - -SfxPoolItem* SvxShadowItem::Clone( SfxItemPool* ) const +SvxShadowItem* SvxShadowItem::Clone( SfxItemPool* ) const { return new SvxShadowItem( *this ); } - sal_uInt16 SvxShadowItem::CalcShadowSpace( SvxShadowItemSide nShadow ) const { sal_uInt16 nSpace = 0; @@ -1737,13 +1721,11 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return true; } - -SfxPoolItem* SvxBoxItem::Clone( SfxItemPool* ) const +SvxBoxItem* SvxBoxItem::Clone( SfxItemPool* ) const { return new SvxBoxItem( *this ); } - bool SvxBoxItem::GetPresentation ( SfxItemPresentation ePres, @@ -2143,13 +2125,11 @@ void SvxBoxInfoItem::SetLine( const SvxBorderLine* pNew, SvxBoxInfoItemLine nLin } } - -SfxPoolItem* SvxBoxInfoItem::Clone( SfxItemPool* ) const +SvxBoxInfoItem* SvxBoxInfoItem::Clone( SfxItemPool* ) const { return new SvxBoxInfoItem( *this ); } - bool SvxBoxInfoItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -2617,25 +2597,21 @@ bool SvxFormatBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ return true; } - -SfxPoolItem* SvxFormatBreakItem::Clone( SfxItemPool* ) const +SvxFormatBreakItem* SvxFormatBreakItem::Clone( SfxItemPool* ) const { return new SvxFormatBreakItem( *this ); } - sal_uInt16 SvxFormatBreakItem::GetValueCount() const { return sal_uInt16(SvxBreak::End); // SvxBreak::PageBoth + 1 } - -SfxPoolItem* SvxFormatKeepItem::Clone( SfxItemPool* ) const +SvxFormatKeepItem* SvxFormatKeepItem::Clone( SfxItemPool* ) const { return new SvxFormatKeepItem( *this ); } - bool SvxFormatKeepItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -2678,13 +2654,11 @@ bool SvxLineItem::operator==( const SfxPoolItem& rAttr ) const return CmpBrdLn( pLine, static_cast<const SvxLineItem&>(rAttr).GetLine() ); } - -SfxPoolItem* SvxLineItem::Clone( SfxItemPool* ) const +SvxLineItem* SvxLineItem::Clone( SfxItemPool* ) const { return new SvxLineItem( *this ); } - bool SvxLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemId ) const { bool bConvert = 0!=(nMemId&CONVERT_TWIPS); @@ -3153,13 +3127,11 @@ bool SvxBrushItem::operator==( const SfxPoolItem& rAttr ) const return bEqual; } - -SfxPoolItem* SvxBrushItem::Clone( SfxItemPool* ) const +SvxBrushItem* SvxBrushItem::Clone( SfxItemPool* ) const { return new SvxBrushItem( *this ); } - const GraphicObject* SvxBrushItem::GetGraphicObject(OUString const & referer) const { if (bLoadAgain && !maStrLink.isEmpty() && !xGraphicObject) @@ -3351,13 +3323,11 @@ SvxFrameDirectionItem::~SvxFrameDirectionItem() { } - -SfxPoolItem* SvxFrameDirectionItem::Clone( SfxItemPool * ) const +SvxFrameDirectionItem* SvxFrameDirectionItem::Clone( SfxItemPool * ) const { return new SvxFrameDirectionItem( *this ); } - const char* getFrmDirResId(size_t nIndex) { const char* const RID_SVXITEMS_FRMDIR[] = diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx index 9b2c2be3b947..b8f2c7bdd102 100644 --- a/editeng/source/items/justifyitem.cxx +++ b/editeng/source/items/justifyitem.cxx @@ -165,7 +165,7 @@ OUString SvxHorJustifyItem::GetValueText(SvxCellHorJustify nVal) return EditResId(RID_SVXITEMS_HORJUST[static_cast<size_t>(nVal)]); } -SfxPoolItem* SvxHorJustifyItem::Clone( SfxItemPool* ) const +SvxHorJustifyItem* SvxHorJustifyItem::Clone( SfxItemPool* ) const { return new SvxHorJustifyItem( *this ); } @@ -290,7 +290,7 @@ OUString SvxVerJustifyItem::GetValueText( SvxCellVerJustify nVal ) return EditResId(RID_SVXITEMS_VERJUST[static_cast<size_t>(nVal)]); } -SfxPoolItem* SvxVerJustifyItem::Clone( SfxItemPool* ) const +SvxVerJustifyItem* SvxVerJustifyItem::Clone( SfxItemPool* ) const { return new SvxVerJustifyItem( *this ); } @@ -359,7 +359,7 @@ OUString SvxJustifyMethodItem::GetValueText( SvxCellJustifyMethod nVal ) return EditResId(RID_SVXITEMS_JUSTMETHOD[static_cast<size_t>(nVal)]); } -SfxPoolItem* SvxJustifyMethodItem::Clone( SfxItemPool* ) const +SvxJustifyMethodItem* SvxJustifyMethodItem::Clone( SfxItemPool* ) const { return new SvxJustifyMethodItem( *this ); } diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 67cf0373cc37..599318fa6db9 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -410,14 +410,10 @@ bool SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const void SvxNumberFormat::SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize, const sal_Int16* pOrient) { - if(!pBrushItem) - { + if (!pBrushItem) pGraphicBrush.reset(); - } else if ( !pGraphicBrush || (*pBrushItem != *pGraphicBrush) ) - { - pGraphicBrush.reset( static_cast<SvxBrushItem*>(pBrushItem->Clone()) ); - } + pGraphicBrush.reset(pBrushItem->Clone()); if(pOrient) eVertOrient = *pOrient; @@ -942,7 +938,7 @@ bool SvxNumBulletItem::operator==( const SfxPoolItem& rCopy) const *pNumRule == *static_cast<const SvxNumBulletItem&>(rCopy).pNumRule; } -SfxPoolItem* SvxNumBulletItem::Clone( SfxItemPool * ) const +SvxNumBulletItem* SvxNumBulletItem::Clone( SfxItemPool * ) const { return new SvxNumBulletItem(*this); } diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx index aeeb15314e01..254da79d91c1 100644 --- a/editeng/source/items/optitems.cxx +++ b/editeng/source/items/optitems.cxx @@ -31,7 +31,6 @@ SfxHyphenRegionItem::SfxHyphenRegionItem( const sal_uInt16 nId ) : nMinLead = nMinTrail = 0; } - bool SfxHyphenRegionItem::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); @@ -40,13 +39,11 @@ bool SfxHyphenRegionItem::operator==( const SfxPoolItem& rAttr ) const ( static_cast<const SfxHyphenRegionItem&>( rAttr ).nMinTrail == nMinTrail ) ); } - -SfxPoolItem* SfxHyphenRegionItem::Clone( SfxItemPool* ) const +SfxHyphenRegionItem* SfxHyphenRegionItem::Clone( SfxItemPool* ) const { return new SfxHyphenRegionItem( *this ); } - bool SfxHyphenRegionItem::GetPresentation ( SfxItemPresentation /*ePres*/, diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index da7b7cfcd297..c2ca935be7c5 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -222,8 +222,7 @@ bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } - -SfxPoolItem* SvxLineSpacingItem::Clone( SfxItemPool * ) const +SvxLineSpacingItem* SvxLineSpacingItem::Clone( SfxItemPool * ) const { return new SvxLineSpacingItem( *this ); } @@ -408,13 +407,11 @@ bool SvxAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return true; } - -SfxPoolItem* SvxAdjustItem::Clone( SfxItemPool * ) const +SvxAdjustItem* SvxAdjustItem::Clone( SfxItemPool * ) const { return new SvxAdjustItem( *this ); } - bool SvxAdjustItem::GetPresentation ( SfxItemPresentation ePres, @@ -474,13 +471,11 @@ SvxWidowsItem::SvxWidowsItem(const sal_uInt8 nL, const sal_uInt16 nId ) : { } - -SfxPoolItem* SvxWidowsItem::Clone( SfxItemPool * ) const +SvxWidowsItem* SvxWidowsItem::Clone( SfxItemPool * ) const { return new SvxWidowsItem( *this ); } - bool SvxWidowsItem::GetPresentation ( SfxItemPresentation ePres, @@ -520,13 +515,11 @@ SvxOrphansItem::SvxOrphansItem(const sal_uInt8 nL, const sal_uInt16 nId ) : { } - -SfxPoolItem* SvxOrphansItem::Clone( SfxItemPool * ) const +SvxOrphansItem* SvxOrphansItem::Clone( SfxItemPool * ) const { return new SvxOrphansItem( *this ); } - bool SvxOrphansItem::GetPresentation ( SfxItemPresentation ePres, @@ -641,13 +634,11 @@ bool SvxHyphenZoneItem::operator==( const SfxPoolItem& rAttr ) const && rItem.nMaxHyphens == nMaxHyphens ); } - -SfxPoolItem* SvxHyphenZoneItem::Clone( SfxItemPool * ) const +SvxHyphenZoneItem* SvxHyphenZoneItem::Clone( SfxItemPool * ) const { return new SvxHyphenZoneItem( *this ); } - bool SvxHyphenZoneItem::GetPresentation ( SfxItemPresentation ePres, @@ -936,13 +927,11 @@ bool SvxTabStopItem::operator==( const SfxPoolItem& rAttr ) const return true; } - -SfxPoolItem* SvxTabStopItem::Clone( SfxItemPool * ) const +SvxTabStopItem* SvxTabStopItem::Clone( SfxItemPool * ) const { return new SvxTabStopItem( *this ); } - bool SvxTabStopItem::GetPresentation ( SfxItemPresentation ePres, @@ -1010,12 +999,11 @@ SvxFormatSplitItem::~SvxFormatSplitItem() { } -SfxPoolItem* SvxFormatSplitItem::Clone( SfxItemPool * ) const +SvxFormatSplitItem* SvxFormatSplitItem::Clone( SfxItemPool * ) const { return new SvxFormatSplitItem( *this ); } - bool SvxFormatSplitItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1032,13 +1020,11 @@ bool SvxFormatSplitItem::GetPresentation return true; } - -SfxPoolItem* SvxPageModelItem::Clone( SfxItemPool* ) const +SvxPageModelItem* SvxPageModelItem::Clone( SfxItemPool* ) const { return new SvxPageModelItem( *this ); } - bool SvxPageModelItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; @@ -1109,7 +1095,7 @@ SvxScriptSpaceItem::SvxScriptSpaceItem( bool bOn, const sal_uInt16 nId ) { } -SfxPoolItem* SvxScriptSpaceItem::Clone( SfxItemPool * ) const +SvxScriptSpaceItem* SvxScriptSpaceItem::Clone( SfxItemPool * ) const { return new SvxScriptSpaceItem( *this ); } @@ -1132,7 +1118,7 @@ SvxHangingPunctuationItem::SvxHangingPunctuationItem( { } -SfxPoolItem* SvxHangingPunctuationItem::Clone( SfxItemPool * ) const +SvxHangingPunctuationItem* SvxHangingPunctuationItem::Clone( SfxItemPool * ) const { return new SvxHangingPunctuationItem( *this ); } @@ -1155,7 +1141,7 @@ SvxForbiddenRuleItem::SvxForbiddenRuleItem( { } -SfxPoolItem* SvxForbiddenRuleItem::Clone( SfxItemPool * ) const +SvxForbiddenRuleItem* SvxForbiddenRuleItem::Clone( SfxItemPool * ) const { return new SvxForbiddenRuleItem( *this ); } @@ -1181,7 +1167,7 @@ SvxParaVertAlignItem::SvxParaVertAlignItem( Align nValue, { } -SfxPoolItem* SvxParaVertAlignItem::Clone( SfxItemPool* ) const +SvxParaVertAlignItem* SvxParaVertAlignItem::Clone( SfxItemPool* ) const { return new SvxParaVertAlignItem( *this ); } @@ -1224,14 +1210,12 @@ bool SvxParaVertAlignItem::PutValue( const css::uno::Any& rVal, return false; } - - SvxParaGridItem::SvxParaGridItem( bool bOn, const sal_uInt16 nId ) : SfxBoolItem( nId, bOn ) { } -SfxPoolItem* SvxParaGridItem::Clone( SfxItemPool * ) const +SvxParaGridItem* SvxParaGridItem::Clone( SfxItemPool * ) const { return new SvxParaGridItem( *this ); } diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index bd39fa4cf3f7..cff724ead921 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -138,13 +138,11 @@ SvxFontListItem::SvxFontListItem( const FontList* pFontLst, } } - -SfxPoolItem* SvxFontListItem::Clone( SfxItemPool* ) const +SvxFontListItem* SvxFontListItem::Clone( SfxItemPool* ) const { return new SvxFontListItem( *this ); } - bool SvxFontListItem::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); @@ -310,13 +308,11 @@ bool SvxFontItem::operator==( const SfxPoolItem& rAttr ) const return bRet; } - -SfxPoolItem* SvxFontItem::Clone( SfxItemPool * ) const +SvxFontItem* SvxFontItem::Clone( SfxItemPool * ) const { return new SvxFontItem( *this ); } - bool SvxFontItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -349,13 +345,11 @@ SvxPostureItem::SvxPostureItem( const FontItalic ePosture, const sal_uInt16 nId { } - -SfxPoolItem* SvxPostureItem::Clone( SfxItemPool * ) const +SvxPostureItem* SvxPostureItem::Clone( SfxItemPool * ) const { return new SvxPostureItem( *this ); } - sal_uInt16 SvxPostureItem::GetValueCount() const { return ITALIC_NORMAL + 1; // ITALIC_NONE also belongs here @@ -488,13 +482,11 @@ sal_uInt16 SvxWeightItem::GetValueCount() const return WEIGHT_BLACK; // WEIGHT_DONTKNOW does not belong } - -SfxPoolItem* SvxWeightItem::Clone( SfxItemPool * ) const +SvxWeightItem* SvxWeightItem::Clone( SfxItemPool * ) const { return new SvxWeightItem( *this ); } - bool SvxWeightItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -590,13 +582,11 @@ SvxFontHeightItem::SvxFontHeightItem( const sal_uLong nSz, SetHeight( nSz,nPrp ); // calculate in percentage } - -SfxPoolItem* SvxFontHeightItem::Clone( SfxItemPool * ) const +SvxFontHeightItem* SvxFontHeightItem::Clone( SfxItemPool * ) const { return new SvxFontHeightItem( *this ); } - bool SvxFontHeightItem::operator==( const SfxPoolItem& rItem ) const { assert(SfxPoolItem::operator==(rItem)); @@ -942,13 +932,11 @@ void SvxTextLineItem::SetBoolValue( bool bVal ) SetValue( bVal ? LINESTYLE_SINGLE : LINESTYLE_NONE ); } - -SfxPoolItem* SvxTextLineItem::Clone( SfxItemPool * ) const +SvxTextLineItem* SvxTextLineItem::Clone( SfxItemPool * ) const { return new SvxTextLineItem( *this ); } - sal_uInt16 SvxTextLineItem::GetValueCount() const { return LINESTYLE_DOTTED + 1; // LINESTYLE_NONE also belongs here @@ -1052,13 +1040,11 @@ SvxUnderlineItem::SvxUnderlineItem( const FontLineStyle eSt, const sal_uInt16 nI { } - -SfxPoolItem* SvxUnderlineItem::Clone( SfxItemPool * ) const +SvxUnderlineItem* SvxUnderlineItem::Clone( SfxItemPool * ) const { return new SvxUnderlineItem( *this ); } - OUString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const { static const char* RID_SVXITEMS_UL[] = @@ -1095,13 +1081,11 @@ SvxOverlineItem::SvxOverlineItem( const FontLineStyle eSt, const sal_uInt16 nId { } - -SfxPoolItem* SvxOverlineItem::Clone( SfxItemPool * ) const +SvxOverlineItem* SvxOverlineItem::Clone( SfxItemPool * ) const { return new SvxOverlineItem( *this ); } - OUString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const { static const char* RID_SVXITEMS_OL[] = @@ -1162,13 +1146,11 @@ sal_uInt16 SvxCrossedOutItem::GetValueCount() const return STRIKEOUT_DOUBLE + 1; // STRIKEOUT_NONE belongs also here } - -SfxPoolItem* SvxCrossedOutItem::Clone( SfxItemPool * ) const +SvxCrossedOutItem* SvxCrossedOutItem::Clone( SfxItemPool * ) const { return new SvxCrossedOutItem( *this ); } - bool SvxCrossedOutItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1239,13 +1221,11 @@ SvxShadowedItem::SvxShadowedItem( const bool bShadowed, const sal_uInt16 nId ) : { } - -SfxPoolItem* SvxShadowedItem::Clone( SfxItemPool * ) const +SvxShadowedItem* SvxShadowedItem::Clone( SfxItemPool * ) const { return new SvxShadowedItem( *this ); } - bool SvxShadowedItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1269,13 +1249,11 @@ SvxAutoKernItem::SvxAutoKernItem( const bool bAutoKern, const sal_uInt16 nId ) : { } - -SfxPoolItem* SvxAutoKernItem::Clone( SfxItemPool * ) const +SvxAutoKernItem* SvxAutoKernItem::Clone( SfxItemPool * ) const { return new SvxAutoKernItem( *this ); } - bool SvxAutoKernItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1300,13 +1278,11 @@ SvxWordLineModeItem::SvxWordLineModeItem( const bool bWordLineMode, { } - -SfxPoolItem* SvxWordLineModeItem::Clone( SfxItemPool * ) const +SvxWordLineModeItem* SvxWordLineModeItem::Clone( SfxItemPool * ) const { return new SvxWordLineModeItem( *this ); } - bool SvxWordLineModeItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1330,13 +1306,11 @@ SvxContourItem::SvxContourItem( const bool bContoured, const sal_uInt16 nId ) : { } - -SfxPoolItem* SvxContourItem::Clone( SfxItemPool * ) const +SvxContourItem* SvxContourItem::Clone( SfxItemPool * ) const { return new SvxContourItem( *this ); } - bool SvxContourItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1367,7 +1341,7 @@ SvxBackgroundColorItem::SvxBackgroundColorItem( const Color& rCol, { } -SfxPoolItem* SvxBackgroundColorItem::Clone( SfxItemPool * ) const +SvxBackgroundColorItem* SvxBackgroundColorItem::Clone( SfxItemPool * ) const { return new SvxBackgroundColorItem(*this); } @@ -1485,7 +1459,7 @@ bool SvxColorItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } } -SfxPoolItem* SvxColorItem::Clone( SfxItemPool * ) const +SvxColorItem* SvxColorItem::Clone( SfxItemPool * ) const { return new SvxColorItem( *this ); } @@ -1532,13 +1506,11 @@ SvxKerningItem::SvxKerningItem( const short nKern, const sal_uInt16 nId ) : { } - -SfxPoolItem* SvxKerningItem::Clone( SfxItemPool * ) const +SvxKerningItem* SvxKerningItem::Clone( SfxItemPool * ) const { return new SvxKerningItem( *this ); } - void SvxKerningItem::ScaleMetrics( long nMult, long nDiv ) { SetValue( static_cast<sal_Int16>(Scale( GetValue(), nMult, nDiv )) ); @@ -1613,19 +1585,16 @@ SvxCaseMapItem::SvxCaseMapItem( const SvxCaseMap eMap, const sal_uInt16 nId ) : { } - sal_uInt16 SvxCaseMapItem::GetValueCount() const { return sal_uInt16(SvxCaseMap::End); // SvxCaseMap::SmallCaps + 1 } - -SfxPoolItem* SvxCaseMapItem::Clone( SfxItemPool * ) const +SvxCaseMapItem* SvxCaseMapItem::Clone( SfxItemPool * ) const { return new SvxCaseMapItem( *this ); } - bool SvxCaseMapItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1729,13 +1698,11 @@ bool SvxEscapementItem::operator==( const SfxPoolItem& rAttr ) const nProp == static_cast<const SvxEscapementItem&>(rAttr).nProp ); } - -SfxPoolItem* SvxEscapementItem::Clone( SfxItemPool * ) const +SvxEscapementItem* SvxEscapementItem::Clone( SfxItemPool * ) const { return new SvxEscapementItem( *this ); } - sal_uInt16 SvxEscapementItem::GetValueCount() const { return sal_uInt16(SvxEscapement::End); // SvxEscapement::Subscript + 1 @@ -1870,13 +1837,11 @@ sal_uInt16 SvxLanguageItem::GetValueCount() const return 0; } - -SfxPoolItem* SvxLanguageItem::Clone( SfxItemPool * ) const +SvxLanguageItem* SvxLanguageItem::Clone( SfxItemPool * ) const { return new SvxLanguageItem( *this ); } - bool SvxLanguageItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1939,13 +1904,11 @@ SvxNoHyphenItem::SvxNoHyphenItem( const sal_uInt16 nId ) : { } - -SfxPoolItem* SvxNoHyphenItem::Clone( SfxItemPool* ) const +SvxNoHyphenItem* SvxNoHyphenItem::Clone( SfxItemPool* ) const { return new SvxNoHyphenItem( *this ); } - bool SvxNoHyphenItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1972,13 +1935,11 @@ SvxBlinkItem::SvxBlinkItem( const bool bBlink, const sal_uInt16 nId ) : { } - -SfxPoolItem* SvxBlinkItem::Clone( SfxItemPool * ) const +SvxBlinkItem* SvxBlinkItem::Clone( SfxItemPool * ) const { return new SvxBlinkItem( *this ); } - bool SvxBlinkItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -2003,13 +1964,11 @@ SvxEmphasisMarkItem::SvxEmphasisMarkItem( const FontEmphasisMark nValue, { } - -SfxPoolItem* SvxEmphasisMarkItem::Clone( SfxItemPool * ) const +SvxEmphasisMarkItem* SvxEmphasisMarkItem::Clone( SfxItemPool * ) const { return new SvxEmphasisMarkItem( *this ); } - bool SvxEmphasisMarkItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -2121,7 +2080,7 @@ bool SvxTwoLinesItem::operator==( const SfxPoolItem& rAttr ) const cEndBracket == static_cast<const SvxTwoLinesItem&>(rAttr).cEndBracket; } -SfxPoolItem* SvxTwoLinesItem::Clone( SfxItemPool* ) const +SvxTwoLinesItem* SvxTwoLinesItem::Clone( SfxItemPool* ) const { return new SvxTwoLinesItem( *this ); } @@ -2216,7 +2175,7 @@ SvxTextRotateItem::SvxTextRotateItem(sal_uInt16 nValue, const sal_uInt16 nW) { } -SfxPoolItem* SvxTextRotateItem::Clone(SfxItemPool*) const +SvxTextRotateItem* SvxTextRotateItem::Clone(SfxItemPool*) const { return new SvxTextRotateItem(*this); } @@ -2295,7 +2254,7 @@ SvxCharRotateItem::SvxCharRotateItem( sal_uInt16 nValue, { } -SfxPoolItem* SvxCharRotateItem::Clone( SfxItemPool* ) const +SvxCharRotateItem* SvxCharRotateItem::Clone( SfxItemPool* ) const { return new SvxCharRotateItem( *this ); } @@ -2384,12 +2343,11 @@ SvxCharScaleWidthItem::SvxCharScaleWidthItem( sal_uInt16 nValue, { } -SfxPoolItem* SvxCharScaleWidthItem::Clone( SfxItemPool* ) const +SvxCharScaleWidthItem* SvxCharScaleWidthItem::Clone( SfxItemPool* ) const { return new SvxCharScaleWidthItem( *this ); } - bool SvxCharScaleWidthItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, @@ -2439,7 +2397,7 @@ SvxCharReliefItem::SvxCharReliefItem( FontRelief eValue, { } -SfxPoolItem* SvxCharReliefItem::Clone( SfxItemPool * ) const +SvxCharReliefItem* SvxCharReliefItem::Clone( SfxItemPool * ) const { return new SvxCharReliefItem( *this ); } @@ -2530,7 +2488,7 @@ SvxScriptSetItem::SvxScriptSetItem( sal_uInt16 nSlotId, SfxItemPool& rPool ) GetItemSet().MergeRange( nComplex, nComplex ); } -SfxPoolItem* SvxScriptSetItem::Clone( SfxItemPool * ) const +SvxScriptSetItem* SvxScriptSetItem::Clone( SfxItemPool * ) const { SvxScriptSetItem* p = new SvxScriptSetItem( Which(), *GetItemSet().GetPool() ); p->GetItemSet().Put( GetItemSet(), false ); @@ -2731,7 +2689,7 @@ bool SvxRsidItem::PutValue( const uno::Any& rVal, sal_uInt8 ) return true; } -SfxPoolItem* SvxRsidItem::Clone( SfxItemPool * ) const +SvxRsidItem* SvxRsidItem::Clone( SfxItemPool * ) const { return new SvxRsidItem( *this ); } diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx index 2fa4ce5ebbd4..d81aec28069f 100644 --- a/editeng/source/items/writingmodeitem.cxx +++ b/editeng/source/items/writingmodeitem.cxx @@ -38,7 +38,7 @@ SvxWritingModeItem::~SvxWritingModeItem() { } -SfxPoolItem* SvxWritingModeItem::Clone( SfxItemPool * ) const +SvxWritingModeItem* SvxWritingModeItem::Clone( SfxItemPool * ) const { return new SvxWritingModeItem( *this ); } diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx index e309b0b29ce2..b30689c6fe30 100644 --- a/include/avmedia/mediaitem.hxx +++ b/include/avmedia/mediaitem.hxx @@ -72,7 +72,7 @@ public: virtual ~MediaItem() override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual MediaItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreUnit, MapUnit ePresUnit, diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx index 92158376f17e..5075901273ba 100644 --- a/include/editeng/adjustitem.hxx +++ b/include/editeng/adjustitem.hxx @@ -64,7 +64,7 @@ public: static OUString GetValueTextByPos( sal_uInt16 nPos ); virtual sal_uInt16 GetEnumValue() const override; virtual void SetEnumValue( sal_uInt16 nNewVal ) override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxAdjustItem* Clone( SfxItemPool *pPool = nullptr ) const override; void SetOneWord( const SvxAdjust eType ) { diff --git a/include/editeng/autokernitem.hxx b/include/editeng/autokernitem.hxx index 6274f144aee6..798aab04bd97 100644 --- a/include/editeng/autokernitem.hxx +++ b/include/editeng/autokernitem.hxx @@ -38,7 +38,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxAutoKernItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/blinkitem.hxx b/include/editeng/blinkitem.hxx index 037397a5fde9..54f6da995e87 100644 --- a/include/editeng/blinkitem.hxx +++ b/include/editeng/blinkitem.hxx @@ -38,7 +38,7 @@ public: SvxBlinkItem( const bool bBlink /*= false*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxBlinkItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx index ee317ec4fc99..c63953cf5909 100644 --- a/include/editeng/boxitem.hxx +++ b/include/editeng/boxitem.hxx @@ -82,7 +82,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxBoxItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; @@ -195,7 +195,7 @@ public: 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; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxBoxInfoItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index 3455d1bfa925..61550a15d2a6 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -86,7 +86,7 @@ public: 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; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxBrushItem* Clone( SfxItemPool *pPool = nullptr ) const override; const Color& GetColor() const { return aColor; } Color& GetColor() { return aColor; } diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx index a9931de515a6..35266d8a4e94 100644 --- a/include/editeng/bulletitem.hxx +++ b/include/editeng/bulletitem.hxx @@ -61,7 +61,7 @@ public: SvxBulletItem( const SvxBulletItem& ); virtual ~SvxBulletItem() override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxBulletItem* Clone( SfxItemPool *pPool = nullptr ) const override; OUString GetFullText() const; diff --git a/include/editeng/charhiddenitem.hxx b/include/editeng/charhiddenitem.hxx index 8cc8df501149..ed72e08dcec0 100644 --- a/include/editeng/charhiddenitem.hxx +++ b/include/editeng/charhiddenitem.hxx @@ -34,7 +34,7 @@ class EDITENG_DLLPUBLIC SvxCharHiddenItem final : public SfxBoolItem public: SvxCharHiddenItem( const bool bHidden /*= false*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxCharHiddenItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/include/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx index 94eb995eede4..78b57fa7df00 100644 --- a/include/editeng/charreliefitem.hxx +++ b/include/editeng/charreliefitem.hxx @@ -39,7 +39,7 @@ public: SvxCharReliefItem( FontRelief eValue /*= FontRelief::NONE*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxCharReliefItem* Clone( SfxItemPool *pPool = nullptr ) const override; static OUString GetValueTextByPos( sal_uInt16 nPos ); virtual sal_uInt16 GetValueCount() const override; diff --git a/include/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx index 07a35599a61f..0ce60bb1a05b 100644 --- a/include/editeng/charrotateitem.hxx +++ b/include/editeng/charrotateitem.hxx @@ -36,7 +36,7 @@ class EDITENG_DLLPUBLIC SvxTextRotateItem : public SfxUInt16Item public: SvxTextRotateItem(sal_uInt16 nValue, const sal_uInt16 nId); - virtual SfxPoolItem* Clone(SfxItemPool *pPool = nullptr) const override; + virtual SvxTextRotateItem* Clone(SfxItemPool *pPool = nullptr) const override; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, @@ -79,7 +79,7 @@ public: bool bFitIntoLine /*= false*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxCharRotateItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/charscaleitem.hxx b/include/editeng/charscaleitem.hxx index 7a2da36ade63..fff4fa8efae9 100644 --- a/include/editeng/charscaleitem.hxx +++ b/include/editeng/charscaleitem.hxx @@ -40,7 +40,7 @@ public: SvxCharScaleWidthItem( sal_uInt16 nValue /*= 100*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxCharScaleWidthItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx index fea86c443fae..d0b4bff258bf 100644 --- a/include/editeng/cmapitem.hxx +++ b/include/editeng/cmapitem.hxx @@ -44,7 +44,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxCaseMapItem* Clone( SfxItemPool *pPool = nullptr ) const override; static OUString GetValueTextByPos( sal_uInt16 nPos ); virtual sal_uInt16 GetValueCount() const override; diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx index e1bf9e0c0a5d..1eab79723577 100644 --- a/include/editeng/colritem.hxx +++ b/include/editeng/colritem.hxx @@ -48,7 +48,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, const IntlWrapper& rIntlWrapper) const override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual SvxColorItem* Clone(SfxItemPool* pPool = nullptr) const override; SvxColorItem(SvxColorItem const &) = default; // SfxPoolItem copy function dichotomy const Color& GetValue() const @@ -63,15 +63,15 @@ public: // XXX: to be moved in a separate header. class EDITENG_DLLPUBLIC SvxBackgroundColorItem final : public SvxColorItem { - public: - static SfxPoolItem* CreateDefault(); +public: + static SfxPoolItem* CreateDefault(); - SvxBackgroundColorItem(const sal_uInt16 nId); - SvxBackgroundColorItem(const Color& rCol, const sal_uInt16 nId); + SvxBackgroundColorItem(const sal_uInt16 nId); + SvxBackgroundColorItem(const Color& rCol, const sal_uInt16 nId); - virtual SfxPoolItem* 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; + virtual SvxBackgroundColorItem* 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; }; #endif diff --git a/include/editeng/contouritem.hxx b/include/editeng/contouritem.hxx index a656ccd7b4c0..9c67384fc8d2 100644 --- a/include/editeng/contouritem.hxx +++ b/include/editeng/contouritem.hxx @@ -37,7 +37,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxContourItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx index 945b19185d83..5d8b18fe2650 100644 --- a/include/editeng/crossedoutitem.hxx +++ b/include/editeng/crossedoutitem.hxx @@ -43,7 +43,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxCrossedOutItem* Clone( SfxItemPool *pPool = nullptr ) const override; static OUString GetValueTextByPos( sal_uInt16 nPos ); virtual sal_uInt16 GetValueCount() const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/editeng/emphasismarkitem.hxx b/include/editeng/emphasismarkitem.hxx index 720b2ee655af..f54c857353c9 100644 --- a/include/editeng/emphasismarkitem.hxx +++ b/include/editeng/emphasismarkitem.hxx @@ -45,7 +45,7 @@ public: OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxEmphasisMarkItem* 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; diff --git a/include/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx index f84d18dd8f57..6811511c4076 100644 --- a/include/editeng/escapementitem.hxx +++ b/include/editeng/escapementitem.hxx @@ -60,7 +60,7 @@ public: 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; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxEscapementItem* Clone( SfxItemPool *pPool = nullptr ) const override; void SetEscapement( const SvxEscapement eNew ) { diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx index 1c3ec9987466..fd636afa54ee 100644 --- a/include/editeng/fhgtitem.hxx +++ b/include/editeng/fhgtitem.hxx @@ -62,7 +62,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxFontHeightItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index 6de611b82310..c7cd1e02209a 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -79,7 +79,7 @@ public: virtual ~SvxFieldItem() override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxFieldItem* Clone( SfxItemPool *pPool = nullptr ) const override; const SvxFieldData* GetField() const { return mpField.get(); } }; diff --git a/include/editeng/flstitem.hxx b/include/editeng/flstitem.hxx index 86cd6c9a593a..71756464e5b0 100644 --- a/include/editeng/flstitem.hxx +++ b/include/editeng/flstitem.hxx @@ -46,7 +46,7 @@ public: const sal_uInt16 nId ); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxFontListItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx index 6d6d105aa0fb..9a73a051f79e 100644 --- a/include/editeng/fontitem.hxx +++ b/include/editeng/fontitem.hxx @@ -46,7 +46,7 @@ public: // "pure virtual Methods" from SfxPoolItem virtual bool operator==(const SfxPoolItem& rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool *pPool = nullptr) const override; + virtual SvxFontItem* 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; diff --git a/include/editeng/forbiddenruleitem.hxx b/include/editeng/forbiddenruleitem.hxx index 9eaf4692c838..93e46b433b29 100644 --- a/include/editeng/forbiddenruleitem.hxx +++ b/include/editeng/forbiddenruleitem.hxx @@ -35,7 +35,7 @@ public: SvxForbiddenRuleItem( bool bOn /*= false*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxForbiddenRuleItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx index 3774639ff5b5..36aacdf4d919 100644 --- a/include/editeng/formatbreakitem.hxx +++ b/include/editeng/formatbreakitem.hxx @@ -53,7 +53,7 @@ public: OUString &rText, const IntlWrapper& ) const override; static OUString GetValueTextByPos( sal_uInt16 nPos ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxFormatBreakItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual sal_uInt16 GetValueCount() const override; SvxBreak GetBreak() const { return GetValue(); } diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx index 89524b743a4f..2a439aa50ca7 100644 --- a/include/editeng/frmdiritem.hxx +++ b/include/editeng/frmdiritem.hxx @@ -39,7 +39,7 @@ public: SvxFrameDirectionItem & operator =(SvxFrameDirectionItem const &) = delete; SvxFrameDirectionItem & operator =(SvxFrameDirectionItem &&) = delete; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxFrameDirectionItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/hngpnctitem.hxx b/include/editeng/hngpnctitem.hxx index e22feddfa1a4..c59d4db0cf0d 100644 --- a/include/editeng/hngpnctitem.hxx +++ b/include/editeng/hngpnctitem.hxx @@ -34,7 +34,7 @@ class EDITENG_DLLPUBLIC SvxHangingPunctuationItem final : public SfxBoolItem public: SvxHangingPunctuationItem( bool bOn /*= false*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxHangingPunctuationItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx index 0b573f43c9f5..9b3abd338839 100644 --- a/include/editeng/hyphenzoneitem.hxx +++ b/include/editeng/hyphenzoneitem.hxx @@ -55,7 +55,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxHyphenZoneItem* Clone( SfxItemPool *pPool = nullptr ) const override; void SetHyphen( const bool bNew ) { bHyphen = bNew; } bool IsHyphen() const { return bHyphen; } diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx index e087f85be141..616427f466f9 100644 --- a/include/editeng/justifyitem.hxx +++ b/include/editeng/justifyitem.hxx @@ -46,7 +46,7 @@ public: virtual sal_uInt16 GetValueCount() const override; static OUString GetValueText( SvxCellHorJustify nVal ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxHorJustifyItem* Clone( SfxItemPool *pPool = nullptr ) const override; SvxHorJustifyItem(SvxHorJustifyItem const &) = default; // SfxPoolItem copy function dichotomy }; @@ -73,7 +73,7 @@ public: virtual sal_uInt16 GetValueCount() const override; static OUString GetValueText( SvxCellVerJustify nVal ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxVerJustifyItem* Clone( SfxItemPool *pPool = nullptr ) const override; SvxVerJustifyItem(SvxVerJustifyItem const &) = default; // SfxPoolItem copy function dichotomy }; @@ -96,7 +96,7 @@ public: virtual sal_uInt16 GetValueCount() const override; static OUString GetValueText( SvxCellJustifyMethod nVal ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxJustifyMethodItem* Clone( SfxItemPool *pPool = nullptr ) const override; }; #endif diff --git a/include/editeng/keepitem.hxx b/include/editeng/keepitem.hxx index 9e910e73e661..6d511d04b0a2 100644 --- a/include/editeng/keepitem.hxx +++ b/include/editeng/keepitem.hxx @@ -40,7 +40,7 @@ public: SvxFormatKeepItem(SvxFormatKeepItem const &) = default; // SfxPoolItem copy function dichotomy // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxFormatKeepItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/kernitem.hxx b/include/editeng/kernitem.hxx index c5ea4f3b3f1c..a95eae9efa8a 100644 --- a/include/editeng/kernitem.hxx +++ b/include/editeng/kernitem.hxx @@ -40,7 +40,7 @@ public: SvxKerningItem( const short nKern /*= 0*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxKerningItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; diff --git a/include/editeng/langitem.hxx b/include/editeng/langitem.hxx index 19d50c2a0ce0..4d3852141666 100644 --- a/include/editeng/langitem.hxx +++ b/include/editeng/langitem.hxx @@ -52,7 +52,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper&) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxLanguageItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual sal_uInt16 GetValueCount() const override; SvxLanguageItem(SvxLanguageItem const &) = default; // SfxPoolItem copy function dichotomy diff --git a/include/editeng/lineitem.hxx b/include/editeng/lineitem.hxx index ff06a26b58eb..88a0bf768d91 100644 --- a/include/editeng/lineitem.hxx +++ b/include/editeng/lineitem.hxx @@ -53,7 +53,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxLineItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx index 3c5a06f1fe83..b4ad3e433d9a 100644 --- a/include/editeng/lrspitem.hxx +++ b/include/editeng/lrspitem.hxx @@ -81,7 +81,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxLRSpaceItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx index 202a4c848f0d..e4c97cfcd460 100644 --- a/include/editeng/lspcitem.hxx +++ b/include/editeng/lspcitem.hxx @@ -59,7 +59,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxLineSpacingItem* Clone( SfxItemPool *pPool = nullptr ) const override; // Methods to query and edit. InterlineSpace is added to the height. short GetInterLineSpace() const { return nInterLineSpace; } diff --git a/include/editeng/nhypitem.hxx b/include/editeng/nhypitem.hxx index fdfba7a28534..1078a055b769 100644 --- a/include/editeng/nhypitem.hxx +++ b/include/editeng/nhypitem.hxx @@ -29,7 +29,7 @@ public: SvxNoHyphenItem( const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxNoHyphenItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx index 699f82928069..399250c9c13a 100644 --- a/include/editeng/numitem.hxx +++ b/include/editeng/numitem.hxx @@ -300,7 +300,7 @@ public: SvxNumBulletItem(const SvxNumBulletItem& rCopy); virtual ~SvxNumBulletItem() override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxNumBulletItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; SvxNumRule* GetNumRule() const {return pNumRule.get();} diff --git a/include/editeng/opaqitem.hxx b/include/editeng/opaqitem.hxx index 62918296bbae..d38747747c55 100644 --- a/include/editeng/opaqitem.hxx +++ b/include/editeng/opaqitem.hxx @@ -36,7 +36,7 @@ public: explicit SvxOpaqueItem( const sal_uInt16 nId , const bool bOpa = true ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxOpaqueItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/optitems.hxx b/include/editeng/optitems.hxx index 4403cdf0792b..f4cbd2df81ab 100644 --- a/include/editeng/optitems.hxx +++ b/include/editeng/optitems.hxx @@ -40,7 +40,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxHyphenRegionItem* Clone( SfxItemPool *pPool = nullptr ) const override; sal_uInt8 &GetMinLead() { return nMinLead; } sal_uInt8 GetMinLead() const { return nMinLead; } diff --git a/include/editeng/orphitem.hxx b/include/editeng/orphitem.hxx index 6cec0ca0b592..4181e7c741eb 100644 --- a/include/editeng/orphitem.hxx +++ b/include/editeng/orphitem.hxx @@ -37,7 +37,7 @@ public: SvxOrphansItem( const sal_uInt8 nL /*= 0*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxOrphansItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/paravertalignitem.hxx b/include/editeng/paravertalignitem.hxx index 99460639108e..335b15f3769b 100644 --- a/include/editeng/paravertalignitem.hxx +++ b/include/editeng/paravertalignitem.hxx @@ -40,7 +40,7 @@ public: SvxParaVertAlignItem( Align nValue /*= 0*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxParaVertAlignItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/pbinitem.hxx b/include/editeng/pbinitem.hxx index 8bdeba98c281..d6bf7229b676 100644 --- a/include/editeng/pbinitem.hxx +++ b/include/editeng/pbinitem.hxx @@ -42,7 +42,7 @@ public: const sal_uInt8 nTray = PAPERBIN_PRINTER_SETTINGS ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxPaperBinItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/include/editeng/pgrditem.hxx b/include/editeng/pgrditem.hxx index d23967faba1c..ef8c24e66290 100644 --- a/include/editeng/pgrditem.hxx +++ b/include/editeng/pgrditem.hxx @@ -37,7 +37,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxParaGridItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/pmdlitem.hxx b/include/editeng/pmdlitem.hxx index cc3f8120e200..f4bfa53c47fa 100644 --- a/include/editeng/pmdlitem.hxx +++ b/include/editeng/pmdlitem.hxx @@ -41,7 +41,7 @@ public: inline SvxPageModelItem( const OUString& rModel, bool bA /*= false*/, sal_uInt16 nWh ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxPageModelItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx index 59fe71590098..93ed44b6b794 100644 --- a/include/editeng/postitem.hxx +++ b/include/editeng/postitem.hxx @@ -44,7 +44,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxPostureItem* Clone( SfxItemPool *pPool = nullptr ) const override; static OUString GetValueTextByPos( sal_uInt16 nPos ); virtual sal_uInt16 GetValueCount() const override; diff --git a/include/editeng/prntitem.hxx b/include/editeng/prntitem.hxx index 1ba68e1f5267..8f0e6a8fc855 100644 --- a/include/editeng/prntitem.hxx +++ b/include/editeng/prntitem.hxx @@ -38,7 +38,7 @@ public: explicit SvxPrintItem( const sal_uInt16 nId , const bool bPrt = true ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxPrintItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx index 9709c3f1e46c..4f3f1c4acd22 100644 --- a/include/editeng/protitem.hxx +++ b/include/editeng/protitem.hxx @@ -51,7 +51,7 @@ public: OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxProtectItem* Clone( SfxItemPool *pPool = nullptr ) const override; bool IsContentProtected() const { return bCntnt; } bool IsSizeProtected() const { return bSize; } diff --git a/include/editeng/rsiditem.hxx b/include/editeng/rsiditem.hxx index 482338f158f3..78ab9b8bface 100644 --- a/include/editeng/rsiditem.hxx +++ b/include/editeng/rsiditem.hxx @@ -26,7 +26,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SvxRsidItem* 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; diff --git a/include/editeng/scriptspaceitem.hxx b/include/editeng/scriptspaceitem.hxx index a28a02e8204b..9a4cac3de2b5 100644 --- a/include/editeng/scriptspaceitem.hxx +++ b/include/editeng/scriptspaceitem.hxx @@ -36,7 +36,7 @@ public: SvxScriptSpaceItem( bool bOn /*= false*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxScriptSpaceItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/scripttypeitem.hxx b/include/editeng/scripttypeitem.hxx index 7fb5a74a9056..e69ea0bdc4da 100644 --- a/include/editeng/scripttypeitem.hxx +++ b/include/editeng/scripttypeitem.hxx @@ -28,7 +28,7 @@ class EDITENG_DLLPUBLIC SvxScriptSetItem final : public SfxSetItem public: SvxScriptSetItem( sal_uInt16 nSlotId, SfxItemPool& rPool ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxScriptSetItem* Clone( SfxItemPool *pPool = nullptr ) const override; static const SfxPoolItem* GetItemOfScriptSet( const SfxItemSet& rSet, sal_uInt16 nWhich ); diff --git a/include/editeng/shaditem.hxx b/include/editeng/shaditem.hxx index 80f7adb2e4f8..8a843c84b19a 100644 --- a/include/editeng/shaditem.hxx +++ b/include/editeng/shaditem.hxx @@ -57,7 +57,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxShadowItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; diff --git a/include/editeng/shdditem.hxx b/include/editeng/shdditem.hxx index 5b494ca7b620..dbe30a672265 100644 --- a/include/editeng/shdditem.hxx +++ b/include/editeng/shdditem.hxx @@ -38,7 +38,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxShadowedItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/sizeitem.hxx b/include/editeng/sizeitem.hxx index bd4f86f7d070..c1ff51f5ae3e 100644 --- a/include/editeng/sizeitem.hxx +++ b/include/editeng/sizeitem.hxx @@ -51,7 +51,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxSizeItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; diff --git a/include/editeng/spltitem.hxx b/include/editeng/spltitem.hxx index 37c5e4ab610d..553e3263f7a5 100644 --- a/include/editeng/spltitem.hxx +++ b/include/editeng/spltitem.hxx @@ -44,7 +44,7 @@ public: SvxFormatSplitItem & operator =(SvxFormatSplitItem &&) = delete; // due to SfxBoolItem // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxFormatSplitItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx index 48b5817dd7f5..b5aab04bc92d 100644 --- a/include/editeng/tstpitem.hxx +++ b/include/editeng/tstpitem.hxx @@ -139,7 +139,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxTabStopItem* Clone( SfxItemPool *pPool = nullptr ) const override; void dumpAsXml(xmlTextWriterPtr pWriter) const override; }; diff --git a/include/editeng/twolinesitem.hxx b/include/editeng/twolinesitem.hxx index 34bc607aa22c..d39a3ac6035d 100644 --- a/include/editeng/twolinesitem.hxx +++ b/include/editeng/twolinesitem.hxx @@ -41,7 +41,7 @@ public: // "pure virtual Methods" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SvxTwoLinesItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx index 7240f0ef4c5f..e190348bb6ac 100644 --- a/include/editeng/udlnitem.hxx +++ b/include/editeng/udlnitem.hxx @@ -41,7 +41,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxTextLineItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual sal_uInt16 GetValueCount() const override; @@ -77,7 +77,7 @@ public: SvxUnderlineItem( const FontLineStyle eSt, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxUnderlineItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; }; @@ -93,7 +93,7 @@ public: SvxOverlineItem( const FontLineStyle eSt, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxOverlineItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; }; diff --git a/include/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx index c9196bafcece..e6686d658911 100644 --- a/include/editeng/ulspitem.hxx +++ b/include/editeng/ulspitem.hxx @@ -56,7 +56,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxULSpaceItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx index 4a7161294cc9..121cfcf318a6 100644 --- a/include/editeng/wghtitem.hxx +++ b/include/editeng/wghtitem.hxx @@ -44,7 +44,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxWeightItem* Clone( SfxItemPool *pPool = nullptr ) const override; static OUString GetValueTextByPos( sal_uInt16 nPos ); virtual sal_uInt16 GetValueCount() const override; diff --git a/include/editeng/widwitem.hxx b/include/editeng/widwitem.hxx index 0eb8f76f6231..5d64962d32ef 100644 --- a/include/editeng/widwitem.hxx +++ b/include/editeng/widwitem.hxx @@ -37,7 +37,7 @@ public: SvxWidowsItem( const sal_uInt8 nL /*= 0*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxWidowsItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/writingmodeitem.hxx b/include/editeng/writingmodeitem.hxx index cab2cea86ea4..f9e116d76897 100644 --- a/include/editeng/writingmodeitem.hxx +++ b/include/editeng/writingmodeitem.hxx @@ -37,7 +37,7 @@ public: SvxWritingModeItem & operator =(SvxWritingModeItem const &) = delete; // due to SfxUInt16Item SvxWritingModeItem & operator =(SvxWritingModeItem &&) = delete; // due to SfxUInt16Item - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxWritingModeItem* Clone( SfxItemPool *pPool = nullptr ) const override; css::text::WritingMode GetValue() const { return static_cast<css::text::WritingMode>(SfxUInt16Item::GetValue()); } virtual bool GetPresentation( SfxItemPresentation ePres, diff --git a/include/editeng/wrlmitem.hxx b/include/editeng/wrlmitem.hxx index 159f9d7b2607..6226d3262e07 100644 --- a/include/editeng/wrlmitem.hxx +++ b/include/editeng/wrlmitem.hxx @@ -39,7 +39,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxWordLineModeItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/xmlcnitm.hxx b/include/editeng/xmlcnitm.hxx index f5c20b3aa912..b5eb190fb5e2 100644 --- a/include/editeng/xmlcnitm.hxx +++ b/include/editeng/xmlcnitm.hxx @@ -48,7 +48,7 @@ public: 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; - virtual SfxPoolItem *Clone( SfxItemPool * = nullptr) const override + virtual SvXMLAttrContainerItem* Clone( SfxItemPool * = nullptr) const override { return new SvXMLAttrContainerItem( *this ); } bool AddAttr( const OUString& rLName, diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index 925709b759e4..f08855ee8d18 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -87,7 +87,7 @@ public: SfxLinkItem( sal_uInt16 nWhichId, const Link<SfxPoolItem const *, void>& rValue ) : SfxPoolItem( nWhichId ) { aLink = rValue; } - virtual SfxPoolItem* Clone( SfxItemPool* = nullptr ) const override + virtual SfxLinkItem* Clone( SfxItemPool* = nullptr ) const override { return new SfxLinkItem( *this ); } virtual bool operator==( const SfxPoolItem& rL) const override { return static_cast<const SfxLinkItem&>(rL).aLink == aLink; } diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index b02a3138b6c8..559e529df658 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -153,7 +153,7 @@ public: GetCmisProperties() const { return m_aCmisProperties;} void SetCmisProperties(const css::uno::Sequence< css::document::CmisProperty >& cmisProps ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SfxDocumentInfoItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) 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; diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx index 8226b711e133..0233f0810cee 100644 --- a/include/sfx2/evntconf.hxx +++ b/include/sfx2/evntconf.hxx @@ -77,7 +77,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxEventNamesItem* Clone( SfxItemPool *pPool = nullptr ) const override; const SfxEventNamesList& GetEvents() const { return aEventsList;} void AddEvent( const OUString&, const OUString&, SvMacroItemId ); diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index ed25e05d97d5..65fdd26ebefb 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -168,7 +168,7 @@ public: SfxFrameItem( sal_uInt16 nWhich, SfxFrame *p ); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxFrameItem* 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; @@ -186,7 +186,7 @@ public: const css::uno::Any& GetValue() const { return aValue; } virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxUnoAnyItem* 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; }; @@ -204,7 +204,7 @@ public: GetFrame() const { return m_xFrame; } virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxUnoFrameItem* 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; }; diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx index 8132db6aad3b..8727b7815abd 100644 --- a/include/sfx2/minfitem.hxx +++ b/include/sfx2/minfitem.hxx @@ -43,7 +43,7 @@ public: const OUString &rMethodName, const OUString &rComment); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxMacroInfoItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; const OUString& GetMethod() const { return aMethodName; } diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx index 4285166b9398..b7374aa8a4f4 100644 --- a/include/sfx2/objitem.hxx +++ b/include/sfx2/objitem.hxx @@ -34,7 +34,7 @@ public: SfxObjectItem( sal_uInt16 nWhich=0, SfxShell *pSh=nullptr ); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxObjectItem* Clone( SfxItemPool *pPool = nullptr ) const override; SfxShell* GetShell() const { return _pSh; } diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 0352f2f1ac2a..35fc43ad2b1d 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -870,7 +870,7 @@ public: {} virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxObjectShellItem* 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; }; diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index b8229ca338a0..f4c4b9c7b14b 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -46,7 +46,7 @@ class SFX2_DLLPUBLIC SfxTabDialogItem final : public SfxSetItem public: SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet ); SfxTabDialogItem(const SfxTabDialogItem& rAttr, SfxItemPool* pItemPool); - virtual SfxPoolItem* Clone(SfxItemPool* pToPool = nullptr) const override; + virtual SfxTabDialogItem* Clone(SfxItemPool* pToPool = nullptr) const override; }; class SFX2_DLLPUBLIC SfxTabDialogController : public SfxOkDialogController diff --git a/include/sfx2/tplpitem.hxx b/include/sfx2/tplpitem.hxx index 9276ab5524ad..927d67e89625 100644 --- a/include/sfx2/tplpitem.hxx +++ b/include/sfx2/tplpitem.hxx @@ -36,7 +36,7 @@ public: const OUString& GetStyleName() const { return aStyle; } - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxTemplateItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual sal_uInt8 GetFlagCount() const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 20bcc4904fcb..8367cff4583b 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -260,7 +260,7 @@ public: {} virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxViewFrameItem* Clone( SfxItemPool *pPool = nullptr ) const override; SfxViewFrame* GetFrame() const { return pFrame; } diff --git a/include/sfx2/watermarkitem.hxx b/include/sfx2/watermarkitem.hxx index 4af89357d214..c298894bb518 100644 --- a/include/sfx2/watermarkitem.hxx +++ b/include/sfx2/watermarkitem.hxx @@ -18,7 +18,7 @@ class SFX2_DLLPUBLIC SfxWatermarkItem final : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); SfxWatermarkItem(); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxWatermarkItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) 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; diff --git a/include/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx index 4bc7a682cea0..32285cb704cd 100644 --- a/include/sfx2/zoomitem.hxx +++ b/include/sfx2/zoomitem.hxx @@ -69,7 +69,7 @@ public: SvxZoomType GetType() const { return eType; } void SetType( SvxZoomType eNewType ) { eType = eNewType; } - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxZoomItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) 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; diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx index 9b2c942b0066..9778b67e8ad9 100644 --- a/include/svl/aeitem.hxx +++ b/include/svl/aeitem.hxx @@ -38,7 +38,7 @@ public: void SetTextByPos( sal_uInt16 nPos, const OUString &rText ); OUString const & GetTextByPos( sal_uInt16 nPos ) const; sal_Int32 GetTextCount() const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxAllEnumItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( SfxPoolItem const & ) const override; }; diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx index 5176d150629c..bde59c39906b 100644 --- a/include/svl/cintitem.hxx +++ b/include/svl/cintitem.hxx @@ -47,7 +47,7 @@ public: virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + virtual CntByteItem* Clone(SfxItemPool * = nullptr) const override; sal_uInt8 GetValue() const { return m_nValue; } @@ -84,7 +84,7 @@ public: virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + virtual CntUInt16Item* Clone(SfxItemPool * = nullptr) const override; sal_uInt16 GetValue() const { return m_nValue; } @@ -121,7 +121,7 @@ public: virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + virtual CntInt32Item* Clone(SfxItemPool * = nullptr) const override; sal_Int32 GetValue() const { return m_nValue; } @@ -158,7 +158,7 @@ public: virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + virtual CntUInt32Item* Clone(SfxItemPool * = nullptr) const override; sal_uInt32 GetValue() const { return m_nValue; } diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx index 5ace7fa7c5c7..d46fe011ad6c 100644 --- a/include/svl/custritm.hxx +++ b/include/svl/custritm.hxx @@ -51,7 +51,7 @@ public: virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + virtual CntUnencodedStringItem* Clone(SfxItemPool * = nullptr) const override; const OUString & GetValue() const { return m_aValue; } diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx index aaef90e75964..114e451c061d 100644 --- a/include/svl/eitem.hxx +++ b/include/svl/eitem.hxx @@ -97,7 +97,7 @@ public: virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8) override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + virtual SfxBoolItem* Clone(SfxItemPool * = nullptr) const override; virtual OUString GetValueTextByVal(bool bTheValue) const; }; diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx index db061e38c326..70b968f2c95c 100644 --- a/include/svl/flagitem.hxx +++ b/include/svl/flagitem.hxx @@ -37,7 +37,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxFlagItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/include/svl/globalnameitem.hxx b/include/svl/globalnameitem.hxx index a3ab6d3e11a6..edbb56273232 100644 --- a/include/svl/globalnameitem.hxx +++ b/include/svl/globalnameitem.hxx @@ -40,7 +40,7 @@ public: SfxGlobalNameItem & operator =(SfxGlobalNameItem &&) = delete; // due to SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxGlobalNameItem* Clone( SfxItemPool *pPool = nullptr ) const override; const SvGlobalName& GetValue() const { return m_aName; } virtual bool PutValue ( const css::uno::Any& rVal, diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx index 3614e79a18e5..77a619aec4c1 100644 --- a/include/svl/grabbagitem.hxx +++ b/include/svl/grabbagitem.hxx @@ -36,7 +36,7 @@ public: std::map<OUString, css::uno::Any>& GetGrabBag() { return m_aMap; } bool operator==(const SfxPoolItem& rItem) const override; - SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + SfxGrabBagItem* Clone(SfxItemPool* pPool = nullptr) const override; bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override; diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx index 592743d71182..ec40762b6a43 100644 --- a/include/svl/ilstitem.hxx +++ b/include/svl/ilstitem.hxx @@ -45,7 +45,7 @@ public: const std::vector< sal_Int32 >& GetList() const { return m_aList; } virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxIntegerListItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool PutValue ( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; }; diff --git a/include/svl/imageitm.hxx b/include/svl/imageitm.hxx index cee429ba892b..ccecc5356637 100644 --- a/include/svl/imageitm.hxx +++ b/include/svl/imageitm.hxx @@ -34,7 +34,7 @@ public: SfxImageItem( const SfxImageItem& ); virtual ~SfxImageItem() override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SfxImageItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) 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; diff --git a/include/svl/int64item.hxx b/include/svl/int64item.hxx index b4f30d9b3337..70a502c645a8 100644 --- a/include/svl/int64item.hxx +++ b/include/svl/int64item.hxx @@ -39,7 +39,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual SfxPoolItem* Clone( SfxItemPool* pOther = nullptr ) const override; + virtual SfxInt64Item* Clone( SfxItemPool* pOther = nullptr ) const override; sal_Int64 GetValue() const { return mnValue;} diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx index 5bf9785cbf43..92999568b7f2 100644 --- a/include/svl/intitem.hxx +++ b/include/svl/intitem.hxx @@ -33,7 +33,7 @@ public: explicit SfxByteItem(sal_uInt16 which = 0, sal_uInt8 nValue = 0): CntByteItem(which, nValue) {} - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override + virtual SfxByteItem* Clone(SfxItemPool * = nullptr) const override { return new SfxByteItem(*this); } }; @@ -64,7 +64,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + virtual SfxInt16Item* Clone(SfxItemPool * = nullptr) const override; sal_Int16 GetValue() const { return m_nValue; } @@ -86,7 +86,7 @@ public: explicit SfxUInt16Item(sal_uInt16 which = 0, sal_uInt16 nValue = 0): CntUInt16Item(which, nValue) {} - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override + virtual SfxUInt16Item* Clone(SfxItemPool * = nullptr) const override { return new SfxUInt16Item(*this); } void dumpAsXml(xmlTextWriterPtr pWriter) const override; @@ -102,7 +102,7 @@ public: explicit SfxInt32Item(sal_uInt16 which = 0, sal_Int32 nValue = 0): CntInt32Item(which, nValue) {} - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override + virtual SfxInt32Item* Clone(SfxItemPool * = nullptr) const override { return new SfxInt32Item(*this); } void dumpAsXml(xmlTextWriterPtr pWriter) const override; @@ -118,7 +118,7 @@ public: explicit SfxUInt32Item(sal_uInt16 which = 0, sal_uInt32 nValue = 0): CntUInt32Item(which, nValue) {} - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override + virtual SfxUInt32Item* Clone(SfxItemPool * = nullptr) const override { return new SfxUInt32Item(*this); } void dumpAsXml(xmlTextWriterPtr pWriter) const override; diff --git a/include/svl/lckbitem.hxx b/include/svl/lckbitem.hxx index 0e0f7dd6dd81..5625a7aac098 100644 --- a/include/svl/lckbitem.hxx +++ b/include/svl/lckbitem.hxx @@ -38,7 +38,7 @@ public: SfxLockBytesItem & operator =(SfxLockBytesItem &&) = delete; // due to SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxLockBytesItem* Clone( SfxItemPool *pPool = nullptr ) const override; SvLockBytes* GetValue() const { return _xVal.get(); } diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx index f796d1d3586b..19a49dde97c3 100644 --- a/include/svl/macitem.hxx +++ b/include/svl/macitem.hxx @@ -118,7 +118,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxMacroItem* Clone( SfxItemPool *pPool = nullptr ) const override; const SvxMacroTableDtor& GetMacroTable() const { return aMacroTable;} void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aMacroTable = rTbl; } diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index d3b95e0cf9f5..f1bb0cfab4d3 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -268,7 +268,7 @@ public: virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override; // create a copy of itself - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxVoidItem* Clone( SfxItemPool *pPool = nullptr ) const override; /** Always returns true as this is an SfxVoidItem. */ virtual bool IsVoidItem() const override; @@ -295,7 +295,7 @@ public: const IntlWrapper& ) const override; // create a copy of itself - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override = 0; + virtual SfxSetItem* Clone( SfxItemPool *pPool = nullptr ) const override = 0; const SfxItemSet& GetItemSet() const { return *pSet; } diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx index c98a2fe81adf..2ceb39410695 100644 --- a/include/svl/ptitem.hxx +++ b/include/svl/ptitem.hxx @@ -43,7 +43,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxPointItem* Clone( SfxItemPool *pPool = nullptr ) const override; const Point& GetValue() const { return aVal; } void SetValue( const Point& rNewVal ) { diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx index 5da145bb2da9..94465bad4149 100644 --- a/include/svl/rectitem.hxx +++ b/include/svl/rectitem.hxx @@ -41,7 +41,7 @@ public: const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxRectangleItem* Clone( SfxItemPool *pPool = nullptr ) const override; const tools::Rectangle& GetValue() const { return aVal; } virtual bool QueryValue( css::uno::Any& rVal, diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx index 5b33e3d3574d..08404d83e6ef 100644 --- a/include/svl/rngitem.hxx +++ b/include/svl/rngitem.hxx @@ -39,7 +39,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxRangeItem* Clone( SfxItemPool *pPool = nullptr ) const override; sal_uInt16& From() { return nFrom; } }; diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx index ef2a1b83b8b5..9215cf82d7c8 100644 --- a/include/svl/slstitm.hxx +++ b/include/svl/slstitm.hxx @@ -60,7 +60,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SfxStringListItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool PutValue ( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx index 9b46d07e26b2..c7f7381f77c6 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -99,7 +99,7 @@ public: 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; virtual bool operator == ( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxSearchItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/include/svl/stritem.hxx b/include/svl/stritem.hxx index 37546d88b4b2..fe3695f7947b 100644 --- a/include/svl/stritem.hxx +++ b/include/svl/stritem.hxx @@ -34,7 +34,7 @@ public: SfxStringItem(sal_uInt16 which, const OUString & rValue): CntUnencodedStringItem(which, rValue) {} - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + virtual SfxStringItem* Clone(SfxItemPool * = nullptr) const override; void dumpAsXml(xmlTextWriterPtr pWriter) const override; diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx index 457ac02f7e68..4ae5cdd550c1 100644 --- a/include/svl/visitem.hxx +++ b/include/svl/visitem.hxx @@ -49,7 +49,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + virtual SfxVisibilityItem* Clone(SfxItemPool * = nullptr) const override; bool GetValue() const { return m_nValue.bVisible; } }; diff --git a/include/svx/AffineMatrixItem.hxx b/include/svx/AffineMatrixItem.hxx index 6b3cbebf872f..4c9f9cf06a6c 100644 --- a/include/svx/AffineMatrixItem.hxx +++ b/include/svx/AffineMatrixItem.hxx @@ -37,7 +37,7 @@ public: virtual ~AffineMatrixItem() override; virtual bool operator==(const SfxPoolItem&) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual AffineMatrixItem* 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; diff --git a/include/svx/SmartTagItem.hxx b/include/svx/SmartTagItem.hxx index 00f52f7883dc..3fe96af56fd2 100644 --- a/include/svx/SmartTagItem.hxx +++ b/include/svx/SmartTagItem.hxx @@ -63,7 +63,7 @@ public: // "purely virtual methods" from the SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxSmartTagItem* 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; diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx index 67837566c81e..cb37a21ba869 100644 --- a/include/svx/algitem.hxx +++ b/include/svx/algitem.hxx @@ -50,7 +50,7 @@ public: virtual sal_uInt16 GetValueCount() const override; static OUString GetValueText( SvxCellOrientation nVal ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxOrientationItem* Clone( SfxItemPool *pPool = nullptr ) const override; /** Returns sal_True, if the item represents STACKED state. */ bool IsStacked() const; @@ -77,7 +77,7 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxMarginItem* 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; diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx index a1e4f8d8edbc..07b0b5eea7c5 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -83,7 +83,7 @@ public: SvxChartRegressItem(SvxChartRegress eRegress /*= SvxChartRegress::Linear*/, sal_uInt16 nId ); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual SvxChartRegressItem* Clone(SfxItemPool* pPool = nullptr) const override; sal_uInt16 GetValueCount() const override { return CHREGRESS_COUNT; } }; @@ -94,7 +94,7 @@ public: SvxChartTextOrderItem(SvxChartTextOrder eOrder /*= SvxChartTextOrder::SideBySide*/, sal_uInt16 nId ); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual SvxChartTextOrderItem* 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; @@ -108,7 +108,7 @@ public: SvxChartKindErrorItem(SvxChartKindError /*eOrient = SvxChartKindError::NONE*/, sal_uInt16 nId ); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual SvxChartKindErrorItem* Clone(SfxItemPool* pPool = nullptr) const override; sal_uInt16 GetValueCount() const override { return CHERROR_COUNT; } }; @@ -119,7 +119,7 @@ public: SvxChartIndicateItem(SvxChartIndicate eOrient /*= SvxChartIndicate::NONE*/, sal_uInt16 nId ); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual SvxChartIndicateItem* Clone(SfxItemPool* pPool = nullptr) const override; sal_uInt16 GetValueCount() const override { return CHINDICATE_COUNT; } }; @@ -142,7 +142,7 @@ public: OUString &rText, const IntlWrapper&) const override; virtual bool operator == (const SfxPoolItem&) const override; - virtual SfxPoolItem* Clone(SfxItemPool *pPool = nullptr) const override; + virtual SvxDoubleItem* Clone(SfxItemPool *pPool = nullptr) const override; double GetValue() const { return fVal; } }; diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx index 3ea11ca0ead4..74054a1d88bf 100644 --- a/include/svx/clipfmtitem.hxx +++ b/include/svx/clipfmtitem.hxx @@ -34,7 +34,7 @@ struct SvxClipboardFormatItem_Impl; class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxClipboardFormatItem final : public SfxPoolItem { virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxClipboardFormatItem* Clone( SfxItemPool *pPool = nullptr ) const override; public: static SfxPoolItem* CreateDefault(); diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx index f49c0833a252..a7b0933559a4 100644 --- a/include/svx/drawitem.hxx +++ b/include/svx/drawitem.hxx @@ -41,7 +41,7 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxColorListItem* 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; @@ -66,7 +66,7 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxGradientListItem* 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; @@ -90,7 +90,7 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxHatchListItem* 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; @@ -115,7 +115,7 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxBitmapListItem* 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; @@ -139,7 +139,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxPatternListItem* 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; @@ -164,7 +164,7 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxDashListItem* 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; @@ -189,7 +189,7 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxLineEndListItem* 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; diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx index 20e030980e62..8216c61ab3a1 100644 --- a/include/svx/e3ditem.hxx +++ b/include/svx/e3ditem.hxx @@ -34,7 +34,7 @@ public: virtual ~SvxB3DVectorItem() override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxB3DVectorItem* 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; diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx index ed8b635ced66..aa513ed270c0 100644 --- a/include/svx/galleryitem.hxx +++ b/include/svx/galleryitem.hxx @@ -57,7 +57,7 @@ public: // pure virtual methods from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxGalleryItem* Clone( SfxItemPool *pPool = nullptr ) const override; // bridge to UNO 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; diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx index f51749e0d448..08eded81b517 100644 --- a/include/svx/hlnkitem.hxx +++ b/include/svx/hlnkitem.hxx @@ -70,7 +70,7 @@ public: SvxMacroTableDtor const *pMacroTbl ); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxHyperlinkItem* 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; diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx index b10a2e144e09..de3c88101449 100644 --- a/include/svx/numinf.hxx +++ b/include/svx/numinf.hxx @@ -44,7 +44,7 @@ public: virtual ~SvxNumberInfoItem() override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxNumberInfoItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/ofaitem.hxx b/include/svx/ofaitem.hxx index f36c3d904ff1..1d8b5e2ceeca 100644 --- a/include/svx/ofaitem.hxx +++ b/include/svx/ofaitem.hxx @@ -32,7 +32,7 @@ public: OfaPtrItem( sal_uInt16 nWhich, void *pPtr ); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual OfaPtrItem* Clone( SfxItemPool *pPool = nullptr ) const override; void* GetValue() const { return pPtr; } }; @@ -51,7 +51,7 @@ public: return SfxPoolItem::operator==(rItem) && mxRef == static_cast<OfaRefItem<reference_type> const &>(rItem).mxRef; } - virtual SfxPoolItem* Clone( SfxItemPool* /*pPool = 0*/ ) const override + virtual OfaRefItem<reference_type>* Clone( SfxItemPool* /*pPool = 0*/ ) const override { return new OfaRefItem( *this ); } diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index ba3c21c63ce3..33be89ecb89a 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -76,7 +76,7 @@ class SVX_DLLPUBLIC SvxGridItem : public SvxOptionsGrid, public SfxPoolItem public: SvxGridItem( sal_uInt16 _nWhich) : SfxPoolItem(_nWhich){}; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxGridItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx index f47bcdf463c5..b22eb15e1e47 100644 --- a/include/svx/pageitem.hxx +++ b/include/svx/pageitem.hxx @@ -65,7 +65,7 @@ public: virtual ~SvxPageItem() override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxPageItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, @@ -103,7 +103,7 @@ public: SvxSetItem( const SvxSetItem& rItem ); SvxSetItem( const sal_uInt16 nId, std::unique_ptr<SfxItemSet>&& pSet ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxSetItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx index b175c208cb63..2ff44c84b344 100644 --- a/include/svx/postattr.hxx +++ b/include/svx/postattr.hxx @@ -38,7 +38,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxPostItAuthorItem* Clone( SfxItemPool *pPool = nullptr ) const override; }; @@ -58,7 +58,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxPostItDateItem* Clone( SfxItemPool *pPool = nullptr ) const override; }; /** The text of a note @@ -78,7 +78,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxPostItTextItem* Clone( SfxItemPool *pPool = nullptr ) const override; }; @@ -92,7 +92,7 @@ public: SvxPostItIdItem( sal_uInt16 nWhich ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxPostItIdItem* Clone( SfxItemPool *pPool = nullptr ) const override; }; #endif diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx index 013bf98d1240..0c2e6bfb50aa 100644 --- a/include/svx/rotmodit.hxx +++ b/include/svx/rotmodit.hxx @@ -44,7 +44,7 @@ public: virtual ~SvxRotateModeItem() override; virtual sal_uInt16 GetValueCount() const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxRotateModeItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index 7b7a33b8e8fc..2f0df198f099 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -38,7 +38,7 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem final : public SfxPoolItem MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxLongLRSpaceItem* Clone( SfxItemPool *pPool = nullptr ) const override; const SvxLongLRSpaceItem& operator=(const SvxLongLRSpaceItem &) = delete; @@ -67,7 +67,7 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem final : public SfxPoolItem MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxLongULSpaceItem* Clone( SfxItemPool *pPool = nullptr ) const override; const SvxLongULSpaceItem& operator=(const SvxLongULSpaceItem &) = delete; @@ -97,7 +97,7 @@ class SVX_DLLPUBLIC SvxPagePosSizeItem final : public SfxPoolItem MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxPagePosSizeItem* Clone( SfxItemPool *pPool = nullptr ) const override; private: const SvxPagePosSizeItem& operator=(const SvxPagePosSizeItem &) = delete; @@ -159,7 +159,7 @@ class SVX_DLLPUBLIC SvxColumnItem final : public SfxPoolItem OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxColumnItem* 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; @@ -205,7 +205,7 @@ class SVX_DLLPUBLIC SvxObjectItem final : public SfxPoolItem MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxObjectItem* 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; diff --git a/include/svx/sdangitm.hxx b/include/svx/sdangitm.hxx index a8a925939f7b..3ee62cef7df0 100644 --- a/include/svx/sdangitm.hxx +++ b/include/svx/sdangitm.hxx @@ -27,7 +27,7 @@ class SVX_DLLPUBLIC SdrAngleItem: public SfxInt32Item { public: SdrAngleItem(sal_uInt16 nId, sal_Int32 nAngle): SfxInt32Item(nId,nAngle) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrAngleItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index e0aeaddab83a..a66fdefdd1e0 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -64,7 +64,7 @@ private: MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString &rText, const IntlWrapper&) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SdrCustomShapeGeometryItem* 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; diff --git a/include/svx/sdgcoitm.hxx b/include/svx/sdgcoitm.hxx index 2c9c67cc8688..5031bb336dbf 100644 --- a/include/svx/sdgcoitm.hxx +++ b/include/svx/sdgcoitm.hxx @@ -35,7 +35,7 @@ public: SdrGrafRedItem( short nRedPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFRED, nRedPercent ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SdrGrafRedItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; @@ -49,7 +49,7 @@ public: SdrGrafGreenItem( short nGreenPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFGREEN, nGreenPercent ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SdrGrafGreenItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; @@ -63,7 +63,7 @@ public: SdrGrafBlueItem( short nBluePercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFBLUE, nBluePercent ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SdrGrafBlueItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; #endif // INCLUDED_SVX_SDGCOITM_HXX diff --git a/include/svx/sdgcpitm.hxx b/include/svx/sdgcpitm.hxx index 26459d83c55d..ba5bd28688b8 100644 --- a/include/svx/sdgcpitm.hxx +++ b/include/svx/sdgcpitm.hxx @@ -36,7 +36,7 @@ public: sal_Int32 nRightCrop = 0, sal_Int32 nBottomCrop = 0 ) : SvxGrfCrop( nLeftCrop, nRightCrop, nTopCrop, nBottomCrop, SDRATTR_GRAFCROP ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SdrGrafCropItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; #endif // INCLUDED_SVX_SDGCPITM_HXX diff --git a/include/svx/sdggaitm.hxx b/include/svx/sdggaitm.hxx index 96e0647c41bd..3d84c44e13a8 100644 --- a/include/svx/sdggaitm.hxx +++ b/include/svx/sdggaitm.hxx @@ -35,7 +35,7 @@ public: SdrGrafGamma100Item( sal_uInt32 nGamma100 = 100 ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, nGamma100 ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SdrGrafGamma100Item* 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; diff --git a/include/svx/sdginitm.hxx b/include/svx/sdginitm.hxx index 99c9bc1b2b9a..975c0b8c7be8 100644 --- a/include/svx/sdginitm.hxx +++ b/include/svx/sdginitm.hxx @@ -35,7 +35,7 @@ public: SdrGrafInvertItem( bool bInvert = false ) : SdrOnOffItem( SDRATTR_GRAFINVERT, bInvert ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SdrGrafInvertItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; #endif // INCLUDED_SVX_SDGINITM_HXX diff --git a/include/svx/sdgluitm.hxx b/include/svx/sdgluitm.hxx index 5fab3bdb0c44..9e2b328cd56e 100644 --- a/include/svx/sdgluitm.hxx +++ b/include/svx/sdgluitm.hxx @@ -36,7 +36,7 @@ public: SdrGrafLuminanceItem( short nLuminancePercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFLUMINANCE, nLuminancePercent ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SdrGrafLuminanceItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; @@ -50,7 +50,7 @@ public: SdrGrafContrastItem( short nContrastPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFCONTRAST, nContrastPercent ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SdrGrafContrastItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; #endif // INCLUDED_SVX_SDGLUITM_HXX diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx index d070868b432b..94c1a3076496 100644 --- a/include/svx/sdgmoitm.hxx +++ b/include/svx/sdgmoitm.hxx @@ -37,7 +37,7 @@ class SVX_DLLPUBLIC SdrGrafModeItem : public SdrGrafModeItem_Base public: SdrGrafModeItem( GraphicDrawMode eMode = GraphicDrawMode::Standard ) : SdrGrafModeItem_Base( eMode ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SdrGrafModeItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual sal_uInt16 GetValueCount() const override; static OUString GetValueTextByPos( sal_uInt16 nPos ); diff --git a/include/svx/sdgtritm.hxx b/include/svx/sdgtritm.hxx index 8e84db29f235..ed65a379303a 100644 --- a/include/svx/sdgtritm.hxx +++ b/include/svx/sdgtritm.hxx @@ -34,7 +34,7 @@ public: SdrGrafTransparenceItem( sal_uInt16 nTransparencePercent = 0 ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, nTransparencePercent ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SdrGrafTransparenceItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; #endif // INCLUDED_SVX_SDGTRITM_HXX diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx index 2dee63ee4e47..f7342778b12c 100644 --- a/include/svx/sdmetitm.hxx +++ b/include/svx/sdmetitm.hxx @@ -30,7 +30,7 @@ class SVX_DLLPUBLIC SdrMetricItem: public SfxInt32Item { public: SdrMetricItem(sal_uInt16 nId, sal_Int32 nVal): SfxInt32Item(nId,nVal) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrMetricItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual bool HasMetrics() const override; virtual void ScaleMetrics(long nMul, long nDiv) override; diff --git a/include/svx/sdooitm.hxx b/include/svx/sdooitm.hxx index 0e8035432890..4010c8700549 100644 --- a/include/svx/sdooitm.hxx +++ b/include/svx/sdooitm.hxx @@ -30,7 +30,7 @@ class SVX_DLLPUBLIC SdrOnOffItem: public SfxBoolItem { public: SdrOnOffItem(sal_uInt16 nId, bool bOn): SfxBoolItem(nId,bOn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrOnOffItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual OUString GetValueTextByVal(bool bVal) const override; diff --git a/include/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx index ee7ec94588cb..a3ad78402342 100644 --- a/include/svx/sdprcitm.hxx +++ b/include/svx/sdprcitm.hxx @@ -31,7 +31,7 @@ class SVX_DLLPUBLIC SdrPercentItem : public SfxUInt16Item { public: SdrPercentItem(sal_uInt16 nId, sal_uInt16 nVal): SfxUInt16Item(nId,nVal) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrPercentItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; @@ -45,7 +45,7 @@ class SVX_DLLPUBLIC SdrSignedPercentItem : public SfxInt16Item { public: SdrSignedPercentItem( sal_uInt16 nId, sal_Int16 nVal ) : SfxInt16Item( nId,nVal ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SdrSignedPercentItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sdtaaitm.hxx b/include/svx/sdtaaitm.hxx index 6d4c313a8514..03aba5f9b9fd 100644 --- a/include/svx/sdtaaitm.hxx +++ b/include/svx/sdtaaitm.hxx @@ -26,7 +26,7 @@ class SVX_DLLPUBLIC SdrTextAniAmountItem final : public SfxInt16Item { public: SdrTextAniAmountItem(sal_Int16 nVal=0): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,nVal) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrTextAniAmountItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual bool HasMetrics() const override; virtual void ScaleMetrics(long nMul, long nDiv) override; diff --git a/include/svx/sdtacitm.hxx b/include/svx/sdtacitm.hxx index bf145c8b6b6c..c8bf4b773efa 100644 --- a/include/svx/sdtacitm.hxx +++ b/include/svx/sdtacitm.hxx @@ -27,7 +27,7 @@ class SdrTextAniCountItem final : public SfxUInt16Item { public: SdrTextAniCountItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,nVal) {} - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override + virtual SdrTextAniCountItem* Clone(SfxItemPool * = nullptr) const override { return new SdrTextAniCountItem(*this); } }; diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx index 2f4c4ef78535..87788994ad6e 100644 --- a/include/svx/sdtaditm.hxx +++ b/include/svx/sdtaditm.hxx @@ -34,7 +34,7 @@ enum class SdrTextAniDirection class SVX_DLLPUBLIC SdrTextAniDirectionItem: public SfxEnumItem<SdrTextAniDirection> { public: SdrTextAniDirectionItem(SdrTextAniDirection eDir=SdrTextAniDirection::Left): SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION, eDir) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrTextAniDirectionItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/sdtaiitm.hxx b/include/svx/sdtaiitm.hxx index c998393720eb..37291ce62bd8 100644 --- a/include/svx/sdtaiitm.hxx +++ b/include/svx/sdtaiitm.hxx @@ -26,7 +26,7 @@ class SVX_DLLPUBLIC SdrTextAniStartInsideItem final : public SdrYesNoItem { public: SdrTextAniStartInsideItem(bool bOn=false): SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,bOn) {} virtual ~SdrTextAniStartInsideItem() override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrTextAniStartInsideItem* Clone(SfxItemPool* pPool=nullptr) const override; SdrTextAniStartInsideItem(SdrTextAniStartInsideItem const &) = default; SdrTextAniStartInsideItem(SdrTextAniStartInsideItem &&) = default; @@ -38,7 +38,7 @@ class SVX_DLLPUBLIC SdrTextAniStopInsideItem final : public SdrYesNoItem { public: SdrTextAniStopInsideItem(bool bOn=false): SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,bOn) {} virtual ~SdrTextAniStopInsideItem() override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrTextAniStopInsideItem* Clone(SfxItemPool* pPool=nullptr) const override; SdrTextAniStopInsideItem(SdrTextAniStopInsideItem const &) = default; SdrTextAniStopInsideItem(SdrTextAniStopInsideItem &&) = default; diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx index bfedb5c39117..5a7ecdfc73bf 100644 --- a/include/svx/sdtaitm.hxx +++ b/include/svx/sdtaitm.hxx @@ -36,7 +36,7 @@ class SVX_DLLPUBLIC SdrTextVertAdjustItem: public SfxEnumItem<SdrTextVertAdjust> public: SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST, eAdj) {} SdrTextVertAdjustItem(SdrTextVertAdjust eAdj, sal_uInt16 nWhich): SfxEnumItem(nWhich, eAdj) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrTextVertAdjustItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 5; } virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -59,7 +59,7 @@ enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT, // left adjusted class SVX_DLLPUBLIC SdrTextHorzAdjustItem: public SfxEnumItem<SdrTextHorzAdjust> { public: SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): SfxEnumItem(SDRATTR_TEXT_HORZADJUST, eAdj) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrTextHorzAdjustItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx index 5c06ef484378..d4d481cf40f7 100644 --- a/include/svx/sdtakitm.hxx +++ b/include/svx/sdtakitm.hxx @@ -79,7 +79,7 @@ enum class SdrTextAniKind { class SVX_DLLPUBLIC SdrTextAniKindItem: public SfxEnumItem<SdrTextAniKind> { public: SdrTextAniKindItem(SdrTextAniKind eKind=SdrTextAniKind::NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND, eKind) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrTextAniKindItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 5; } virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/sdtayitm.hxx b/include/svx/sdtayitm.hxx index 774a1ef135e8..b20172854838 100644 --- a/include/svx/sdtayitm.hxx +++ b/include/svx/sdtayitm.hxx @@ -26,7 +26,7 @@ class SVX_DLLPUBLIC SdrTextAniDelayItem final : public SfxUInt16Item { public: SdrTextAniDelayItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,nVal) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrTextAniDelayItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx index 3120647c7726..03faae2747b5 100644 --- a/include/svx/sdtfchim.hxx +++ b/include/svx/sdtfchim.hxx @@ -32,7 +32,7 @@ public: MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString &rText, const IntlWrapper&) const override; - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + SVX_DLLPRIVATE virtual SdrTextFixedCellHeightItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx index ac5b71cec722..c95b5dd6754c 100644 --- a/include/svx/sdtfsitm.hxx +++ b/include/svx/sdtfsitm.hxx @@ -38,7 +38,7 @@ public: SdrTextFitToSizeTypeItem( css::drawing::TextFitToSizeType const eFit = css::drawing::TextFitToSizeType_NONE) : SfxEnumItem(SDRATTR_TEXT_FITTOSIZE, eFit) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrTextFitToSizeTypeItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx index 33bdcd0e4934..d17fbdfa1f69 100644 --- a/include/svx/sdynitm.hxx +++ b/include/svx/sdynitm.hxx @@ -30,7 +30,7 @@ class SVX_DLLPUBLIC SdrYesNoItem: public SfxBoolItem { public: SdrYesNoItem(sal_uInt16 nId, bool bOn): SfxBoolItem(nId,bOn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrYesNoItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual OUString GetValueTextByVal(bool bVal) const override; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/svdpool.hxx b/include/svx/svdpool.hxx index 831a02984dbf..0a079e1f060d 100644 --- a/include/svx/svdpool.hxx +++ b/include/svx/svdpool.hxx @@ -36,7 +36,7 @@ private: virtual ~SdrItemPool() override; public: - virtual SfxItemPool* Clone() const override; + virtual SdrItemPool* Clone() const override; virtual bool GetPresentation(const SfxPoolItem& rItem, MapUnit ePresentationMetric, OUString& rText, diff --git a/include/svx/svx3ditems.hxx b/include/svx/svx3ditems.hxx index 7a7d663e77c6..58887e2ac04a 100644 --- a/include/svx/svx3ditems.hxx +++ b/include/svx/svx3ditems.hxx @@ -63,7 +63,7 @@ inline SfxBoolItem makeSvx3DDoubleSidedItem(bool bVal) { class Svx3DReducedLineGeometryItem : public SfxBoolItem { public: Svx3DReducedLineGeometryItem(bool bVal = false); - SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + Svx3DReducedLineGeometryItem* Clone(SfxItemPool * = nullptr) const override; }; class SVX_DLLPUBLIC Svx3DNormalsKindItem : public SfxUInt16Item { @@ -73,7 +73,7 @@ public: // use drawing::NormalsKind SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + SVX_DLLPRIVATE virtual Svx3DNormalsKindItem* Clone(SfxItemPool* pPool = nullptr) const override; }; inline SfxBoolItem makeSvx3DNormalsInvertItem(bool bVal) { @@ -87,7 +87,7 @@ public: // use drawing::TextureProjectionMode SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + SVX_DLLPRIVATE virtual Svx3DTextureProjectionXItem* Clone(SfxItemPool* pPool = nullptr) const override; }; class SVX_DLLPUBLIC Svx3DTextureProjectionYItem : public SfxUInt16Item { @@ -97,7 +97,7 @@ public: // use drawing::TextureProjectionMode 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; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual Svx3DTextureProjectionYItem* Clone(SfxItemPool* pPool = nullptr) const override; }; inline SfxBoolItem makeSvx3DShadow3DItem(bool bVal) { @@ -123,7 +123,7 @@ public: // use drawing::TextureKind SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + SVX_DLLPRIVATE virtual Svx3DTextureKindItem* Clone(SfxItemPool* pPool = nullptr) const override; }; class SVX_DLLPUBLIC Svx3DTextureModeItem final : public SfxUInt16Item { @@ -133,7 +133,7 @@ public: // use drawing:TextureMode SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + SVX_DLLPRIVATE virtual Svx3DTextureModeItem* Clone(SfxItemPool* pPool = nullptr) const override; }; inline SfxBoolItem makeSvx3DTextureFilterItem(bool bVal) { @@ -148,7 +148,7 @@ public: // use drawing::ProjectionMode SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + SVX_DLLPRIVATE virtual Svx3DPerspectiveItem* Clone(SfxItemPool* pPool = nullptr) const override; }; inline SfxUInt32Item makeSvx3DDistanceItem(sal_uInt32 nVal) { @@ -274,7 +274,7 @@ public: // use drawing::ShadeMode SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + SVX_DLLPRIVATE virtual Svx3DShadeModeItem* Clone(SfxItemPool* pPool = nullptr) const override; }; @@ -282,35 +282,35 @@ public: class Svx3DSmoothNormalsItem : public SfxBoolItem { public: Svx3DSmoothNormalsItem(bool bVal = true); - SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + Svx3DSmoothNormalsItem* Clone(SfxItemPool * = nullptr) const override; }; // #107245# Item to replace bExtrudeSmoothFrontBack and bLatheSmoothFrontBack class Svx3DSmoothLidsItem : public SfxBoolItem { public: Svx3DSmoothLidsItem(bool bVal = false); - SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + Svx3DSmoothLidsItem* Clone(SfxItemPool * = nullptr) const override; }; // #107245# Item to replace bExtrudeCharacterMode and bLatheCharacterMode class Svx3DCharacterModeItem : public SfxBoolItem { public: Svx3DCharacterModeItem(bool bVal = false); - SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + Svx3DCharacterModeItem* Clone(SfxItemPool * = nullptr) const override; }; // #107245# Item to replace bExtrudeCloseFront and bLatheCloseFront class SVX_DLLPUBLIC Svx3DCloseFrontItem : public SfxBoolItem { public: Svx3DCloseFrontItem(bool bVal = true); - SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + Svx3DCloseFrontItem* Clone(SfxItemPool * = nullptr) const override; }; // #107245# Item to replace bExtrudeCloseBack and bLatheCloseBack class SVX_DLLPUBLIC Svx3DCloseBackItem : public SfxBoolItem { public: Svx3DCloseBackItem(bool bVal = true); - SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; + Svx3DCloseBackItem* Clone(SfxItemPool * = nullptr) const override; }; #endif // INCLUDED_SVX_SVX3DITEMS_HXX diff --git a/include/svx/svxgrahicitem.hxx b/include/svx/svxgrahicitem.hxx index c946047b440d..cff7f6ad4a49 100644 --- a/include/svx/svxgrahicitem.hxx +++ b/include/svx/svxgrahicitem.hxx @@ -33,7 +33,7 @@ public: SvxGraphicItem( const Graphic& rGraphic); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxGraphicItem* Clone( SfxItemPool *pPool = nullptr ) const override; const Graphic& GetGraphic() const { return aGraphic; } diff --git a/include/svx/sxcaitm.hxx b/include/svx/sxcaitm.hxx index 28b14614d040..50ed46c0c5ce 100644 --- a/include/svx/sxcaitm.hxx +++ b/include/svx/sxcaitm.hxx @@ -35,7 +35,7 @@ class SdrCaptionAngleItem final : public SdrAngleItem { public: SdrCaptionAngleItem(long nAngle=0): SdrAngleItem(SDRATTR_CAPTIONANGLE,nAngle) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrCaptionAngleItem* Clone(SfxItemPool*) const override { return new SdrCaptionAngleItem(*this); } diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx index d3617f94bbd6..f15dc1a30ecc 100644 --- a/include/svx/sxcecitm.hxx +++ b/include/svx/sxcecitm.hxx @@ -33,7 +33,7 @@ enum class SdrCaptionEscDir { Horizontal, Vertical, BestFit }; class SVX_DLLPUBLIC SdrCaptionEscDirItem: public SfxEnumItem<SdrCaptionEscDir> { public: SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SdrCaptionEscDir::Horizontal): SfxEnumItem(SDRATTR_CAPTIONESCDIR, eDir) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrCaptionEscDirItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 3; } static OUString GetValueTextByPos(sal_uInt16 nPos); @@ -50,7 +50,7 @@ class SVX_DLLPUBLIC SdrCaptionEscIsRelItem: public SdrYesNoItem { public: SdrCaptionEscIsRelItem(bool bRel=true): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel) {} virtual ~SdrCaptionEscIsRelItem() override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrCaptionEscIsRelItem* Clone(SfxItemPool* pPool=nullptr) const override; SdrCaptionEscIsRelItem(SdrCaptionEscIsRelItem const &) = default; SdrCaptionEscIsRelItem(SdrCaptionEscIsRelItem &&) = default; @@ -69,7 +69,7 @@ class SVX_DLLPUBLIC SdrCaptionEscRelItem: public SfxInt32Item { public: SdrCaptionEscRelItem(long nEscRel=5000): SfxInt32Item(SDRATTR_CAPTIONESCREL,nEscRel) {} virtual ~SdrCaptionEscRelItem() override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrCaptionEscRelItem* Clone(SfxItemPool* pPool=nullptr) const override; SdrCaptionEscRelItem(SdrCaptionEscRelItem const &) = default; SdrCaptionEscRelItem(SdrCaptionEscRelItem &&) = default; @@ -87,7 +87,7 @@ public: class SdrCaptionEscAbsItem: public SdrMetricItem { public: SdrCaptionEscAbsItem(long nEscAbs=0): SdrMetricItem(SDRATTR_CAPTIONESCABS,nEscAbs) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrCaptionEscAbsItem* Clone(SfxItemPool*) const override { return new SdrCaptionEscAbsItem(*this); } diff --git a/include/svx/sxcgitm.hxx b/include/svx/sxcgitm.hxx index af3229c25e85..e39fff4446aa 100644 --- a/include/svx/sxcgitm.hxx +++ b/include/svx/sxcgitm.hxx @@ -29,7 +29,7 @@ class SdrCaptionGapItem final : public SdrMetricItem { public: SdrCaptionGapItem(long nGap=0) : SdrMetricItem(SDRATTR_CAPTIONGAP,nGap) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrCaptionGapItem* Clone(SfxItemPool*) const override { return new SdrCaptionGapItem(*this); } diff --git a/include/svx/sxcllitm.hxx b/include/svx/sxcllitm.hxx index 4ee4c13dbae0..0ff0f48ca56e 100644 --- a/include/svx/sxcllitm.hxx +++ b/include/svx/sxcllitm.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC SdrCaptionLineLenItem: public SdrMetricItem { public: SdrCaptionLineLenItem(long nLineLen=0): SdrMetricItem(SDRATTR_CAPTIONLINELEN,nLineLen) {} virtual ~SdrCaptionLineLenItem() override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrCaptionLineLenItem* Clone(SfxItemPool* pPool=nullptr) const override; SdrCaptionLineLenItem(SdrCaptionLineLenItem const &) = default; SdrCaptionLineLenItem(SdrCaptionLineLenItem &&) = default; @@ -48,7 +48,7 @@ class SVX_DLLPUBLIC SdrCaptionFitLineLenItem: public SdrYesNoItem { public: SdrCaptionFitLineLenItem(bool bBestFit=true): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {} virtual ~SdrCaptionFitLineLenItem() override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrCaptionFitLineLenItem* Clone(SfxItemPool* pPool=nullptr) const override; SdrCaptionFitLineLenItem(SdrCaptionFitLineLenItem const &) = default; SdrCaptionFitLineLenItem(SdrCaptionFitLineLenItem &&) = default; diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx index f08c8acbbf5d..8bd222fe6d58 100644 --- a/include/svx/sxctitm.hxx +++ b/include/svx/sxctitm.hxx @@ -30,7 +30,7 @@ enum class SdrCaptionType { Type1, Type2, Type3, Type4 }; class SVX_DLLPUBLIC SdrCaptionTypeItem: public SfxEnumItem<SdrCaptionType> { public: SdrCaptionTypeItem(SdrCaptionType eStyle=SdrCaptionType::Type3): SfxEnumItem(SDRATTR_CAPTIONTYPE, eStyle) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrCaptionTypeItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 4; } static OUString GetValueTextByPos(sal_uInt16 nPos); virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx index 2c302a3397e0..69d36dac1367 100644 --- a/include/svx/sxekitm.hxx +++ b/include/svx/sxekitm.hxx @@ -28,12 +28,10 @@ enum class SdrEdgeKind OrthoLines, ThreeLines, OneLine, Bezier, Arc }; - - class SVX_DLLPUBLIC SdrEdgeKindItem: public SfxEnumItem<SdrEdgeKind> { public: SdrEdgeKindItem(SdrEdgeKind eStyle=SdrEdgeKind::OrthoLines): SfxEnumItem(SDRATTR_EDGEKIND, eStyle) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrEdgeKindItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 5; } 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; diff --git a/include/svx/sxelditm.hxx b/include/svx/sxelditm.hxx index 445f00214033..a1efd2c9185f 100644 --- a/include/svx/sxelditm.hxx +++ b/include/svx/sxelditm.hxx @@ -25,7 +25,7 @@ class SdrEdgeLineDeltaCountItem: public SfxUInt16Item { public: SdrEdgeLineDeltaCountItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_EDGELINEDELTACOUNT,nVal) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrEdgeLineDeltaCountItem* Clone(SfxItemPool*) const override { return new SdrEdgeLineDeltaCountItem(*this); } diff --git a/include/svx/sxenditm.hxx b/include/svx/sxenditm.hxx index d5af6ddbacf4..2dfba6016673 100644 --- a/include/svx/sxenditm.hxx +++ b/include/svx/sxenditm.hxx @@ -28,7 +28,7 @@ public: SdrEdgeNode1HorzDistItem(long nVal): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,nVal) {} 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; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrEdgeNode1HorzDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; class SVX_DLLPUBLIC SdrEdgeNode1VertDistItem: public SdrMetricItem { @@ -36,7 +36,7 @@ public: SdrEdgeNode1VertDistItem(long nVal): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,nVal) {} 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; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrEdgeNode1VertDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; class SVX_DLLPUBLIC SdrEdgeNode2HorzDistItem: public SdrMetricItem { @@ -44,7 +44,7 @@ public: SdrEdgeNode2HorzDistItem(long nVal): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,nVal) {} 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; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrEdgeNode2HorzDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; class SVX_DLLPUBLIC SdrEdgeNode2VertDistItem: public SdrMetricItem { @@ -52,19 +52,19 @@ public: SdrEdgeNode2VertDistItem(long nVal): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,nVal) {} 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; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrEdgeNode2VertDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; class SdrEdgeNode1GlueDistItem: public SdrMetricItem { public: SdrEdgeNode1GlueDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1GLUEDIST,nVal) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrEdgeNode1GlueDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; class SdrEdgeNode2GlueDistItem: public SdrMetricItem { public: SdrEdgeNode2GlueDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2GLUEDIST,nVal) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrEdgeNode2GlueDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; #endif diff --git a/include/svx/sxfiitm.hxx b/include/svx/sxfiitm.hxx index 24984b579316..2906b99eff9a 100644 --- a/include/svx/sxfiitm.hxx +++ b/include/svx/sxfiitm.hxx @@ -32,7 +32,7 @@ public: SdrFractionItem(sal_uInt16 nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {} virtual bool operator==(const SfxPoolItem&) const override; virtual bool GetPresentation(SfxItemPresentation ePresentation, MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString &rText, const IntlWrapper&) const override; - virtual SfxPoolItem* Clone(SfxItemPool *pPool=nullptr) const override; + virtual SdrFractionItem* Clone(SfxItemPool *pPool=nullptr) const override; const Fraction& GetValue() const { return nValue; } void SetValue(const Fraction& rVal) { nValue = rVal; } }; diff --git a/include/svx/sxmbritm.hxx b/include/svx/sxmbritm.hxx index 13ccf1620404..0177bc438972 100644 --- a/include/svx/sxmbritm.hxx +++ b/include/svx/sxmbritm.hxx @@ -33,7 +33,7 @@ class SVX_DLLPUBLIC SdrMeasureBelowRefEdgeItem: public SdrYesNoItem { public: SdrMeasureBelowRefEdgeItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASUREBELOWREFEDGE,bOn) {} virtual ~SdrMeasureBelowRefEdgeItem() override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrMeasureBelowRefEdgeItem* Clone(SfxItemPool* pPool=nullptr) const override; SdrMeasureBelowRefEdgeItem(SdrMeasureBelowRefEdgeItem const &) = default; SdrMeasureBelowRefEdgeItem(SdrMeasureBelowRefEdgeItem &&) = default; diff --git a/include/svx/sxmfsitm.hxx b/include/svx/sxmfsitm.hxx index 9e7c9ff4e50e..741ebc27e1d7 100644 --- a/include/svx/sxmfsitm.hxx +++ b/include/svx/sxmfsitm.hxx @@ -27,7 +27,7 @@ class SdrMeasureFormatStringItem: public SfxStringItem { public: SdrMeasureFormatStringItem() : SfxStringItem() { SetWhich(SDRATTR_MEASUREFORMATSTRING); } - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrMeasureFormatStringItem* Clone(SfxItemPool*) const override { return new SdrMeasureFormatStringItem(*this); } diff --git a/include/svx/sxmtfitm.hxx b/include/svx/sxmtfitm.hxx index b3a1daddeb6a..2ca591b0aefd 100644 --- a/include/svx/sxmtfitm.hxx +++ b/include/svx/sxmtfitm.hxx @@ -31,7 +31,7 @@ class SdrMeasureTextIsFixedAngleItem: public SdrYesNoItem { public: SdrMeasureTextIsFixedAngleItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTISFIXEDANGLE,bOn) {} virtual ~SdrMeasureTextIsFixedAngleItem() override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrMeasureTextIsFixedAngleItem* Clone(SfxItemPool* pPool=nullptr) const override; SdrMeasureTextIsFixedAngleItem(SdrMeasureTextIsFixedAngleItem const &) = default; SdrMeasureTextIsFixedAngleItem(SdrMeasureTextIsFixedAngleItem &&) = default; @@ -44,7 +44,7 @@ class SdrMeasureTextFixedAngleItem: public SdrAngleItem { public: SdrMeasureTextFixedAngleItem(long nVal=0): SdrAngleItem(SDRATTR_MEASURETEXTFIXEDANGLE,nVal) {} virtual ~SdrMeasureTextFixedAngleItem() override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrMeasureTextFixedAngleItem* Clone(SfxItemPool* pPool=nullptr) const override; SdrMeasureTextFixedAngleItem(SdrMeasureTextFixedAngleItem const &) = default; SdrMeasureTextFixedAngleItem(SdrMeasureTextFixedAngleItem &&) = default; @@ -57,7 +57,7 @@ class SVX_DLLPUBLIC SdrMeasureDecimalPlacesItem: public SfxInt16Item { public: SdrMeasureDecimalPlacesItem(sal_Int16 nVal=2): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,nVal) {} virtual ~SdrMeasureDecimalPlacesItem() override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrMeasureDecimalPlacesItem* Clone(SfxItemPool* pPool=nullptr) const override; SdrMeasureDecimalPlacesItem(SdrMeasureDecimalPlacesItem const &) = default; SdrMeasureDecimalPlacesItem(SdrMeasureDecimalPlacesItem &&) = default; diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx index bc152fdaf357..8b198301b76c 100644 --- a/include/svx/sxmtpitm.hxx +++ b/include/svx/sxmtpitm.hxx @@ -31,7 +31,7 @@ public: : SfxEnumItem(SDRATTR_MEASURETEXTHPOS, ePos) { } - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrMeasureTextHPosItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 4; } virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -47,7 +47,7 @@ public: : SfxEnumItem(SDRATTR_MEASURETEXTVPOS, ePos) { } - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrMeasureTextVPosItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 5; } virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/sxmtritm.hxx b/include/svx/sxmtritm.hxx index 826e224dc319..9c4fedfe7af7 100644 --- a/include/svx/sxmtritm.hxx +++ b/include/svx/sxmtritm.hxx @@ -27,7 +27,7 @@ class SVX_DLLPUBLIC SdrMeasureTextRota90Item: public SdrYesNoItem { public: SdrMeasureTextRota90Item(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTROTA90,bOn) {} virtual ~SdrMeasureTextRota90Item() override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrMeasureTextRota90Item* Clone(SfxItemPool* pPool=nullptr) const override; SdrMeasureTextRota90Item(SdrMeasureTextRota90Item const &) = default; SdrMeasureTextRota90Item(SdrMeasureTextRota90Item &&) = default; @@ -41,7 +41,7 @@ class SdrMeasureTextUpsideDownItem final : public SdrYesNoItem { public: SdrMeasureTextUpsideDownItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTUPSIDEDOWN,bOn) {} virtual ~SdrMeasureTextUpsideDownItem() override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrMeasureTextUpsideDownItem* Clone(SfxItemPool* pPool=nullptr) const override; SdrMeasureTextUpsideDownItem(SdrMeasureTextUpsideDownItem const &) = default; SdrMeasureTextUpsideDownItem(SdrMeasureTextUpsideDownItem &&) = default; diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx index f05de22226b5..07fc71e9615c 100644 --- a/include/svx/sxmuitm.hxx +++ b/include/svx/sxmuitm.hxx @@ -29,7 +29,7 @@ class SVX_DLLPUBLIC SdrMeasureUnitItem: public SfxEnumItem<FieldUnit> { public: SdrMeasureUnitItem(FieldUnit eUnit=FieldUnit::NONE): SfxEnumItem(SDRATTR_MEASUREUNIT, eUnit) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrMeasureUnitItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 14; } virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/sxsiitm.hxx b/include/svx/sxsiitm.hxx index d7a1cd082c33..38d2d58ab205 100644 --- a/include/svx/sxsiitm.hxx +++ b/include/svx/sxsiitm.hxx @@ -25,7 +25,7 @@ class SdrScaleItem: public SdrFractionItem { public: SdrScaleItem(sal_uInt16 nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {} virtual bool GetPresentation(SfxItemPresentation ePresentation, MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString &rText, const IntlWrapper&) const override; - virtual SfxPoolItem* Clone(SfxItemPool *pPool=nullptr) const override; + virtual SdrScaleItem* Clone(SfxItemPool *pPool=nullptr) const override; }; #endif diff --git a/include/svx/viewlayoutitem.hxx b/include/svx/viewlayoutitem.hxx index d15ecf7d1dce..0a5b3ee434b5 100644 --- a/include/svx/viewlayoutitem.hxx +++ b/include/svx/viewlayoutitem.hxx @@ -40,7 +40,7 @@ public: // "purely virtual methods" from the SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxViewLayoutItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; // empty virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; // empty }; diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index fd915fa6a214..1778722be5c8 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -43,7 +43,7 @@ public: virtual bool operator==( const SfxPoolItem& rItem ) const override; // no idea why, but this item does not play nice with the sorting optimisation, get failures in sd_import_tests virtual bool IsSortable() const override { return false; } - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual XFillBitmapItem* 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; diff --git a/include/svx/xcolit.hxx b/include/svx/xcolit.hxx index 2919f2034462..be515f607546 100644 --- a/include/svx/xcolit.hxx +++ b/include/svx/xcolit.hxx @@ -46,7 +46,7 @@ public: XColorItem(const XColorItem& rItem); virtual bool operator==(const SfxPoolItem& rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XColorItem* Clone(SfxItemPool* pPool = nullptr) const override; const Color& GetColorValue() const; void SetColorValue(const Color& rNew) { aColor = rNew; Detach(); } diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx index 57443f186b8b..585eb0f87ff5 100644 --- a/include/svx/xfillit0.hxx +++ b/include/svx/xfillit0.hxx @@ -35,7 +35,7 @@ public: XFillStyleItem(css::drawing::FillStyle = css::drawing::FillStyle_SOLID); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFillStyleItem* 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; diff --git a/include/svx/xflasit.hxx b/include/svx/xflasit.hxx index 5b187e37fbae..aee5cb7f13ac 100644 --- a/include/svx/xflasit.hxx +++ b/include/svx/xflasit.hxx @@ -36,7 +36,7 @@ public: XFillAttrSetItem(const XFillAttrSetItem& rAttr); XFillAttrSetItem(const XFillAttrSetItem& rAttr, SfxItemPool* pItemPool); - virtual SfxPoolItem* Clone( SfxItemPool* pToPool = nullptr ) const override; + virtual XFillAttrSetItem* Clone( SfxItemPool* pToPool = nullptr ) const override; }; #endif diff --git a/include/svx/xflbckit.hxx b/include/svx/xflbckit.hxx index eab189534123..6dc89e3d1fff 100644 --- a/include/svx/xflbckit.hxx +++ b/include/svx/xflbckit.hxx @@ -34,7 +34,7 @@ class SVX_DLLPUBLIC XFillBackgroundItem final : public SfxBoolItem public: XFillBackgroundItem( bool bFill = false ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + SVX_DLLPRIVATE virtual XFillBackgroundItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/xflbmpit.hxx b/include/svx/xflbmpit.hxx index 801dccd305de..ea5f94b344f6 100644 --- a/include/svx/xflbmpit.hxx +++ b/include/svx/xflbmpit.hxx @@ -29,7 +29,7 @@ class SVX_DLLPUBLIC XFillBmpPosItem final : public SfxEnumItem<RectPoint> public: XFillBmpPosItem( RectPoint eRP = RectPoint::MM ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + SVX_DLLPRIVATE virtual XFillBmpPosItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/xflbmsli.hxx b/include/svx/xflbmsli.hxx index 5b54a5a012ac..7516eef0e988 100644 --- a/include/svx/xflbmsli.hxx +++ b/include/svx/xflbmsli.hxx @@ -28,7 +28,7 @@ class SVX_DLLPUBLIC XFillBmpSizeLogItem final : public SfxBoolItem public: XFillBmpSizeLogItem( bool bLog = true ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + SVX_DLLPRIVATE virtual XFillBmpSizeLogItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/xflbmsxy.hxx b/include/svx/xflbmsxy.hxx index a1120c878859..1321969723fa 100644 --- a/include/svx/xflbmsxy.hxx +++ b/include/svx/xflbmsxy.hxx @@ -28,7 +28,7 @@ class SVX_DLLPUBLIC XFillBmpSizeXItem final : public SfxMetricItem public: XFillBmpSizeXItem( long nSizeX = 0 ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + SVX_DLLPRIVATE virtual XFillBmpSizeXItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, @@ -44,7 +44,7 @@ class SVX_DLLPUBLIC XFillBmpSizeYItem final : public SfxMetricItem public: XFillBmpSizeYItem( long nSizeY = 0 ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + SVX_DLLPRIVATE virtual XFillBmpSizeYItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/xflbmtit.hxx b/include/svx/xflbmtit.hxx index d0baab39f84a..52998ea69394 100644 --- a/include/svx/xflbmtit.hxx +++ b/include/svx/xflbmtit.hxx @@ -28,7 +28,7 @@ class SVX_DLLPUBLIC XFillBmpTileItem final : public SfxBoolItem public: XFillBmpTileItem( bool bTile = true ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual XFillBmpTileItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/xflboxy.hxx b/include/svx/xflboxy.hxx index 00375c95224d..b8a3bb3b874c 100644 --- a/include/svx/xflboxy.hxx +++ b/include/svx/xflboxy.hxx @@ -28,7 +28,7 @@ class SVX_DLLPUBLIC XFillBmpPosOffsetXItem final : public SfxUInt16Item public: XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX = 0 ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + SVX_DLLPRIVATE virtual XFillBmpPosOffsetXItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, @@ -41,7 +41,7 @@ class SVX_DLLPUBLIC XFillBmpPosOffsetYItem final : public SfxUInt16Item public: XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY = 0 ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + SVX_DLLPRIVATE virtual XFillBmpPosOffsetYItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/xflbstit.hxx b/include/svx/xflbstit.hxx index 6aa278912d50..a45ac6d67b9b 100644 --- a/include/svx/xflbstit.hxx +++ b/include/svx/xflbstit.hxx @@ -28,7 +28,7 @@ class SVX_DLLPUBLIC XFillBmpStretchItem final : public SfxBoolItem public: XFillBmpStretchItem( bool bStretch = true ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual XFillBmpStretchItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/xflbtoxy.hxx b/include/svx/xflbtoxy.hxx index c457450ed30a..7a01f0eeee83 100644 --- a/include/svx/xflbtoxy.hxx +++ b/include/svx/xflbtoxy.hxx @@ -28,7 +28,7 @@ class SVX_DLLPUBLIC XFillBmpTileOffsetXItem final : public SfxUInt16Item public: XFillBmpTileOffsetXItem( sal_uInt16 nOffX = 0 ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + SVX_DLLPRIVATE virtual XFillBmpTileOffsetXItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, @@ -41,7 +41,7 @@ class SVX_DLLPUBLIC XFillBmpTileOffsetYItem final : public SfxUInt16Item public: XFillBmpTileOffsetYItem( sal_uInt16 nOffX = 0 ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + SVX_DLLPRIVATE virtual XFillBmpTileOffsetYItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/xflclit.hxx b/include/svx/xflclit.hxx index 3679f0f3e217..7fd1f9782e65 100644 --- a/include/svx/xflclit.hxx +++ b/include/svx/xflclit.hxx @@ -37,7 +37,7 @@ public: XFillColorItem(sal_Int32 nIndex, const Color& rTheColor); XFillColorItem(const OUString& rName, const Color& rTheColor); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFillColorItem* 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; diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx index 87d587315d19..935bf5596264 100644 --- a/include/svx/xflftrit.hxx +++ b/include/svx/xflftrit.hxx @@ -42,7 +42,7 @@ public: XFillFloatTransparenceItem( const XFillFloatTransparenceItem& rItem ); virtual bool operator==( const SfxPoolItem& rItem ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual XFillFloatTransparenceItem* 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; diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx index 4fbf399e6389..d0fa9600bea6 100644 --- a/include/svx/xflgrit.hxx +++ b/include/svx/xflgrit.hxx @@ -42,7 +42,7 @@ public: XFillGradientItem(const XFillGradientItem& rItem); virtual bool operator==(const SfxPoolItem& rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFillGradientItem* 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; diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx index 7a6cb5dde8fb..a0d88fffeb3e 100644 --- a/include/svx/xflhtit.hxx +++ b/include/svx/xflhtit.hxx @@ -41,7 +41,7 @@ public: XFillHatchItem(const XFillHatchItem& rItem); virtual bool operator==(const SfxPoolItem& rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFillHatchItem* 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; diff --git a/include/svx/xfltrit.hxx b/include/svx/xfltrit.hxx index 491e78ef5130..c29ad9173982 100644 --- a/include/svx/xfltrit.hxx +++ b/include/svx/xfltrit.hxx @@ -33,7 +33,7 @@ class SVX_DLLPUBLIC XFillTransparenceItem final : public SfxUInt16Item { public: XFillTransparenceItem(sal_uInt16 nFillTransparence = 0); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFillTransparenceItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/include/svx/xftadit.hxx b/include/svx/xftadit.hxx index b33875b92cd0..7aa4328aac09 100644 --- a/include/svx/xftadit.hxx +++ b/include/svx/xftadit.hxx @@ -36,7 +36,7 @@ public: static SfxPoolItem* CreateDefault(); XFormTextAdjustItem(XFormTextAdjust = XFormTextAdjust::Center); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFormTextAdjustItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // #FontWork# virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/xftdiit.hxx b/include/svx/xftdiit.hxx index 819bddcaf8e6..6e292935edc9 100644 --- a/include/svx/xftdiit.hxx +++ b/include/svx/xftdiit.hxx @@ -34,7 +34,7 @@ class SVX_DLLPUBLIC XFormTextDistanceItem final : public SfxMetricItem public: static SfxPoolItem* CreateDefault(); XFormTextDistanceItem(long nDist = 0); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFormTextDistanceItem* Clone(SfxItemPool* pPool = nullptr) const override; }; #endif diff --git a/include/svx/xftmrit.hxx b/include/svx/xftmrit.hxx index 808deeb696f4..8d3fb68ca058 100644 --- a/include/svx/xftmrit.hxx +++ b/include/svx/xftmrit.hxx @@ -34,7 +34,7 @@ class SVX_DLLPUBLIC XFormTextMirrorItem final : public SfxBoolItem public: static SfxPoolItem* CreateDefault(); XFormTextMirrorItem(bool bMirror = false); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFormTextMirrorItem* Clone(SfxItemPool* pPool = nullptr) const override; }; #endif diff --git a/include/svx/xftouit.hxx b/include/svx/xftouit.hxx index 6c0c6a43231e..fe58b4160172 100644 --- a/include/svx/xftouit.hxx +++ b/include/svx/xftouit.hxx @@ -36,7 +36,7 @@ public: static SfxPoolItem* CreateDefault(); XFormTextOutlineItem(bool bOutline = false); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFormTextOutlineItem* Clone(SfxItemPool* pPool = nullptr) const override; }; #endif diff --git a/include/svx/xftshcit.hxx b/include/svx/xftshcit.hxx index 15201338277e..9155449a6826 100644 --- a/include/svx/xftshcit.hxx +++ b/include/svx/xftshcit.hxx @@ -36,7 +36,7 @@ public: XFormTextShadowColorItem() {} XFormTextShadowColorItem(const OUString& rName, const Color& rTheColor); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFormTextShadowColorItem* Clone(SfxItemPool* pPool = nullptr) const override; }; #endif diff --git a/include/svx/xftshit.hxx b/include/svx/xftshit.hxx index 33d8d31e2dc0..377d247f018e 100644 --- a/include/svx/xftshit.hxx +++ b/include/svx/xftshit.hxx @@ -36,7 +36,7 @@ public: static SfxPoolItem* CreateDefault(); XFormTextShadowItem(XFormTextShadow = XFormTextShadow::NONE); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFormTextShadowItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // #FontWork# virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/xftshtit.hxx b/include/svx/xftshtit.hxx index 98e9a8c92872..2195386c7f49 100644 --- a/include/svx/xftshtit.hxx +++ b/include/svx/xftshtit.hxx @@ -32,7 +32,7 @@ class XFormTextShadowTranspItem final : public SfxUInt16Item { public: XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence = 0); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFormTextShadowTranspItem* Clone(SfxItemPool* pPool = nullptr) const override; }; #endif diff --git a/include/svx/xftshxy.hxx b/include/svx/xftshxy.hxx index 13c8464febf7..478cb26c5759 100644 --- a/include/svx/xftshxy.hxx +++ b/include/svx/xftshxy.hxx @@ -35,7 +35,7 @@ public: static SfxPoolItem* CreateDefault(); XFormTextShadowXValItem(long nVal = 0); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFormTextShadowXValItem* Clone(SfxItemPool* pPool = nullptr) const override; }; /************************************************************************* @@ -49,7 +49,7 @@ class SVX_DLLPUBLIC XFormTextShadowYValItem final : public SfxMetricItem public: static SfxPoolItem* CreateDefault(); XFormTextShadowYValItem(long nVal = 0); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFormTextShadowYValItem* Clone(SfxItemPool* pPool = nullptr) const override; }; #endif diff --git a/include/svx/xftstit.hxx b/include/svx/xftstit.hxx index a82535c87a02..4d2e0d2c9ef0 100644 --- a/include/svx/xftstit.hxx +++ b/include/svx/xftstit.hxx @@ -35,7 +35,7 @@ public: static SfxPoolItem* CreateDefault(); XFormTextStartItem(long nStart = 0); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFormTextStartItem* Clone(SfxItemPool* pPool = nullptr) const override; }; #endif diff --git a/include/svx/xgrscit.hxx b/include/svx/xgrscit.hxx index 125a4f47b6d7..0e61f07249d7 100644 --- a/include/svx/xgrscit.hxx +++ b/include/svx/xgrscit.hxx @@ -33,7 +33,7 @@ class SVX_DLLPUBLIC XGradientStepCountItem final : public SfxUInt16Item { public: XGradientStepCountItem( sal_uInt16 nStepCount = 0 ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual XGradientStepCountItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx index 317fcd3edae0..f82f6a40343f 100644 --- a/include/svx/xit.hxx +++ b/include/svx/xit.hxx @@ -47,7 +47,7 @@ public: NameOrIndex(const NameOrIndex& rNameOrIndex); virtual bool operator==(const SfxPoolItem& rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual NameOrIndex* Clone(SfxItemPool* pPool = nullptr) const override; OUString const & GetName() const { return GetValue(); } void SetName(const OUString& rName) { SetValue(rName); } diff --git a/include/svx/xlineit0.hxx b/include/svx/xlineit0.hxx index a561bec0375a..16f6880cf48f 100644 --- a/include/svx/xlineit0.hxx +++ b/include/svx/xlineit0.hxx @@ -31,7 +31,7 @@ class SVX_DLLPUBLIC XLineStyleItem final : public SfxEnumItem<css::drawing::Line public: static SfxPoolItem* CreateDefault(); XLineStyleItem(css::drawing::LineStyle = css::drawing::LineStyle_SOLID); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XLineStyleItem* 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; diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx index 612c747ef5b5..1f0bbd37d232 100644 --- a/include/svx/xlinjoit.hxx +++ b/include/svx/xlinjoit.hxx @@ -33,7 +33,7 @@ public: static SfxPoolItem* CreateDefault(); XLineJointItem( css::drawing::LineJoint eLineJoint = css::drawing::LineJoint_ROUND ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual XLineJointItem* 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; diff --git a/include/svx/xlnasit.hxx b/include/svx/xlnasit.hxx index 3875fb4fdcc3..4e395610d5df 100644 --- a/include/svx/xlnasit.hxx +++ b/include/svx/xlnasit.hxx @@ -36,7 +36,7 @@ public: XLineAttrSetItem(const XLineAttrSetItem& rAttr); XLineAttrSetItem(const XLineAttrSetItem& rAttr, SfxItemPool* pItemPool); - virtual SfxPoolItem* Clone( SfxItemPool* pToPool = nullptr ) const override; + virtual XLineAttrSetItem* Clone( SfxItemPool* pToPool = nullptr ) const override; }; #endif diff --git a/include/svx/xlncapit.hxx b/include/svx/xlncapit.hxx index 8657c83807b7..7b62e2c514db 100644 --- a/include/svx/xlncapit.hxx +++ b/include/svx/xlncapit.hxx @@ -33,7 +33,7 @@ public: static SfxPoolItem* CreateDefault(); XLineCapItem(css::drawing::LineCap eLineCap = css::drawing::LineCap_BUTT); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual XLineCapItem* 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; diff --git a/include/svx/xlnclit.hxx b/include/svx/xlnclit.hxx index 8f2e6db05dff..459b85af670f 100644 --- a/include/svx/xlnclit.hxx +++ b/include/svx/xlnclit.hxx @@ -33,7 +33,7 @@ public: XLineColorItem(sal_Int32 nIndex, const Color& rTheColor); XLineColorItem(const OUString& rName, const Color& rTheColor); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XLineColorItem* 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; diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx index 067b5821a8d7..33b5229ed054 100644 --- a/include/svx/xlndsit.hxx +++ b/include/svx/xlndsit.hxx @@ -42,7 +42,7 @@ public: XLineDashItem(const XLineDashItem& rItem); virtual bool operator==(const SfxPoolItem& rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XLineDashItem* 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; diff --git a/include/svx/xlnedcit.hxx b/include/svx/xlnedcit.hxx index b427aca7ba05..2498237b9dbd 100644 --- a/include/svx/xlnedcit.hxx +++ b/include/svx/xlnedcit.hxx @@ -29,7 +29,7 @@ class SVX_DLLPUBLIC XLineEndCenterItem : public SfxBoolItem { public: XLineEndCenterItem(bool bEndCenter = false); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XLineEndCenterItem* 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; diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx index 81530d5274de..f6b3b87494a6 100644 --- a/include/svx/xlnedit.hxx +++ b/include/svx/xlnedit.hxx @@ -40,7 +40,7 @@ public: XLineEndItem(const XLineEndItem& rItem); virtual bool operator==(const SfxPoolItem& rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XLineEndItem* 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; diff --git a/include/svx/xlnedwit.hxx b/include/svx/xlnedwit.hxx index 81961d068e1e..4c0f54d27f6b 100644 --- a/include/svx/xlnedwit.hxx +++ b/include/svx/xlnedwit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XLineEndWidthItem final : public SfxMetricItem { public: XLineEndWidthItem(long nWidth = LINE_END_WIDTH_DEFAULT); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XLineEndWidthItem* 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; diff --git a/include/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx index d3f6164cd5f3..b2a4ab1d4cdc 100644 --- a/include/svx/xlnstcit.hxx +++ b/include/svx/xlnstcit.hxx @@ -29,7 +29,7 @@ class SVX_DLLPUBLIC XLineStartCenterItem : public SfxBoolItem { public: XLineStartCenterItem(bool bStartCenter = false); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XLineStartCenterItem* 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; diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx index 387f57b88e49..7add1df8c80f 100644 --- a/include/svx/xlnstit.hxx +++ b/include/svx/xlnstit.hxx @@ -40,7 +40,7 @@ public: XLineStartItem(const XLineStartItem& rItem); virtual bool operator==(const SfxPoolItem& rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XLineStartItem* 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; diff --git a/include/svx/xlnstwit.hxx b/include/svx/xlnstwit.hxx index 5e8b38f5f5d6..a2e894e96486 100644 --- a/include/svx/xlnstwit.hxx +++ b/include/svx/xlnstwit.hxx @@ -31,7 +31,7 @@ class SVX_DLLPUBLIC XLineStartWidthItem final : public SfxMetricItem { public: XLineStartWidthItem(long nWidth = LINE_START_WIDTH_DEFAULT); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XLineStartWidthItem* 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; diff --git a/include/svx/xlntrit.hxx b/include/svx/xlntrit.hxx index 416cd2fbcdef..bb23b8271bdb 100644 --- a/include/svx/xlntrit.hxx +++ b/include/svx/xlntrit.hxx @@ -33,7 +33,7 @@ class SVX_DLLPUBLIC XLineTransparenceItem final : public SfxUInt16Item { public: XLineTransparenceItem(sal_uInt16 nLineTransparence = 0); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XLineTransparenceItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/include/svx/xlnwtit.hxx b/include/svx/xlnwtit.hxx index 114abf0b4811..fc9b2f3ad8d0 100644 --- a/include/svx/xlnwtit.hxx +++ b/include/svx/xlnwtit.hxx @@ -30,7 +30,7 @@ class SVX_DLLPUBLIC XLineWidthItem final : public SfxMetricItem public: static SfxPoolItem* CreateDefault(); XLineWidthItem(long nWidth = 0); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XLineWidthItem* 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; diff --git a/include/svx/xsflclit.hxx b/include/svx/xsflclit.hxx index 86a7921b34a6..479da4f16fae 100644 --- a/include/svx/xsflclit.hxx +++ b/include/svx/xsflclit.hxx @@ -22,14 +22,12 @@ #include <svx/xcolit.hxx> - - class SVX_DLLPUBLIC XSecondaryFillColorItem final : public XColorItem { public: XSecondaryFillColorItem(const OUString& rName, const Color& rTheColor); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + SVX_DLLPRIVATE virtual XSecondaryFillColorItem* Clone(SfxItemPool* pPool = nullptr) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svx/xtextit0.hxx b/include/svx/xtextit0.hxx index b924bfc595cc..b28f93898b9e 100644 --- a/include/svx/xtextit0.hxx +++ b/include/svx/xtextit0.hxx @@ -35,7 +35,7 @@ class SVX_DLLPUBLIC XFormTextStyleItem final : public SfxEnumItem<XFormTextStyle public: static SfxPoolItem* CreateDefault(); XFormTextStyleItem(XFormTextStyle = XFormTextStyle::NONE); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFormTextStyleItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // #FontWork# virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -53,7 +53,7 @@ class SVX_DLLPUBLIC XFormTextHideFormItem final : public SfxBoolItem public: static SfxPoolItem* CreateDefault(); XFormTextHideFormItem(bool bHide = false); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; + virtual XFormTextHideFormItem* Clone(SfxItemPool* pPool = nullptr) const override; }; #endif diff --git a/include/svx/zoomslideritem.hxx b/include/svx/zoomslideritem.hxx index f9a6a553a952..f257f19997a9 100644 --- a/include/svx/zoomslideritem.hxx +++ b/include/svx/zoomslideritem.hxx @@ -43,7 +43,7 @@ public: // "purely virtual methods" from the SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SvxZoomSliderItem* 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; }; 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); diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index d75f0c2cd56f..b247a7e02a72 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -309,7 +309,7 @@ SdOptionsLayoutItem::SdOptionsLayoutItem( SdOptions const * pOpts, ::sd::FrameVi } } -SfxPoolItem* SdOptionsLayoutItem::Clone( SfxItemPool* ) const +SdOptionsLayoutItem* SdOptionsLayoutItem::Clone( SfxItemPool* ) const { return new SdOptionsLayoutItem( *this ); } @@ -680,7 +680,7 @@ SdOptionsMiscItem::SdOptionsMiscItem( SdOptions const * pOpts, ::sd::FrameView c } } -SfxPoolItem* SdOptionsMiscItem::Clone( SfxItemPool* ) const +SdOptionsMiscItem* SdOptionsMiscItem::Clone( SfxItemPool* ) const { return new SdOptionsMiscItem( *this ); } @@ -865,7 +865,7 @@ SdOptionsSnapItem::SdOptionsSnapItem( SdOptions const * pOpts, ::sd::FrameView c } } -SfxPoolItem* SdOptionsSnapItem::Clone( SfxItemPool* ) const +SdOptionsSnapItem* SdOptionsSnapItem::Clone( SfxItemPool* ) const { return new SdOptionsSnapItem( *this ); } @@ -1318,7 +1318,7 @@ SdOptionsPrintItem::SdOptionsPrintItem( SdOptions const * pOpts ) maOptionsPrint.SetOutputQuality( pOpts->GetOutputQuality() ); } -SfxPoolItem* SdOptionsPrintItem::Clone( SfxItemPool* ) const +SdOptionsPrintItem* SdOptionsPrintItem::Clone( SfxItemPool* ) const { return new SdOptionsPrintItem( *this ); } diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index 54791875a733..e9d67b7a6976 100644 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -148,7 +148,7 @@ void DrawDocShell::Execute( SfxRequest& rReq ) { const SvxSearchItem & rSearchItem = pReqArgs->Get(SID_SEARCH_ITEM); - SD_MOD()->SetSearchItem(std::unique_ptr<SvxSearchItem>(static_cast<SvxSearchItem*>(rSearchItem.Clone()))); + SD_MOD()->SetSearchItem(std::unique_ptr<SvxSearchItem>(rSearchItem.Clone())); } rReq.Done(); @@ -211,7 +211,7 @@ void DrawDocShell::Execute( SfxRequest& rReq ) { const SvxSearchItem& rSearchItem = pReqArgs->Get(SID_SEARCH_ITEM); - SD_MOD()->SetSearchItem(std::unique_ptr<SvxSearchItem>(static_cast<SvxSearchItem*>( rSearchItem.Clone() ))); + SD_MOD()->SetSearchItem(std::unique_ptr<SvxSearchItem>(rSearchItem.Clone())); xFuSearch->SearchAndReplace(&rSearchItem); } } diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index c532c39571c2..db73144bad1d 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -152,7 +152,7 @@ public: explicit SdOptionsLayoutItem(); SdOptionsLayoutItem( SdOptions const * pOpts, ::sd::FrameView const * pView ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SdOptionsLayoutItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; void SetOptions( SdOptions* pOpts ) const; @@ -317,7 +317,7 @@ public: explicit SdOptionsMiscItem(); SdOptionsMiscItem( SdOptions const * pOpts, ::sd::FrameView const * pView ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SdOptionsMiscItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; void SetOptions( SdOptions* pOpts ) const; @@ -385,7 +385,7 @@ public: explicit SdOptionsSnapItem(); SdOptionsSnapItem( SdOptions const * pOpts, ::sd::FrameView const * pView ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SdOptionsSnapItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; void SetOptions( SdOptions* pOpts ) const; @@ -553,7 +553,7 @@ public: explicit SdOptionsPrintItem(); explicit SdOptionsPrintItem( SdOptions const * pOpts ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SdOptionsPrintItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; void SetOptions( SdOptions* pOpts ) const; diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx index 7a43a4c63161..67f43fb7157f 100644 --- a/sd/source/ui/sidebar/SlideBackground.cxx +++ b/sd/source/ui/sidebar/SlideBackground.cxx @@ -911,7 +911,7 @@ void SlideBackground::NotifyItemUpdate( pPageItem = dynamic_cast<const SvxPageItem*>(pState); if (pPageItem) { - mpPageItem.reset(static_cast<SvxPageItem*>(pPageItem->Clone())); + mpPageItem.reset(pPageItem->Clone()); bool bIsLandscape = mpPageItem->IsLandscape(); mpPaperOrientation->SelectEntryPos( bIsLandscape ? 0 : 1 ); } diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index bea6a35797f3..0c482885de2d 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -455,7 +455,7 @@ CellInfo::CellInfo( const Reference< XStyle >& xStyle ) // get border const SvxBoxItem* pBoxItem = rSet.GetItem( SDRATTR_TABLE_BORDER ); if( pBoxItem ) - maBorder.reset(static_cast<SvxBoxItem*>(pBoxItem->Clone())); + maBorder.reset(pBoxItem->Clone()); } typedef std::vector< std::shared_ptr< CellInfo > > CellInfoVector; diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 0b06a88c267b..65a357e33563 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -186,7 +186,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) SfxItemSet aTmpSet( pOLV->GetOutliner()->GetParaAttribs( nPara ) ); aAttr.Put( aTmpSet, false ); const SvxLRSpaceItem& rItem = aAttr.Get( EE_PARA_LRSPACE ); - std::unique_ptr<SvxLRSpaceItem> pNewItem(static_cast<SvxLRSpaceItem*>(rItem.Clone())); + std::unique_ptr<SvxLRSpaceItem> pNewItem(rItem.Clone()); long nLeft = pNewItem->GetLeft(); if( nSlot == SID_INC_INDENT ) @@ -239,7 +239,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) SfxItemSet aTmpSet( pOLV->GetOutliner()->GetParaAttribs( nPara ) ); aAttr.Put( aTmpSet, false ); // sal_False= InvalidItems is not default, handle it as "holes" const SvxULSpaceItem& rItem = aAttr.Get( EE_PARA_ULSPACE ); - std::unique_ptr<SvxULSpaceItem> pNewItem(static_cast<SvxULSpaceItem*>(rItem.Clone())); + std::unique_ptr<SvxULSpaceItem> pNewItem(rItem.Clone()); long nUpper = pNewItem->GetUpper(); if( nSlot == SID_PARASPACE_INCREASE ) @@ -280,7 +280,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) { SfxItemSet aNewAttrs(*(aEditAttr.GetPool()), aEditAttr.GetRanges()); const SvxULSpaceItem& rItem = aEditAttr.Get( EE_PARA_ULSPACE ); - std::unique_ptr<SvxULSpaceItem> pNewItem(static_cast<SvxULSpaceItem*>( rItem.Clone() )); + std::unique_ptr<SvxULSpaceItem> pNewItem(rItem.Clone()); long nUpper = pNewItem->GetUpper(); if( nSlot == SID_PARASPACE_INCREASE ) diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx index f43ac927d84a..7c07f27917f6 100644 --- a/sfx2/inc/sorgitm.hxx +++ b/sfx2/inc/sorgitm.hxx @@ -32,7 +32,7 @@ public: static SfxPoolItem* CreateDefault(); SfxScriptOrganizerItem(); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SfxScriptOrganizerItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) 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; diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 0c8200e6fda5..2ef69751b199 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -952,7 +952,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) // remove from Itemset, because it confuses the parameter transformation if (auto pParamLinkItem = rReq.GetArg<SfxLinkItem>(SID_DONELINK)) - pLinkItem.reset( static_cast<SfxLinkItem*>( pParamLinkItem->Clone() ) ); + pLinkItem.reset(pParamLinkItem->Clone()); rReq.RemoveItem( SID_DONELINK ); diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index 013b129dec36..4f953e3a63e4 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -90,7 +90,7 @@ bool SfxEventNamesItem::GetPresentation( SfxItemPresentation, return false; } -SfxPoolItem* SfxEventNamesItem::Clone( SfxItemPool *) const +SfxEventNamesItem* SfxEventNamesItem::Clone( SfxItemPool *) const { return new SfxEventNamesItem(*this); } diff --git a/sfx2/source/control/minfitem.cxx b/sfx2/source/control/minfitem.cxx index 080723380525..e14b827bdbf2 100644 --- a/sfx2/source/control/minfitem.cxx +++ b/sfx2/source/control/minfitem.cxx @@ -52,13 +52,11 @@ bool SfxMacroInfoItem::operator==( const SfxPoolItem& rCmp) const aCommentText == rItem.aCommentText; } - -SfxPoolItem *SfxMacroInfoItem::Clone( SfxItemPool *) const +SfxMacroInfoItem* SfxMacroInfoItem::Clone( SfxItemPool *) const { return new SfxMacroInfoItem(*this); } - OUString SfxMacroInfoItem::GetQualifiedName() const { OUString aMacroName = aLibName + diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx index 76bc397efee0..79f8ddc221f5 100644 --- a/sfx2/source/control/sorgitm.cxx +++ b/sfx2/source/control/sorgitm.cxx @@ -33,13 +33,11 @@ SfxScriptOrganizerItem::SfxScriptOrganizerItem() : { } - -SfxPoolItem* SfxScriptOrganizerItem::Clone( SfxItemPool * ) const +SfxScriptOrganizerItem* SfxScriptOrganizerItem::Clone( SfxItemPool * ) const { return new SfxScriptOrganizerItem( *this ); } - bool SfxScriptOrganizerItem::operator==( const SfxPoolItem& rItem) const { return SfxStringItem::operator==(rItem) && diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index b6f1398f13d1..a7411825050b 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -286,19 +286,16 @@ SfxDocumentInfoItem::SfxDocumentInfoItem( const SfxDocumentInfoItem& rItem ) m_aCmisProperties = rItem.m_aCmisProperties; } - SfxDocumentInfoItem::~SfxDocumentInfoItem() { ClearCustomProperties(); } - -SfxPoolItem* SfxDocumentInfoItem::Clone( SfxItemPool * ) const +SfxDocumentInfoItem* SfxDocumentInfoItem::Clone( SfxItemPool * ) const { return new SfxDocumentInfoItem( *this ); } - bool SfxDocumentInfoItem::operator==( const SfxPoolItem& rItem) const { if (!SfxStringItem::operator==(rItem)) diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index abcdca034b42..9b73516c97c2 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -90,7 +90,7 @@ SfxTabDialogItem::SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet ) { } -SfxPoolItem* SfxTabDialogItem::Clone(SfxItemPool* pToPool) const +SfxTabDialogItem* SfxTabDialogItem::Clone(SfxItemPool* pToPool) const { return new SfxTabDialogItem( *this, pToPool ); } diff --git a/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx index 60156ad6d4f3..66f378620acb 100644 --- a/sfx2/source/dialog/tplpitem.cxx +++ b/sfx2/source/dialog/tplpitem.cxx @@ -45,13 +45,11 @@ bool SfxTemplateItem::operator==( const SfxPoolItem& rCmp ) const aStyle == static_cast<const SfxTemplateItem&>(rCmp).aStyle ); } - -SfxPoolItem* SfxTemplateItem::Clone( SfxItemPool *) const +SfxTemplateItem* SfxTemplateItem::Clone( SfxItemPool *) const { return new SfxTemplateItem(*this); } - bool SfxTemplateItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { css::frame::status::Template aTemplate; diff --git a/sfx2/source/doc/objitem.cxx b/sfx2/source/doc/objitem.cxx index 5b5483df5ce8..9f4e6126041b 100644 --- a/sfx2/source/doc/objitem.cxx +++ b/sfx2/source/doc/objitem.cxx @@ -36,7 +36,7 @@ bool SfxObjectShellItem::operator==( const SfxPoolItem &rItem ) const static_cast<const SfxObjectShellItem&>(rItem).pObjSh == pObjSh; } -SfxPoolItem* SfxObjectShellItem::Clone( SfxItemPool *) const +SfxObjectShellItem* SfxObjectShellItem::Clone( SfxItemPool *) const { return new SfxObjectShellItem( *this ); } @@ -97,7 +97,7 @@ bool SfxObjectItem::operator==( const SfxPoolItem &rItem ) const static_cast<const SfxObjectItem&>(rItem)._pSh == _pSh; } -SfxPoolItem* SfxObjectItem::Clone( SfxItemPool *) const +SfxObjectItem* SfxObjectItem::Clone( SfxItemPool *) const { return new SfxObjectItem( *this ); } diff --git a/sfx2/source/doc/watermarkitem.cxx b/sfx2/source/doc/watermarkitem.cxx index e672fc838c87..86e3d27d6a32 100644 --- a/sfx2/source/doc/watermarkitem.cxx +++ b/sfx2/source/doc/watermarkitem.cxx @@ -36,7 +36,7 @@ bool SfxWatermarkItem::operator==( const SfxPoolItem& rCmp ) const m_nColor == static_cast<const SfxWatermarkItem&>(rCmp).m_nColor ); } -SfxPoolItem* SfxWatermarkItem::Clone( SfxItemPool *) const +SfxWatermarkItem* SfxWatermarkItem::Clone( SfxItemPool *) const { return new SfxWatermarkItem(*this); } diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx index 4ae3c3547eab..4724bf0060f1 100644 --- a/sfx2/source/doc/zoomitem.cxx +++ b/sfx2/source/doc/zoomitem.cxx @@ -46,13 +46,11 @@ SvxZoomItem::SvxZoomItem { } - -SfxPoolItem* SvxZoomItem::Clone( SfxItemPool * /*pPool*/ ) const +SvxZoomItem* SvxZoomItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SvxZoomItem( *this ); } - bool SvxZoomItem::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index b7d832ad260c..ac7245e45966 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -421,7 +421,7 @@ bool SfxFrameItem::operator==( const SfxPoolItem &rItem ) const static_cast<const SfxFrameItem&>(rItem).wFrame == wFrame; } -SfxPoolItem* SfxFrameItem::Clone( SfxItemPool *) const +SfxFrameItem* SfxFrameItem::Clone( SfxItemPool *) const { SfxFrameItem* pNew = new SfxFrameItem( wFrame); pNew->pFrame = pFrame; @@ -478,7 +478,7 @@ bool SfxUnoAnyItem::operator==( const SfxPoolItem& rItem ) const return false; } -SfxPoolItem* SfxUnoAnyItem::Clone( SfxItemPool *) const +SfxUnoAnyItem* SfxUnoAnyItem::Clone( SfxItemPool *) const { return new SfxUnoAnyItem( *this ); } @@ -513,7 +513,7 @@ bool SfxUnoFrameItem::operator==( const SfxPoolItem& i_rItem ) const static_cast< const SfxUnoFrameItem& >( i_rItem ).m_xFrame == m_xFrame; } -SfxPoolItem* SfxUnoFrameItem::Clone( SfxItemPool* ) const +SfxUnoFrameItem* SfxUnoFrameItem::Clone( SfxItemPool* ) const { return new SfxUnoFrameItem( *this ); } diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index cefe8af5bd9b..f0cf80dbe8f3 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1780,7 +1780,7 @@ bool SfxViewFrameItem::operator==( const SfxPoolItem &rItem ) const static_cast<const SfxViewFrameItem&>(rItem).pFrame == pFrame; } -SfxPoolItem* SfxViewFrameItem::Clone( SfxItemPool *) const +SfxViewFrameItem* SfxViewFrameItem::Clone( SfxItemPool *) const { return new SfxViewFrameItem( *this ); } diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx index 5ac6fbac3980..7c85153b63a8 100644 --- a/svl/source/items/aeitem.cxx +++ b/svl/source/items/aeitem.cxx @@ -48,7 +48,7 @@ OUString const & SfxAllEnumItem::GetTextByPos( sal_uInt16 nPos ) const return m_Values[nPos]; } -SfxPoolItem* SfxAllEnumItem::Clone( SfxItemPool * ) const +SfxAllEnumItem* SfxAllEnumItem::Clone( SfxItemPool * ) const { return new SfxAllEnumItem(*this); } diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index c5e30b81ece3..3d0b7e581d52 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.cxx @@ -134,7 +134,7 @@ bool SfxBoolItem::PutValue(const css::uno::Any& rVal, sal_uInt8) } // virtual -SfxPoolItem * SfxBoolItem::Clone(SfxItemPool *) const +SfxBoolItem* SfxBoolItem::Clone(SfxItemPool *) const { return new SfxBoolItem(*this); } diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx index 07728df344b2..0f522f7a9260 100644 --- a/svl/source/items/cintitem.cxx +++ b/svl/source/items/cintitem.cxx @@ -61,12 +61,11 @@ bool CntByteItem::PutValue(const css::uno::Any& rVal, sal_uInt8) } // virtual -SfxPoolItem * CntByteItem::Clone(SfxItemPool *) const +CntByteItem* CntByteItem::Clone(SfxItemPool *) const { return new CntByteItem(*this); } - // virtual bool CntUInt16Item::operator ==(const SfxPoolItem & rItem) const { @@ -109,12 +108,11 @@ bool CntUInt16Item::PutValue(const css::uno::Any& rVal, sal_uInt8) } // virtual -SfxPoolItem * CntUInt16Item::Clone(SfxItemPool *) const +CntUInt16Item* CntUInt16Item::Clone(SfxItemPool *) const { return new CntUInt16Item(*this); } - // virtual bool CntInt32Item::operator ==(const SfxPoolItem & rItem) const { @@ -155,12 +153,11 @@ bool CntInt32Item::PutValue(const css::uno::Any& rVal, sal_uInt8) } // virtual -SfxPoolItem * CntInt32Item::Clone(SfxItemPool *) const +CntInt32Item* CntInt32Item::Clone(SfxItemPool *) const { return new CntInt32Item(*this); } - // virtual bool CntUInt32Item::operator ==(const SfxPoolItem & rItem) const { @@ -204,7 +201,7 @@ bool CntUInt32Item::PutValue(const css::uno::Any& rVal, sal_uInt8) } // virtual -SfxPoolItem * CntUInt32Item::Clone(SfxItemPool *) const +CntUInt32Item* CntUInt32Item::Clone(SfxItemPool *) const { return new CntUInt32Item(*this); } diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx index 36a32d1ff34b..b6946a4f4e6e 100644 --- a/svl/source/items/custritm.cxx +++ b/svl/source/items/custritm.cxx @@ -72,7 +72,7 @@ bool CntUnencodedStringItem::PutValue(const css::uno::Any& rVal, } // virtual -SfxPoolItem * CntUnencodedStringItem::Clone(SfxItemPool *) const +CntUnencodedStringItem* CntUnencodedStringItem::Clone(SfxItemPool *) const { return new CntUnencodedStringItem(*this); } diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx index 33a28718ba90..fd96c5317b79 100644 --- a/svl/source/items/flagitem.cxx +++ b/svl/source/items/flagitem.cxx @@ -29,7 +29,6 @@ SfxFlagItem::SfxFlagItem( sal_uInt16 nW, sal_uInt16 nV ) : { } - bool SfxFlagItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, @@ -45,25 +44,21 @@ bool SfxFlagItem::GetPresentation return true; } - sal_uInt8 SfxFlagItem::GetFlagCount() const { SAL_INFO("svl", "calling GetValueText(sal_uInt16) on SfxFlagItem -- override!"); return 0; } - bool SfxFlagItem::operator==( const SfxPoolItem& rItem ) const { assert(SfxPoolItem::operator==(rItem)); return static_cast<const SfxFlagItem&>(rItem).nVal == nVal; } - -SfxPoolItem* SfxFlagItem::Clone(SfxItemPool *) const +SfxFlagItem* SfxFlagItem::Clone(SfxItemPool *) const { return new SfxFlagItem( *this ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx index 2cd289f05f84..3f8d3265d779 100644 --- a/svl/source/items/globalnameitem.cxx +++ b/svl/source/items/globalnameitem.cxx @@ -41,20 +41,17 @@ SfxGlobalNameItem::SfxGlobalNameItem( sal_uInt16 nW, const SvGlobalName& rName ) { } - SfxGlobalNameItem::~SfxGlobalNameItem() { } - bool SfxGlobalNameItem::operator==( const SfxPoolItem& rItem ) const { return SfxPoolItem::operator==(rItem) && static_cast<const SfxGlobalNameItem&>(rItem).m_aName == m_aName; } - -SfxPoolItem* SfxGlobalNameItem::Clone(SfxItemPool *) const +SfxGlobalNameItem* SfxGlobalNameItem::Clone(SfxItemPool *) const { return new SfxGlobalNameItem( *this ); } diff --git a/svl/source/items/grabbagitem.cxx b/svl/source/items/grabbagitem.cxx index e4d70bded1e8..39ee566866b3 100644 --- a/svl/source/items/grabbagitem.cxx +++ b/svl/source/items/grabbagitem.cxx @@ -31,7 +31,7 @@ bool SfxGrabBagItem::operator==(const SfxPoolItem& rItem) const && m_aMap == static_cast<const SfxGrabBagItem*>(&rItem)->m_aMap; } -SfxPoolItem* SfxGrabBagItem::Clone(SfxItemPool* /*pPool*/) const +SfxGrabBagItem* SfxGrabBagItem::Clone(SfxItemPool* /*pPool*/) const { return new SfxGrabBagItem(*this); } diff --git a/svl/source/items/ilstitem.cxx b/svl/source/items/ilstitem.cxx index 221bb0b074e2..d9ddeae2182e 100644 --- a/svl/source/items/ilstitem.cxx +++ b/svl/source/items/ilstitem.cxx @@ -56,7 +56,7 @@ bool SfxIntegerListItem::operator==( const SfxPoolItem& rPoolItem ) const return rItem.m_aList == m_aList; } -SfxPoolItem* SfxIntegerListItem::Clone( SfxItemPool * ) const +SfxIntegerListItem* SfxIntegerListItem::Clone( SfxItemPool * ) const { return new SfxIntegerListItem( *this ); } diff --git a/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx index e7ca5db4455e..4959914b152d 100644 --- a/svl/source/items/imageitm.cxx +++ b/svl/source/items/imageitm.cxx @@ -52,13 +52,11 @@ SfxImageItem::~SfxImageItem() { } - -SfxPoolItem* SfxImageItem::Clone( SfxItemPool* ) const +SfxImageItem* SfxImageItem::Clone( SfxItemPool* ) const { return new SfxImageItem( *this ); } - bool SfxImageItem::operator==( const SfxPoolItem& rItem ) const { return SfxInt16Item::operator==(rItem) && diff --git a/svl/source/items/int64item.cxx b/svl/source/items/int64item.cxx index c7f46452c27a..06efd1fc9aca 100644 --- a/svl/source/items/int64item.cxx +++ b/svl/source/items/int64item.cxx @@ -50,10 +50,9 @@ bool SfxInt64Item::PutValue( return false; } -SfxPoolItem* SfxInt64Item::Clone( SfxItemPool* /*pOther*/ ) const +SfxInt64Item* SfxInt64Item::Clone( SfxItemPool* /*pOther*/ ) const { return new SfxInt64Item(*this); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index b3ccec4c4159..c0c4831a5c3d 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -88,7 +88,7 @@ bool SfxInt16Item::PutValue(const css::uno::Any& rVal, sal_uInt8 ) return false; } -SfxPoolItem * SfxInt16Item::Clone(SfxItemPool *) const +SfxInt16Item* SfxInt16Item::Clone(SfxItemPool *) const { return new SfxInt16Item(*this); } diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx index e2ad91a4c30f..87165ae50756 100644 --- a/svl/source/items/lckbitem.cxx +++ b/svl/source/items/lckbitem.cxx @@ -42,13 +42,11 @@ bool SfxLockBytesItem::operator==( const SfxPoolItem& rItem ) const return SfxPoolItem::operator==(rItem) && static_cast<const SfxLockBytesItem&>(rItem)._xVal == _xVal; } - -SfxPoolItem* SfxLockBytesItem::Clone(SfxItemPool *) const +SfxLockBytesItem* SfxLockBytesItem::Clone(SfxItemPool *) const { return new SfxLockBytesItem( *this ); } - // virtual bool SfxLockBytesItem::PutValue( const css::uno::Any& rVal, sal_uInt8 ) { diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx index 37a895d3673e..03bd8f6d53e2 100644 --- a/svl/source/items/macitem.cxx +++ b/svl/source/items/macitem.cxx @@ -185,7 +185,6 @@ void SvxMacroTableDtor::Erase(SvMacroItemId nEvent) } } - bool SvxMacroItem::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); @@ -196,13 +195,11 @@ bool SvxMacroItem::operator==( const SfxPoolItem& rAttr ) const return rOwn == rOther; } - -SfxPoolItem* SvxMacroItem::Clone( SfxItemPool* ) const +SvxMacroItem* SvxMacroItem::Clone( SfxItemPool* ) const { return new SvxMacroItem( *this ); } - bool SvxMacroItem::GetPresentation ( SfxItemPresentation /*ePres*/, diff --git a/svl/source/items/poolcach.cxx b/svl/source/items/poolcach.cxx index 23a4c1629f0e..2d406e18c08e 100644 --- a/svl/source/items/poolcach.cxx +++ b/svl/source/items/poolcach.cxx @@ -77,7 +77,7 @@ const SfxSetItem& SfxItemPoolCache::ApplyTo( const SfxSetItem &rOrigItem ) } // Insert the new attributes in a new Set - std::unique_ptr<SfxSetItem> pNewItem(static_cast<SfxSetItem *>(rOrigItem.Clone())); + std::unique_ptr<SfxSetItem> pNewItem(rOrigItem.Clone()); if ( pItemToPut ) { pNewItem->GetItemSet().PutDirect( *pItemToPut ); diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index 272beceb5927..c5e09ddf9048 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -609,7 +609,7 @@ void SfxVoidItem::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterEndElement(pWriter); } -SfxPoolItem* SfxVoidItem::Clone(SfxItemPool *) const +SfxVoidItem* SfxVoidItem::Clone(SfxItemPool *) const { return new SfxVoidItem(*this); } @@ -623,13 +623,11 @@ void SfxPoolItem::ScaleMetrics( long /*lMult*/, long /*lDiv*/ ) { } - bool SfxPoolItem::HasMetrics() const { return false; } - bool SfxPoolItem::QueryValue( css::uno::Any&, sal_uInt8 ) const { OSL_FAIL("There is no implementation for QueryValue for this item!"); diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx index af634fcc201c..08912f55700f 100644 --- a/svl/source/items/ptitem.cxx +++ b/svl/source/items/ptitem.cxx @@ -65,13 +65,11 @@ bool SfxPointItem::operator==( const SfxPoolItem& rItem ) const return static_cast<const SfxPointItem&>(rItem).aVal == aVal; } - -SfxPoolItem* SfxPointItem::Clone(SfxItemPool *) const +SfxPointItem* SfxPointItem::Clone(SfxItemPool *) const { return new SfxPointItem( *this ); } - bool SfxPointItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx index 5889140782a6..1d9d00aa5e48 100644 --- a/svl/source/items/rectitem.cxx +++ b/svl/source/items/rectitem.cxx @@ -65,13 +65,11 @@ bool SfxRectangleItem::operator==( const SfxPoolItem& rItem ) const return static_cast<const SfxRectangleItem&>(rItem).aVal == aVal; } - -SfxPoolItem* SfxRectangleItem::Clone(SfxItemPool *) const +SfxRectangleItem* SfxRectangleItem::Clone(SfxItemPool *) const { return new SfxRectangleItem( *this ); } - bool SfxRectangleItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId) const { diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx index 6bc41e6976d0..89f7e642ed50 100644 --- a/svl/source/items/rngitem.cxx +++ b/svl/source/items/rngitem.cxx @@ -51,8 +51,7 @@ bool SfxRangeItem::operator==( const SfxPoolItem& rItem ) const return nFrom==rT.nFrom && nTo==rT.nTo; } - -SfxPoolItem* SfxRangeItem::Clone(SfxItemPool *) const +SfxRangeItem* SfxRangeItem::Clone(SfxItemPool *) const { return new SfxRangeItem( Which(), nFrom, nTo ); } diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index 225c43f08cfe..95de93e7b635 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -88,13 +88,11 @@ bool SfxStringListItem::GetPresentation return false; } - -SfxPoolItem* SfxStringListItem::Clone( SfxItemPool *) const +SfxStringListItem* SfxStringListItem::Clone( SfxItemPool *) const { return new SfxStringListItem( *this ); } - void SfxStringListItem::SetString( const OUString& rStr ) { mpList.reset( new std::vector<OUString> ); diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index 4fd9ead794af..4588d7a8bfc4 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -224,18 +224,15 @@ SvxSearchItem::SvxSearchItem( const SvxSearchItem& rItem ) : EnableNotification( lcl_GetNotifyNames() ); } - SvxSearchItem::~SvxSearchItem() { } - -SfxPoolItem* SvxSearchItem::Clone( SfxItemPool *) const +SvxSearchItem* SvxSearchItem::Clone( SfxItemPool *) const { return new SvxSearchItem(*this); } - //! used below static bool equalsWithoutLocale( const i18nutil::SearchOptions2& rItem1, const i18nutil::SearchOptions2& rItem2 ) { diff --git a/svl/source/items/stritem.cxx b/svl/source/items/stritem.cxx index 85e7ec8d4ce2..86e2087cd503 100644 --- a/svl/source/items/stritem.cxx +++ b/svl/source/items/stritem.cxx @@ -20,10 +20,8 @@ #include <svl/stritem.hxx> #include <libxml/xmlwriter.h> - - // virtual -SfxPoolItem * SfxStringItem::Clone(SfxItemPool *) const +SfxStringItem* SfxStringItem::Clone(SfxItemPool *) const { return new SfxStringItem(*this); } @@ -40,4 +38,5 @@ SfxPoolItem* SfxStringItem::CreateDefault() { return new SfxStringItem(); }; + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx index 515572de7913..2ba61a517c6c 100644 --- a/svl/source/items/visitem.cxx +++ b/svl/source/items/visitem.cxx @@ -59,7 +59,7 @@ bool SfxVisibilityItem::PutValue(const css::uno::Any& rVal, sal_uInt8) } // virtual -SfxPoolItem * SfxVisibilityItem::Clone(SfxItemPool *) const +SfxVisibilityItem* SfxVisibilityItem::Clone(SfxItemPool *) const { return new SfxVisibilityItem(*this); } diff --git a/svx/inc/sxallitm.hxx b/svx/inc/sxallitm.hxx index 3539a8ca6ded..ac0aedc78e9e 100644 --- a/svx/inc/sxallitm.hxx +++ b/svx/inc/sxallitm.hxx @@ -25,7 +25,7 @@ class SdrAllPositionXItem: public SdrMetricItem { public: SdrAllPositionXItem(long nPosX=0): SdrMetricItem(SDRATTR_ALLPOSITIONX,nPosX) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrAllPositionXItem* Clone(SfxItemPool*) const override { return new SdrAllPositionXItem(*this); } @@ -34,7 +34,7 @@ public: class SdrAllPositionYItem: public SdrMetricItem { public: SdrAllPositionYItem(long nPosY=0): SdrMetricItem(SDRATTR_ALLPOSITIONY,nPosY) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrAllPositionYItem* Clone(SfxItemPool*) const override { return new SdrAllPositionYItem(*this); } @@ -43,18 +43,16 @@ public: class SdrAllSizeWidthItem: public SdrMetricItem { public: SdrAllSizeWidthItem(long nWdt=0): SdrMetricItem(SDRATTR_ALLSIZEWIDTH,nWdt) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrAllSizeWidthItem* Clone(SfxItemPool*) const override { return new SdrAllSizeWidthItem(*this); } }; - - class SdrAllSizeHeightItem: public SdrMetricItem { public: SdrAllSizeHeightItem(long nHgt=0): SdrMetricItem(SDRATTR_ALLSIZEHEIGHT,nHgt) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrAllSizeHeightItem* Clone(SfxItemPool*) const override { return new SdrAllSizeHeightItem(*this); } diff --git a/svx/inc/sxcikitm.hxx b/svx/inc/sxcikitm.hxx index a92fbc1c8856..c3fc7ce475c0 100644 --- a/svx/inc/sxcikitm.hxx +++ b/svx/inc/sxcikitm.hxx @@ -26,7 +26,7 @@ class SdrCircKindItem: public SfxEnumItem<SdrCircKind> { public: SdrCircKindItem(SdrCircKind eKind=SdrCircKind::Full): SfxEnumItem(SDRATTR_CIRCKIND, eKind) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrCircKindItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 4; } virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/svx/inc/sxlayitm.hxx b/svx/inc/sxlayitm.hxx index 9516f4efb9de..6260ae4147bd 100644 --- a/svx/inc/sxlayitm.hxx +++ b/svx/inc/sxlayitm.hxx @@ -28,14 +28,14 @@ class SdrLayerIdItem: public SfxUInt16Item { public: SdrLayerIdItem(SdrLayerID nId): SfxUInt16Item(SDRATTR_LAYERID,sal_uInt8(nId)) {} SdrLayerID GetValue() const { return SdrLayerID(SfxUInt16Item::GetValue()); } - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrLayerIdItem* Clone(SfxItemPool* pPool=nullptr) const override; }; class SdrLayerNameItem: public SfxStringItem { public: SdrLayerNameItem() : SfxStringItem() { SetWhich(SDRATTR_LAYERNAME); } SdrLayerNameItem(const OUString& rStr) : SfxStringItem(SDRATTR_LAYERNAME,rStr) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrLayerNameItem* Clone(SfxItemPool* pPool=nullptr) const override; }; #endif diff --git a/svx/inc/sxlogitm.hxx b/svx/inc/sxlogitm.hxx index 6a7db6e56340..70fe78c00131 100644 --- a/svx/inc/sxlogitm.hxx +++ b/svx/inc/sxlogitm.hxx @@ -25,18 +25,16 @@ class SdrLogicSizeWidthItem: public SdrMetricItem { public: SdrLogicSizeWidthItem(long nWdt=0): SdrMetricItem(SDRATTR_LOGICSIZEWIDTH,nWdt) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrLogicSizeWidthItem* Clone(SfxItemPool*) const override { return new SdrLogicSizeWidthItem(*this); } }; - - class SdrLogicSizeHeightItem: public SdrMetricItem { public: SdrLogicSizeHeightItem(long nHgt=0): SdrMetricItem(SDRATTR_LOGICSIZEHEIGHT,nHgt) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrLogicSizeHeightItem* Clone(SfxItemPool*) const override { return new SdrLogicSizeHeightItem(*this); } diff --git a/svx/inc/sxmkitm.hxx b/svx/inc/sxmkitm.hxx index 741752b01f39..bebcda57b642 100644 --- a/svx/inc/sxmkitm.hxx +++ b/svx/inc/sxmkitm.hxx @@ -29,7 +29,7 @@ enum SdrMeasureKind {SDRMEASURE_STD,SDRMEASURE_RADIUS}; // n.i. class SdrMeasureKindItem: public SfxEnumItem<SdrMeasureKind> { public: SdrMeasureKindItem() : SfxEnumItem(SDRATTR_MEASUREKIND, SDRMEASURE_STD) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; + virtual SdrMeasureKindItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 2; } virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/svx/inc/sxmoitm.hxx b/svx/inc/sxmoitm.hxx index 2ae11c2d74c1..0b50536dd747 100644 --- a/svx/inc/sxmoitm.hxx +++ b/svx/inc/sxmoitm.hxx @@ -27,7 +27,7 @@ class SdrMeasureOverhangItem: public SdrMetricItem { public: SdrMeasureOverhangItem(long nVal): SdrMetricItem(SDRATTR_MEASUREOVERHANG,nVal) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrMeasureOverhangItem* Clone(SfxItemPool*) const override { return new SdrMeasureOverhangItem(*this); } diff --git a/svx/inc/sxmovitm.hxx b/svx/inc/sxmovitm.hxx index ff8683b7fc52..d3a4087c6f13 100644 --- a/svx/inc/sxmovitm.hxx +++ b/svx/inc/sxmovitm.hxx @@ -25,7 +25,7 @@ class SdrMoveXItem: public SdrMetricItem { public: SdrMoveXItem(): SdrMetricItem(SDRATTR_MOVEX,0) {} - SfxPoolItem* Clone(SfxItemPool*) const override + SdrMoveXItem* Clone(SfxItemPool*) const override { return new SdrMoveXItem(*this); } @@ -34,7 +34,7 @@ public: class SdrMoveYItem: public SdrMetricItem { public: SdrMoveYItem(): SdrMetricItem(SDRATTR_MOVEY,0) {} - SfxPoolItem* Clone(SfxItemPool*) const override + SdrMoveYItem* Clone(SfxItemPool*) const override { return new SdrMoveYItem(*this); } diff --git a/svx/inc/sxmsitm.hxx b/svx/inc/sxmsitm.hxx index da889bb823d8..208ede07e6c7 100644 --- a/svx/inc/sxmsitm.hxx +++ b/svx/inc/sxmsitm.hxx @@ -28,7 +28,7 @@ class SdrMeasureScaleItem: public SdrScaleItem { public: SdrMeasureScaleItem() : SdrScaleItem(SDRATTR_MEASURESCALE,Fraction(1,1)) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrMeasureScaleItem* Clone(SfxItemPool*) const override { return new SdrMeasureScaleItem(*this); } diff --git a/svx/inc/sxmtaitm.hxx b/svx/inc/sxmtaitm.hxx index 663ce66fc072..a658fd97c828 100644 --- a/svx/inc/sxmtaitm.hxx +++ b/svx/inc/sxmtaitm.hxx @@ -28,7 +28,7 @@ class SdrMeasureTextAutoAngleItem: public SdrYesNoItem { public: SdrMeasureTextAutoAngleItem(bool bOn=true): SdrYesNoItem(SDRATTR_MEASURETEXTAUTOANGLE,bOn) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrMeasureTextAutoAngleItem* Clone(SfxItemPool*) const override { return new SdrMeasureTextAutoAngleItem(*this); } @@ -39,7 +39,7 @@ public: class SdrMeasureTextAutoAngleViewItem: public SdrAngleItem { public: SdrMeasureTextAutoAngleViewItem(long nVal=31500): SdrAngleItem(SDRATTR_MEASURETEXTAUTOANGLEVIEW,nVal) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrMeasureTextAutoAngleViewItem* Clone(SfxItemPool*) const override { return new SdrMeasureTextAutoAngleViewItem(*this); } diff --git a/svx/inc/sxoneitm.hxx b/svx/inc/sxoneitm.hxx index 0a368b471cf7..516a93b919b2 100644 --- a/svx/inc/sxoneitm.hxx +++ b/svx/inc/sxoneitm.hxx @@ -25,7 +25,7 @@ class SdrOnePositionXItem: public SdrMetricItem { public: SdrOnePositionXItem(long nPosX=0): SdrMetricItem(SDRATTR_ONEPOSITIONX,nPosX) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrOnePositionXItem* Clone(SfxItemPool*) const override { return new SdrOnePositionXItem(*this); } @@ -34,7 +34,7 @@ public: class SdrOnePositionYItem: public SdrMetricItem { public: SdrOnePositionYItem(long nPosY=0): SdrMetricItem(SDRATTR_ONEPOSITIONY,nPosY) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrOnePositionYItem* Clone(SfxItemPool*) const override { return new SdrOnePositionYItem(*this); } @@ -43,18 +43,16 @@ public: class SdrOneSizeWidthItem: public SdrMetricItem { public: SdrOneSizeWidthItem(long nWdt=0): SdrMetricItem(SDRATTR_ONESIZEWIDTH,nWdt) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrOneSizeWidthItem* Clone(SfxItemPool*) const override { return new SdrOneSizeWidthItem(*this); } }; - - class SdrOneSizeHeightItem: public SdrMetricItem { public: SdrOneSizeHeightItem(long nHgt=0): SdrMetricItem(SDRATTR_ONESIZEHEIGHT,nHgt) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrOneSizeHeightItem* Clone(SfxItemPool*) const override { return new SdrOneSizeHeightItem(*this); } diff --git a/svx/inc/sxopitm.hxx b/svx/inc/sxopitm.hxx index 0484281879c5..b0d45bd54323 100644 --- a/svx/inc/sxopitm.hxx +++ b/svx/inc/sxopitm.hxx @@ -25,7 +25,7 @@ class SdrObjPrintableItem: public SdrYesNoItem { public: SdrObjPrintableItem(bool bOn=false): SdrYesNoItem(SDRATTR_OBJPRINTABLE,bOn) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrObjPrintableItem* Clone(SfxItemPool*) const override { return new SdrObjPrintableItem(*this); } @@ -34,7 +34,7 @@ public: class SdrObjVisibleItem: public SdrYesNoItem { public: SdrObjVisibleItem(bool bOn=true): SdrYesNoItem(SDRATTR_OBJVISIBLE,bOn) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrObjVisibleItem* Clone(SfxItemPool*) const override { return new SdrObjVisibleItem(*this); } diff --git a/svx/inc/sxreaitm.hxx b/svx/inc/sxreaitm.hxx index 8235b18b4387..409a6512a1cf 100644 --- a/svx/inc/sxreaitm.hxx +++ b/svx/inc/sxreaitm.hxx @@ -26,7 +26,7 @@ class SdrResizeXAllItem: public SdrFractionItem { public: SdrResizeXAllItem(): SdrFractionItem(SDRATTR_RESIZEXALL,Fraction(1,1)) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrResizeXAllItem* Clone(SfxItemPool*) const override { return new SdrResizeXAllItem(*this); } @@ -35,7 +35,7 @@ public: class SdrResizeYAllItem: public SdrFractionItem { public: SdrResizeYAllItem(): SdrFractionItem(SDRATTR_RESIZEYALL,Fraction(1,1)) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrResizeYAllItem* Clone(SfxItemPool*) const override { return new SdrResizeYAllItem(*this); } diff --git a/svx/inc/sxreoitm.hxx b/svx/inc/sxreoitm.hxx index f0a5c318e05e..0c58a3f618f5 100644 --- a/svx/inc/sxreoitm.hxx +++ b/svx/inc/sxreoitm.hxx @@ -26,7 +26,7 @@ class SdrResizeXOneItem: public SdrFractionItem { public: SdrResizeXOneItem(): SdrFractionItem(SDRATTR_RESIZEXONE,Fraction(1,1)) {} - SfxPoolItem* Clone(SfxItemPool*) const override + SdrResizeXOneItem* Clone(SfxItemPool*) const override { return new SdrResizeXOneItem(*this); } @@ -35,7 +35,7 @@ public: class SdrResizeYOneItem: public SdrFractionItem { public: SdrResizeYOneItem(): SdrFractionItem(SDRATTR_RESIZEYONE,Fraction(1,1)) {} - SfxPoolItem* Clone(SfxItemPool*) const override + SdrResizeYOneItem* Clone(SfxItemPool*) const override { return new SdrResizeYOneItem(*this); } diff --git a/svx/inc/sxroaitm.hxx b/svx/inc/sxroaitm.hxx index 4b1c249c25dd..5dadbde33f8b 100644 --- a/svx/inc/sxroaitm.hxx +++ b/svx/inc/sxroaitm.hxx @@ -25,7 +25,7 @@ class SdrRotateAllItem: public SdrAngleItem { public: SdrRotateAllItem(): SdrAngleItem(SDRATTR_ROTATEALL,0) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrRotateAllItem* Clone(SfxItemPool*) const override { return new SdrRotateAllItem(*this); } diff --git a/svx/inc/sxrooitm.hxx b/svx/inc/sxrooitm.hxx index 20f0ba449c97..28ceadafd90a 100644 --- a/svx/inc/sxrooitm.hxx +++ b/svx/inc/sxrooitm.hxx @@ -25,7 +25,7 @@ class SdrRotateOneItem: public SdrAngleItem { public: SdrRotateOneItem(): SdrAngleItem(SDRATTR_ROTATEONE,0) {} - SfxPoolItem* Clone(SfxItemPool*) const override + SdrRotateOneItem* Clone(SfxItemPool*) const override { return new SdrRotateOneItem(*this); } diff --git a/svx/inc/sxsaitm.hxx b/svx/inc/sxsaitm.hxx index 2e5d3971c342..ccaf50901be8 100644 --- a/svx/inc/sxsaitm.hxx +++ b/svx/inc/sxsaitm.hxx @@ -25,7 +25,7 @@ class SdrShearAngleItem: public SdrAngleItem { public: SdrShearAngleItem(long nAngle=0): SdrAngleItem(SDRATTR_SHEARANGLE,nAngle) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrShearAngleItem* Clone(SfxItemPool*) const override { return new SdrShearAngleItem(*this); } diff --git a/svx/inc/sxsalitm.hxx b/svx/inc/sxsalitm.hxx index ccd4aee0eb97..f73b460a9800 100644 --- a/svx/inc/sxsalitm.hxx +++ b/svx/inc/sxsalitm.hxx @@ -25,7 +25,7 @@ class SdrHorzShearAllItem: public SdrAngleItem { public: SdrHorzShearAllItem(): SdrAngleItem(SDRATTR_HORZSHEARALL,0) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrHorzShearAllItem* Clone(SfxItemPool*) const override { return new SdrHorzShearAllItem(*this); } @@ -34,7 +34,7 @@ public: class SdrVertShearAllItem: public SdrAngleItem { public: SdrVertShearAllItem(): SdrAngleItem(SDRATTR_VERTSHEARALL,0) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrVertShearAllItem* Clone(SfxItemPool*) const override { return new SdrVertShearAllItem(*this); } diff --git a/svx/inc/sxsoitm.hxx b/svx/inc/sxsoitm.hxx index 0d01cc7530a4..2c5273a5bda7 100644 --- a/svx/inc/sxsoitm.hxx +++ b/svx/inc/sxsoitm.hxx @@ -25,7 +25,7 @@ class SdrHorzShearOneItem: public SdrAngleItem { public: SdrHorzShearOneItem(): SdrAngleItem(SDRATTR_HORZSHEARONE,0) {} - SfxPoolItem* Clone(SfxItemPool*) const override + SdrHorzShearOneItem* Clone(SfxItemPool*) const override { return new SdrHorzShearOneItem(*this); } @@ -34,7 +34,7 @@ public: class SdrVertShearOneItem: public SdrAngleItem { public: SdrVertShearOneItem(): SdrAngleItem(SDRATTR_VERTSHEARONE,0) {} - SfxPoolItem* Clone(SfxItemPool*) const override + SdrVertShearOneItem* Clone(SfxItemPool*) const override { return new SdrVertShearOneItem(*this); } diff --git a/svx/inc/sxtraitm.hxx b/svx/inc/sxtraitm.hxx index 645831b2b0c4..1cebff377699 100644 --- a/svx/inc/sxtraitm.hxx +++ b/svx/inc/sxtraitm.hxx @@ -25,7 +25,7 @@ class SdrTransformRef1XItem: public SdrMetricItem { public: SdrTransformRef1XItem(long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF1X,nHgt) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrTransformRef1XItem* Clone(SfxItemPool*) const override { return new SdrTransformRef1XItem(*this); } @@ -34,7 +34,7 @@ public: class SdrTransformRef1YItem: public SdrMetricItem { public: SdrTransformRef1YItem(long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF1Y,nHgt) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrTransformRef1YItem* Clone(SfxItemPool*) const override { return new SdrTransformRef1YItem(*this); } @@ -43,7 +43,7 @@ public: class SdrTransformRef2XItem: public SdrMetricItem { public: SdrTransformRef2XItem(long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF2X,nHgt) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrTransformRef2XItem* Clone(SfxItemPool*) const override { return new SdrTransformRef2XItem(*this); } @@ -52,7 +52,7 @@ public: class SdrTransformRef2YItem: public SdrMetricItem { public: SdrTransformRef2YItem(long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF2Y,nHgt) {} - virtual SfxPoolItem* Clone(SfxItemPool*) const override + virtual SdrTransformRef2YItem* Clone(SfxItemPool*) const override { return new SdrTransformRef2YItem(*this); } diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 7ea72b55ef4c..635b12267bed 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -53,7 +53,7 @@ SvxOptionsGrid::SvxOptionsGrid() : { } -SfxPoolItem* SvxGridItem::Clone( SfxItemPool* ) const +SvxGridItem* SvxGridItem::Clone( SfxItemPool* ) const { return new SvxGridItem( *this ); } diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index 92408c9040d2..eb2a0f7a60e8 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -128,7 +128,7 @@ bool SvxLongLRSpaceItem::GetPresentation( return false; } -SfxPoolItem* SvxLongLRSpaceItem::Clone(SfxItemPool *) const +SvxLongLRSpaceItem* SvxLongLRSpaceItem::Clone(SfxItemPool *) const { return new SvxLongLRSpaceItem(*this); } @@ -247,7 +247,7 @@ bool SvxLongULSpaceItem::GetPresentation( return false; } -SfxPoolItem* SvxLongULSpaceItem::Clone(SfxItemPool *) const +SvxLongULSpaceItem* SvxLongULSpaceItem::Clone(SfxItemPool *) const { return new SvxLongULSpaceItem(*this); } @@ -362,7 +362,7 @@ bool SvxPagePosSizeItem::GetPresentation( return false; } -SfxPoolItem* SvxPagePosSizeItem::Clone(SfxItemPool *) const +SvxPagePosSizeItem* SvxPagePosSizeItem::Clone(SfxItemPool *) const { return new SvxPagePosSizeItem(*this); } @@ -431,7 +431,7 @@ bool SvxColumnItem::GetPresentation( return false; } -SfxPoolItem* SvxColumnItem::Clone(SfxItemPool* /*pPool*/) const +SvxColumnItem* SvxColumnItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxColumnItem(*this); } @@ -637,7 +637,7 @@ bool SvxObjectItem::GetPresentation( return false; } -SfxPoolItem* SvxObjectItem::Clone(SfxItemPool *) const +SvxObjectItem* SvxObjectItem::Clone(SfxItemPool *) const { return new SvxObjectItem(*this); } diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 85b5560b1558..14e6573241c3 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -1856,7 +1856,7 @@ void SvxSearchDialog::SetItem_Impl( const SvxSearchItem* pItem ) //TODO: save pItem and process later if m_executingSubDialog? if ( pItem && !m_executingSubDialog ) { - pSearchItem.reset(static_cast<SvxSearchItem*>(pItem->Clone())); + pSearchItem.reset(pItem->Clone()); Init_Impl( pSearchItem->GetPattern() && ( !pSearchList || !pSearchList->Count() ) ); } diff --git a/svx/source/dialog/svxgrahicitem.cxx b/svx/source/dialog/svxgrahicitem.cxx index 27691c1ada3f..6a64afba8517 100644 --- a/svx/source/dialog/svxgrahicitem.cxx +++ b/svx/source/dialog/svxgrahicitem.cxx @@ -31,7 +31,7 @@ bool SvxGraphicItem::operator==( const SfxPoolItem& rItem) const return SfxPoolItem::operator==(rItem) && static_cast<const SvxGraphicItem&>(rItem).aGraphic == aGraphic; } -SfxPoolItem* SvxGraphicItem::Clone( SfxItemPool * ) const +SvxGraphicItem* SvxGraphicItem::Clone( SfxItemPool * ) const { return new SvxGraphicItem( *this ); } diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 556d3438587d..39cb0c14f600 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -686,7 +686,7 @@ void SvxRuler::UpdateFrame(const SvxLongULSpaceItem *pItem) // new value void SvxRuler::Update( const SvxProtectItem* pItem ) { if( pItem ) - mxRulerImpl->aProtectItem.reset(static_cast<SvxProtectItem*>(pItem->Clone())); + mxRulerImpl->aProtectItem.reset(pItem->Clone()); } void SvxRuler::UpdateTextRTL(const SfxBoolItem* pItem) diff --git a/svx/source/engine3d/svx3ditems.cxx b/svx/source/engine3d/svx3ditems.cxx index 8fe5b55948b0..1468fb0ff5cb 100644 --- a/svx/source/engine3d/svx3ditems.cxx +++ b/svx/source/engine3d/svx3ditems.cxx @@ -35,7 +35,7 @@ Svx3DReducedLineGeometryItem::Svx3DReducedLineGeometryItem(bool bVal) : SfxBoolItem(SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY, bVal) {} -SfxPoolItem * Svx3DReducedLineGeometryItem::Clone(SfxItemPool *) const +Svx3DReducedLineGeometryItem* Svx3DReducedLineGeometryItem::Clone(SfxItemPool *) const { return new Svx3DReducedLineGeometryItem(*this); } @@ -73,47 +73,43 @@ Svx3DSmoothNormalsItem::Svx3DSmoothNormalsItem(bool bVal) : SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_NORMALS, bVal) {} -SfxPoolItem * Svx3DSmoothNormalsItem::Clone(SfxItemPool *) const +Svx3DSmoothNormalsItem* Svx3DSmoothNormalsItem::Clone(SfxItemPool *) const { return new Svx3DSmoothNormalsItem(*this); } - Svx3DSmoothLidsItem::Svx3DSmoothLidsItem(bool bVal) : SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_LIDS, bVal) {} -SfxPoolItem * Svx3DSmoothLidsItem::Clone(SfxItemPool *) const +Svx3DSmoothLidsItem* Svx3DSmoothLidsItem::Clone(SfxItemPool *) const { return new Svx3DSmoothLidsItem(*this); } - Svx3DCharacterModeItem::Svx3DCharacterModeItem(bool bVal) : SfxBoolItem(SDRATTR_3DOBJ_CHARACTER_MODE, bVal) {} -SfxPoolItem * Svx3DCharacterModeItem::Clone(SfxItemPool *) const +Svx3DCharacterModeItem* Svx3DCharacterModeItem::Clone(SfxItemPool *) const { return new Svx3DCharacterModeItem(*this); } - Svx3DCloseFrontItem::Svx3DCloseFrontItem(bool bVal) : SfxBoolItem(SDRATTR_3DOBJ_CLOSE_FRONT, bVal) {} -SfxPoolItem * Svx3DCloseFrontItem::Clone(SfxItemPool *) const +Svx3DCloseFrontItem* Svx3DCloseFrontItem::Clone(SfxItemPool *) const { return new Svx3DCloseFrontItem(*this); } - Svx3DCloseBackItem::Svx3DCloseBackItem(bool bVal) : SfxBoolItem(SDRATTR_3DOBJ_CLOSE_BACK, bVal) {} -SfxPoolItem * Svx3DCloseBackItem::Clone(SfxItemPool *) const +Svx3DCloseBackItem* Svx3DCloseBackItem::Clone(SfxItemPool *) const { return new Svx3DCloseBackItem(*this); } @@ -134,7 +130,7 @@ bool Svx3DNormalsKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId return true; } -SfxPoolItem* Svx3DNormalsKindItem::Clone(SfxItemPool* /*pPool*/) const +Svx3DNormalsKindItem* Svx3DNormalsKindItem::Clone(SfxItemPool* /*pPool*/) const { return new Svx3DNormalsKindItem(*this); } @@ -155,7 +151,7 @@ bool Svx3DTextureProjectionXItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nM return true; } -SfxPoolItem* Svx3DTextureProjectionXItem::Clone(SfxItemPool* /*pPool*/) const +Svx3DTextureProjectionXItem* Svx3DTextureProjectionXItem::Clone(SfxItemPool* /*pPool*/) const { return new Svx3DTextureProjectionXItem(*this); } @@ -176,7 +172,7 @@ bool Svx3DTextureProjectionYItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nM return true; } -SfxPoolItem* Svx3DTextureProjectionYItem::Clone(SfxItemPool* /*pPool*/) const +Svx3DTextureProjectionYItem* Svx3DTextureProjectionYItem::Clone(SfxItemPool* /*pPool*/) const { return new Svx3DTextureProjectionYItem(*this); } @@ -197,7 +193,7 @@ bool Svx3DTextureKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId return true; } -SfxPoolItem* Svx3DTextureKindItem::Clone(SfxItemPool* /*pPool*/) const +Svx3DTextureKindItem* Svx3DTextureKindItem::Clone(SfxItemPool* /*pPool*/) const { return new Svx3DTextureKindItem(*this); } @@ -218,7 +214,7 @@ bool Svx3DTextureModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId return true; } -SfxPoolItem* Svx3DTextureModeItem::Clone(SfxItemPool* /*pPool*/) const +Svx3DTextureModeItem* Svx3DTextureModeItem::Clone(SfxItemPool* /*pPool*/) const { return new Svx3DTextureModeItem(*this); } @@ -239,7 +235,7 @@ bool Svx3DPerspectiveItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId return true; } -SfxPoolItem* Svx3DPerspectiveItem::Clone(SfxItemPool* /*pPool*/) const +Svx3DPerspectiveItem* Svx3DPerspectiveItem::Clone(SfxItemPool* /*pPool*/) const { return new Svx3DPerspectiveItem(*this); } @@ -260,7 +256,7 @@ bool Svx3DShadeModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ return true; } -SfxPoolItem* Svx3DShadeModeItem::Clone(SfxItemPool* /*pPool*/) const +Svx3DShadeModeItem* Svx3DShadeModeItem::Clone(SfxItemPool* /*pPool*/) const { return new Svx3DShadeModeItem(*this); } diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx index f10c82bf3030..eac32b743b24 100644 --- a/svx/source/items/SmartTagItem.cxx +++ b/svx/source/items/SmartTagItem.cxx @@ -88,7 +88,7 @@ bool SvxSmartTagItem::operator==( const SfxPoolItem& rAttr ) const } -SfxPoolItem* SvxSmartTagItem::Clone( SfxItemPool * ) const +SvxSmartTagItem* SvxSmartTagItem::Clone( SfxItemPool * ) const { return new SvxSmartTagItem( *this ); } diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index ef11c6a9408b..59e8a320a645 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -120,25 +120,21 @@ bool SvxOrientationItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ return true; } - OUString SvxOrientationItem::GetValueText( SvxCellOrientation nVal ) { return SvxResId(RID_SVXITEMS_ORI_STANDARD + static_cast<int>(nVal)); } - -SfxPoolItem* SvxOrientationItem::Clone( SfxItemPool* ) const +SvxOrientationItem* SvxOrientationItem::Clone( SfxItemPool* ) const { return new SvxOrientationItem( *this ); } - sal_uInt16 SvxOrientationItem::GetValueCount() const { return static_cast<sal_uInt16>(SvxCellOrientation::Stacked) + 1; // last enum value + 1 } - bool SvxOrientationItem::IsStacked() const { return GetValue() == SvxCellOrientation::Stacked; @@ -241,13 +237,11 @@ bool SvxMarginItem::operator==( const SfxPoolItem& rItem ) const ( nBottomMargin == static_cast<const SvxMarginItem&>(rItem).nBottomMargin ) ); } - -SfxPoolItem* SvxMarginItem::Clone( SfxItemPool* ) const +SvxMarginItem* SvxMarginItem::Clone( SfxItemPool* ) const { return new SvxMarginItem(*this); } - bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); diff --git a/svx/source/items/autoformathelper.cxx b/svx/source/items/autoformathelper.cxx index f9ae76b4dd2b..a15af6d6a3e4 100644 --- a/svx/source/items/autoformathelper.cxx +++ b/svx/source/items/autoformathelper.cxx @@ -141,36 +141,36 @@ void AutoFormatVersions::WriteBlockB(SvStream& rStream, sal_uInt16 fileVersion) ////////////////////////////////////////////////////////////////////////////// -void AutoFormatBase::SetFont( const SvxFontItem& rNew ) { m_aFont.reset(static_cast<SvxFontItem*>(rNew.Clone())); } -void AutoFormatBase::SetHeight( const SvxFontHeightItem& rNew ) { m_aHeight.reset(static_cast<SvxFontHeightItem*>(rNew.Clone())); } -void AutoFormatBase::SetWeight( const SvxWeightItem& rNew ) { m_aWeight.reset(static_cast<SvxWeightItem*>(rNew.Clone())); } -void AutoFormatBase::SetPosture( const SvxPostureItem& rNew ) { m_aPosture.reset(static_cast<SvxPostureItem*>(rNew.Clone())); } -void AutoFormatBase::SetCJKFont( const SvxFontItem& rNew ) { m_aCJKFont.reset(static_cast<SvxFontItem*>(rNew.Clone())); } -void AutoFormatBase::SetCJKHeight( const SvxFontHeightItem& rNew ) { m_aCJKHeight.reset(static_cast<SvxFontHeightItem*>(rNew.Clone())); } -void AutoFormatBase::SetCJKWeight( const SvxWeightItem& rNew ) { m_aCJKWeight.reset(static_cast<SvxWeightItem*>(rNew.Clone())); } -void AutoFormatBase::SetCJKPosture( const SvxPostureItem& rNew ) { m_aCJKPosture.reset(static_cast<SvxPostureItem*>(rNew.Clone())); } -void AutoFormatBase::SetCTLFont( const SvxFontItem& rNew ) { m_aCTLFont.reset(static_cast<SvxFontItem*>(rNew.Clone())); } -void AutoFormatBase::SetCTLHeight( const SvxFontHeightItem& rNew ) { m_aCTLHeight.reset(static_cast<SvxFontHeightItem*>(rNew.Clone())); } -void AutoFormatBase::SetCTLWeight( const SvxWeightItem& rNew ) { m_aCTLWeight.reset(static_cast<SvxWeightItem*>(rNew.Clone())); } -void AutoFormatBase::SetCTLPosture( const SvxPostureItem& rNew ) { m_aCTLPosture.reset(static_cast<SvxPostureItem*>(rNew.Clone())); } -void AutoFormatBase::SetUnderline( const SvxUnderlineItem& rNew ) { m_aUnderline.reset(static_cast<SvxUnderlineItem*>(rNew.Clone())); } -void AutoFormatBase::SetOverline( const SvxOverlineItem& rNew ) { m_aOverline.reset(static_cast<SvxOverlineItem*>(rNew.Clone())); } -void AutoFormatBase::SetCrossedOut( const SvxCrossedOutItem& rNew ) { m_aCrossedOut.reset(static_cast<SvxCrossedOutItem*>(rNew.Clone())); } -void AutoFormatBase::SetContour( const SvxContourItem& rNew ) { m_aContour.reset(static_cast<SvxContourItem*>(rNew.Clone())); } -void AutoFormatBase::SetShadowed( const SvxShadowedItem& rNew ) { m_aShadowed.reset(static_cast<SvxShadowedItem*>(rNew.Clone())); } -void AutoFormatBase::SetColor( const SvxColorItem& rNew ) { m_aColor.reset(static_cast<SvxColorItem*>(rNew.Clone())); } -void AutoFormatBase::SetBox( const SvxBoxItem& rNew ) { m_aBox.reset(static_cast<SvxBoxItem*>(rNew.Clone())); } -void AutoFormatBase::SetTLBR( const SvxLineItem& rNew ) { m_aTLBR.reset(static_cast<SvxLineItem*>(rNew.Clone())); } -void AutoFormatBase::SetBLTR( const SvxLineItem& rNew ) { m_aBLTR.reset(static_cast<SvxLineItem*>(rNew.Clone())); } -void AutoFormatBase::SetBackground( const SvxBrushItem& rNew ) { m_aBackground.reset(static_cast<SvxBrushItem*>(rNew.Clone())); } -void AutoFormatBase::SetAdjust( const SvxAdjustItem& rNew ) { m_aAdjust.reset(static_cast<SvxAdjustItem*>(rNew.Clone())); } -void AutoFormatBase::SetHorJustify( const SvxHorJustifyItem& rNew ) { m_aHorJustify.reset(static_cast<SvxHorJustifyItem*>(rNew.Clone())); } -void AutoFormatBase::SetVerJustify( const SvxVerJustifyItem& rNew ) { m_aVerJustify.reset(static_cast<SvxVerJustifyItem*>(rNew.Clone())); } -void AutoFormatBase::SetStacked( const SfxBoolItem& rNew ) { m_aStacked.reset(static_cast<SfxBoolItem*>(rNew.Clone())); } -void AutoFormatBase::SetMargin( const SvxMarginItem& rNew ) { m_aMargin.reset(static_cast<SvxMarginItem*>(rNew.Clone())); } -void AutoFormatBase::SetLinebreak( const SfxBoolItem& rNew ) { m_aLinebreak.reset(static_cast<SfxBoolItem*>(rNew.Clone())); } -void AutoFormatBase::SetRotateAngle( const SfxInt32Item& rNew ) { m_aRotateAngle.reset(static_cast<SfxInt32Item*>(rNew.Clone())); } -void AutoFormatBase::SetRotateMode( const SvxRotateModeItem& rNew ) { m_aRotateMode.reset(static_cast<SvxRotateModeItem*>(rNew.Clone())); } +void AutoFormatBase::SetFont( const SvxFontItem& rNew ) { m_aFont.reset(rNew.Clone()); } +void AutoFormatBase::SetHeight( const SvxFontHeightItem& rNew ) { m_aHeight.reset(rNew.Clone()); } +void AutoFormatBase::SetWeight( const SvxWeightItem& rNew ) { m_aWeight.reset(rNew.Clone()); } +void AutoFormatBase::SetPosture( const SvxPostureItem& rNew ) { m_aPosture.reset(rNew.Clone()); } +void AutoFormatBase::SetCJKFont( const SvxFontItem& rNew ) { m_aCJKFont.reset(rNew.Clone()); } +void AutoFormatBase::SetCJKHeight( const SvxFontHeightItem& rNew ) { m_aCJKHeight.reset(rNew.Clone()); } +void AutoFormatBase::SetCJKWeight( const SvxWeightItem& rNew ) { m_aCJKWeight.reset(rNew.Clone()); } +void AutoFormatBase::SetCJKPosture( const SvxPostureItem& rNew ) { m_aCJKPosture.reset(rNew.Clone()); } +void AutoFormatBase::SetCTLFont( const SvxFontItem& rNew ) { m_aCTLFont.reset(rNew.Clone()); } +void AutoFormatBase::SetCTLHeight( const SvxFontHeightItem& rNew ) { m_aCTLHeight.reset(rNew.Clone()); } +void AutoFormatBase::SetCTLWeight( const SvxWeightItem& rNew ) { m_aCTLWeight.reset(rNew.Clone()); } +void AutoFormatBase::SetCTLPosture( const SvxPostureItem& rNew ) { m_aCTLPosture.reset(rNew.Clone()); } +void AutoFormatBase::SetUnderline( const SvxUnderlineItem& rNew ) { m_aUnderline.reset(rNew.Clone()); } +void AutoFormatBase::SetOverline( const SvxOverlineItem& rNew ) { m_aOverline.reset(rNew.Clone()); } +void AutoFormatBase::SetCrossedOut( const SvxCrossedOutItem& rNew ) { m_aCrossedOut.reset(rNew.Clone()); } +void AutoFormatBase::SetContour( const SvxContourItem& rNew ) { m_aContour.reset(rNew.Clone()); } +void AutoFormatBase::SetShadowed( const SvxShadowedItem& rNew ) { m_aShadowed.reset(rNew.Clone()); } +void AutoFormatBase::SetColor( const SvxColorItem& rNew ) { m_aColor.reset(rNew.Clone()); } +void AutoFormatBase::SetBox( const SvxBoxItem& rNew ) { m_aBox.reset(rNew.Clone()); } +void AutoFormatBase::SetTLBR( const SvxLineItem& rNew ) { m_aTLBR.reset(rNew.Clone()); } +void AutoFormatBase::SetBLTR( const SvxLineItem& rNew ) { m_aBLTR.reset(rNew.Clone()); } +void AutoFormatBase::SetBackground( const SvxBrushItem& rNew ) { m_aBackground.reset(rNew.Clone()); } +void AutoFormatBase::SetAdjust( const SvxAdjustItem& rNew ) { m_aAdjust.reset(rNew.Clone()); } +void AutoFormatBase::SetHorJustify( const SvxHorJustifyItem& rNew ) { m_aHorJustify.reset(rNew.Clone()); } +void AutoFormatBase::SetVerJustify( const SvxVerJustifyItem& rNew ) { m_aVerJustify.reset(rNew.Clone()); } +void AutoFormatBase::SetStacked( const SfxBoolItem& rNew ) { m_aStacked.reset(rNew.Clone()); } +void AutoFormatBase::SetMargin( const SvxMarginItem& rNew ) { m_aMargin.reset(rNew.Clone()); } +void AutoFormatBase::SetLinebreak( const SfxBoolItem& rNew ) { m_aLinebreak.reset(rNew.Clone()); } +void AutoFormatBase::SetRotateAngle( const SfxInt32Item& rNew ) { m_aRotateAngle.reset(rNew.Clone()); } +void AutoFormatBase::SetRotateMode( const SvxRotateModeItem& rNew ) { m_aRotateMode.reset(rNew.Clone()); } AutoFormatBase::AutoFormatBase() : m_aFont(), @@ -207,36 +207,36 @@ AutoFormatBase::AutoFormatBase() } AutoFormatBase::AutoFormatBase( const AutoFormatBase& rNew ) -: m_aFont(static_cast<SvxFontItem*>(rNew.m_aFont->Clone())), - m_aHeight(static_cast<SvxFontHeightItem*>(rNew.m_aHeight->Clone())), - m_aWeight(static_cast<SvxWeightItem*>(rNew.m_aWeight->Clone())), - m_aPosture(static_cast<SvxPostureItem*>(rNew.m_aPosture->Clone())), - m_aCJKFont(static_cast<SvxFontItem*>(rNew.m_aCJKFont->Clone())), - m_aCJKHeight(static_cast<SvxFontHeightItem*>(rNew.m_aCJKHeight->Clone())), - m_aCJKWeight(static_cast<SvxWeightItem*>(rNew.m_aCJKWeight->Clone())), - m_aCJKPosture(static_cast<SvxPostureItem*>(rNew.m_aCJKPosture->Clone())), - m_aCTLFont(static_cast<SvxFontItem*>(rNew.m_aCTLFont->Clone())), - m_aCTLHeight(static_cast<SvxFontHeightItem*>(rNew.m_aCTLHeight->Clone())), - m_aCTLWeight(static_cast<SvxWeightItem*>(rNew.m_aCTLWeight->Clone())), - m_aCTLPosture(static_cast<SvxPostureItem*>(rNew.m_aCTLPosture->Clone())), - m_aUnderline(static_cast<SvxUnderlineItem*>(rNew.m_aUnderline->Clone())), - m_aOverline(static_cast<SvxOverlineItem*>(rNew.m_aOverline->Clone())), - m_aCrossedOut(static_cast<SvxCrossedOutItem*>(rNew.m_aCrossedOut->Clone())), - m_aContour(static_cast<SvxContourItem*>(rNew.m_aContour->Clone())), - m_aShadowed(static_cast<SvxShadowedItem*>(rNew.m_aShadowed->Clone())), - m_aColor(static_cast<SvxColorItem*>(rNew.m_aColor->Clone())), - m_aBox(static_cast<SvxBoxItem*>(rNew.m_aBox->Clone())), - m_aTLBR(static_cast<SvxLineItem*>(rNew.m_aTLBR->Clone())), - m_aBLTR(static_cast<SvxLineItem*>(rNew.m_aBLTR->Clone())), - m_aBackground(static_cast<SvxBrushItem*>(rNew.m_aBackground->Clone())), - m_aAdjust(static_cast<SvxAdjustItem*>(rNew.m_aAdjust->Clone())), - m_aHorJustify(static_cast<SvxHorJustifyItem*>(rNew.m_aHorJustify->Clone())), - m_aVerJustify(static_cast<SvxVerJustifyItem*>(rNew.m_aVerJustify->Clone())), - m_aStacked(static_cast<SfxBoolItem*>(rNew.m_aStacked->Clone())), - m_aMargin(static_cast<SvxMarginItem*>(rNew.m_aMargin->Clone())), - m_aLinebreak(static_cast<SfxBoolItem*>(rNew.m_aLinebreak->Clone())), - m_aRotateAngle(static_cast<SfxInt32Item*>(rNew.m_aRotateAngle->Clone())), - m_aRotateMode(static_cast<SvxRotateModeItem*>(rNew.m_aRotateMode->Clone())) +: m_aFont(rNew.m_aFont->Clone()), + m_aHeight(rNew.m_aHeight->Clone()), + m_aWeight(rNew.m_aWeight->Clone()), + m_aPosture(rNew.m_aPosture->Clone()), + m_aCJKFont(rNew.m_aCJKFont->Clone()), + m_aCJKHeight(rNew.m_aCJKHeight->Clone()), + m_aCJKWeight(rNew.m_aCJKWeight->Clone()), + m_aCJKPosture(rNew.m_aCJKPosture->Clone()), + m_aCTLFont(rNew.m_aCTLFont->Clone()), + m_aCTLHeight(rNew.m_aCTLHeight->Clone()), + m_aCTLWeight(rNew.m_aCTLWeight->Clone()), + m_aCTLPosture(rNew.m_aCTLPosture->Clone()), + m_aUnderline(rNew.m_aUnderline->Clone()), + m_aOverline(rNew.m_aOverline->Clone()), + m_aCrossedOut(rNew.m_aCrossedOut->Clone()), + m_aContour(rNew.m_aContour->Clone()), + m_aShadowed(rNew.m_aShadowed->Clone()), + m_aColor(rNew.m_aColor->Clone()), + m_aBox(rNew.m_aBox->Clone()), + m_aTLBR(rNew.m_aTLBR->Clone()), + m_aBLTR(rNew.m_aBLTR->Clone()), + m_aBackground(rNew.m_aBackground->Clone()), + m_aAdjust(rNew.m_aAdjust->Clone()), + m_aHorJustify(rNew.m_aHorJustify->Clone()), + m_aVerJustify(rNew.m_aVerJustify->Clone()), + m_aStacked(rNew.m_aStacked->Clone()), + m_aMargin(rNew.m_aMargin->Clone()), + m_aLinebreak(rNew.m_aLinebreak->Clone()), + m_aRotateAngle(rNew.m_aRotateAngle->Clone()), + m_aRotateMode(rNew.m_aRotateMode->Clone()) { } diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index 5c128c6806a9..7fe7ebbdaaf4 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -41,13 +41,11 @@ SvxChartTextOrderItem::SvxChartTextOrderItem(SvxChartTextOrder eOrder, { } - -SfxPoolItem* SvxChartTextOrderItem::Clone(SfxItemPool* /*pPool*/) const +SvxChartTextOrderItem* SvxChartTextOrderItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartTextOrderItem(*this); } - bool SvxChartTextOrderItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { // the order of the two enums is not equal, so a mapping is required @@ -133,7 +131,7 @@ bool SvxDoubleItem::operator == (const SfxPoolItem& rItem) const return static_cast<const SvxDoubleItem&>(rItem).fVal == fVal; } -SfxPoolItem* SvxDoubleItem::Clone(SfxItemPool* /*pPool*/) const +SvxDoubleItem* SvxDoubleItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxDoubleItem(*this); } @@ -155,37 +153,31 @@ SvxChartKindErrorItem::SvxChartKindErrorItem(SvxChartKindError eOrient, { } - -SfxPoolItem* SvxChartKindErrorItem::Clone(SfxItemPool* /*pPool*/) const +SvxChartKindErrorItem* SvxChartKindErrorItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartKindErrorItem(*this); } - SvxChartIndicateItem::SvxChartIndicateItem(SvxChartIndicate eOrient, sal_uInt16 nId) : SfxEnumItem(nId, eOrient) { } - -SfxPoolItem* SvxChartIndicateItem::Clone(SfxItemPool* /*pPool*/) const +SvxChartIndicateItem* SvxChartIndicateItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartIndicateItem(*this); } - SvxChartRegressItem::SvxChartRegressItem(SvxChartRegress eOrient, sal_uInt16 nId) : SfxEnumItem(nId, eOrient) { } - -SfxPoolItem* SvxChartRegressItem::Clone(SfxItemPool* /*pPool*/) const +SvxChartRegressItem* SvxChartRegressItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartRegressItem(*this); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx index a9d1a0931062..1842d42dc40e 100644 --- a/svx/source/items/clipfmtitem.cxx +++ b/svx/source/items/clipfmtitem.cxx @@ -107,7 +107,7 @@ bool SvxClipboardFormatItem::operator==( const SfxPoolItem& rComp ) const return nRet; } -SfxPoolItem* SvxClipboardFormatItem::Clone( SfxItemPool * /*pPool*/ ) const +SvxClipboardFormatItem* SvxClipboardFormatItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SvxClipboardFormatItem( *this ); } diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index 095aa6cec868..0b63b0e8ccea 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -261,7 +261,7 @@ bool SdrCustomShapeGeometryItem::GetPresentation( return false; } -SfxPoolItem* SdrCustomShapeGeometryItem::Clone( SfxItemPool * /*pPool*/ ) const +SdrCustomShapeGeometryItem* SdrCustomShapeGeometryItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SdrCustomShapeGeometryItem( aPropSeq ); } diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index 6f2d1bf55e15..002f219b2152 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -68,12 +68,11 @@ bool SvxColorListItem::operator==( const SfxPoolItem& rItem ) const return static_cast<const SvxColorListItem&>(rItem).pColorList == pColorList; } -SfxPoolItem* SvxColorListItem::Clone( SfxItemPool * ) const +SvxColorListItem* SvxColorListItem::Clone( SfxItemPool * ) const { return new SvxColorListItem( *this ); } - // Should be a template class but ... #define QUERY_PUT_IMPL(svtype, xtype) \ bool svtype::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const \ @@ -131,13 +130,11 @@ bool SvxGradientListItem::operator==( const SfxPoolItem& rItem ) const return static_cast<const SvxGradientListItem&>(rItem).pGradientList == pGradientList; } - -SfxPoolItem* SvxGradientListItem::Clone( SfxItemPool * ) const +SvxGradientListItem* SvxGradientListItem::Clone( SfxItemPool * ) const { return new SvxGradientListItem( *this ); } - QUERY_PUT_IMPL( SvxGradientListItem, GradientList ) SvxHatchListItem::SvxHatchListItem() @@ -178,8 +175,7 @@ bool SvxHatchListItem::operator==( const SfxPoolItem& rItem ) const return static_cast<const SvxHatchListItem&>(rItem).pHatchList == pHatchList; } - -SfxPoolItem* SvxHatchListItem::Clone( SfxItemPool * ) const +SvxHatchListItem* SvxHatchListItem::Clone( SfxItemPool * ) const { return new SvxHatchListItem( *this ); } @@ -220,7 +216,7 @@ bool SvxBitmapListItem::operator==( const SfxPoolItem& rItem ) const return static_cast<const SvxBitmapListItem&>(rItem).pBitmapList == pBitmapList; } -SfxPoolItem* SvxBitmapListItem::Clone( SfxItemPool * ) const +SvxBitmapListItem* SvxBitmapListItem::Clone( SfxItemPool * ) const { return new SvxBitmapListItem( *this ); } @@ -261,7 +257,7 @@ bool SvxPatternListItem::operator==( const SfxPoolItem& rItem ) const return static_cast<const SvxPatternListItem&>(rItem).pPatternList == pPatternList; } -SfxPoolItem* SvxPatternListItem::Clone( SfxItemPool * ) const +SvxPatternListItem* SvxPatternListItem::Clone( SfxItemPool * ) const { return new SvxPatternListItem( *this ); } @@ -302,7 +298,7 @@ bool SvxDashListItem::operator==( const SfxPoolItem& rItem ) const return static_cast<const SvxDashListItem&>(rItem).pDashList == pDashList; } -SfxPoolItem* SvxDashListItem::Clone( SfxItemPool * ) const +SvxDashListItem* SvxDashListItem::Clone( SfxItemPool * ) const { return new SvxDashListItem( *this ); } @@ -343,7 +339,7 @@ bool SvxLineEndListItem::operator==( const SfxPoolItem& rItem ) const return static_cast<const SvxLineEndListItem&>(rItem).pLineEndList == pLineEndList; } -SfxPoolItem* SvxLineEndListItem::Clone( SfxItemPool * ) const +SvxLineEndListItem* SvxLineEndListItem::Clone( SfxItemPool * ) const { return new SvxLineEndListItem( *this ); } diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx index 1c83aa408f33..c78a0047c2c6 100644 --- a/svx/source/items/e3ditem.cxx +++ b/svx/source/items/e3ditem.cxx @@ -55,13 +55,11 @@ bool SvxB3DVectorItem::operator==( const SfxPoolItem &rItem ) const return static_cast<const SvxB3DVectorItem&>(rItem).aVal == aVal; } - -SfxPoolItem* SvxB3DVectorItem::Clone( SfxItemPool* /*pPool*/ ) const +SvxB3DVectorItem* SvxB3DVectorItem::Clone( SfxItemPool* /*pPool*/ ) const { return new SvxB3DVectorItem( *this ); } - bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { assert(!rtl::math::isNan(aVal.getX()) && !rtl::math::isNan(aVal.getY()) && !rtl::math::isNan(aVal.getZ())); diff --git a/svx/source/items/galleryitem.cxx b/svx/source/items/galleryitem.cxx index 07e88d07adcf..e5c1762c377e 100644 --- a/svx/source/items/galleryitem.cxx +++ b/svx/source/items/galleryitem.cxx @@ -132,7 +132,7 @@ bool SvxGalleryItem::operator==( const SfxPoolItem& rAttr ) const m_xGraphic == rItem.m_xGraphic; } -SfxPoolItem* SvxGalleryItem::Clone( SfxItemPool * ) const +SvxGalleryItem* SvxGalleryItem::Clone( SfxItemPool * ) const { return new SvxGalleryItem( *this ); } diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index d11249c74b10..c10b692976d3 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -57,7 +57,7 @@ SvxHyperlinkItem::SvxHyperlinkItem( sal_uInt16 _nWhich, const OUString& rName, c pMacroTable.reset( new SvxMacroTableDtor ( *pMacroTbl ) ); } -SfxPoolItem* SvxHyperlinkItem::Clone( SfxItemPool* ) const +SvxHyperlinkItem* SvxHyperlinkItem::Clone( SfxItemPool* ) const { return new SvxHyperlinkItem( *this ); } diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx index f47706ad5936..1bb149e868c5 100644 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx @@ -117,13 +117,11 @@ bool SvxNumberInfoItem::operator==( const SfxPoolItem& rItem ) const aStringVal == rOther.aStringVal; } - -SfxPoolItem* SvxNumberInfoItem::Clone( SfxItemPool * ) const +SvxNumberInfoItem* SvxNumberInfoItem::Clone( SfxItemPool * ) const { return new SvxNumberInfoItem( *this ); } - void SvxNumberInfoItem::SetDelFormats( std::vector<sal_uInt32> const & aData ) { mvDelFormats = aData; diff --git a/svx/source/items/ofaitem.cxx b/svx/source/items/ofaitem.cxx index 4e0e6ac82209..3bffd661ed0f 100644 --- a/svx/source/items/ofaitem.cxx +++ b/svx/source/items/ofaitem.cxx @@ -32,7 +32,7 @@ bool OfaPtrItem::operator==( const SfxPoolItem& rItem) const static_cast<const OfaPtrItem&>(rItem).pPtr == pPtr; } -SfxPoolItem* OfaPtrItem::Clone( SfxItemPool * ) const +OfaPtrItem* OfaPtrItem::Clone( SfxItemPool * ) const { return new OfaPtrItem( *this ); } diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 8e714ca0abaa..2a6ffffd975d 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -63,7 +63,7 @@ SvxPageItem::SvxPageItem( const SvxPageItem& rItem ) SvxPageItem::~SvxPageItem() {} // Clone -SfxPoolItem* SvxPageItem::Clone( SfxItemPool * ) const +SvxPageItem* SvxPageItem::Clone( SfxItemPool * ) const { return new SvxPageItem( *this ); } @@ -271,12 +271,11 @@ SvxSetItem::SvxSetItem( const sal_uInt16 nId, std::unique_ptr<SfxItemSet>&& _pSe { } -SfxPoolItem* SvxSetItem::Clone( SfxItemPool * ) const +SvxSetItem* SvxSetItem::Clone( SfxItemPool * ) const { return new SvxSetItem(*this); } - bool SvxSetItem::GetPresentation ( SfxItemPresentation /*ePres*/, diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx index eb906bf6fd72..699b26155a90 100644 --- a/svx/source/items/postattr.cxx +++ b/svx/source/items/postattr.cxx @@ -62,8 +62,7 @@ bool SvxPostItAuthorItem::GetPresentation return false; } - -SfxPoolItem* SvxPostItAuthorItem::Clone( SfxItemPool * ) const +SvxPostItAuthorItem* SvxPostItAuthorItem::Clone( SfxItemPool * ) const { return new SvxPostItAuthorItem( *this ); } @@ -103,7 +102,7 @@ bool SvxPostItDateItem::GetPresentation } -SfxPoolItem* SvxPostItDateItem::Clone( SfxItemPool * ) const +SvxPostItDateItem* SvxPostItDateItem::Clone( SfxItemPool * ) const { return new SvxPostItDateItem( *this ); } @@ -140,18 +139,17 @@ bool SvxPostItTextItem::GetPresentation return false; } -SfxPoolItem* SvxPostItTextItem::Clone( SfxItemPool * ) const +SvxPostItTextItem* SvxPostItTextItem::Clone( SfxItemPool * ) const { return new SvxPostItTextItem( *this ); } - SvxPostItIdItem::SvxPostItIdItem( sal_uInt16 _nWhich ) { SetWhich( _nWhich ); } -SfxPoolItem* SvxPostItIdItem::Clone( SfxItemPool * ) const +SvxPostItIdItem* SvxPostItIdItem::Clone( SfxItemPool * ) const { return new SvxPostItIdItem( *this ); } diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index 3ec86cc1ab3d..5584fb68b5ea 100644 --- a/svx/source/items/rotmodit.cxx +++ b/svx/source/items/rotmodit.cxx @@ -93,7 +93,7 @@ sal_uInt16 SvxRotateModeItem::GetValueCount() const return 4; // STANDARD, TOP, CENTER, BOTTOM } -SfxPoolItem* SvxRotateModeItem::Clone( SfxItemPool* ) const +SvxRotateModeItem* SvxRotateModeItem::Clone( SfxItemPool* ) const { return new SvxRotateModeItem( *this ); } diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index 1d31d37f029d..7b3c6890f16a 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -56,13 +56,11 @@ SvxViewLayoutItem::~SvxViewLayoutItem() { } - -SfxPoolItem* SvxViewLayoutItem::Clone( SfxItemPool * /*pPool*/ ) const +SvxViewLayoutItem* SvxViewLayoutItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SvxViewLayoutItem( *this ); } - bool SvxViewLayoutItem::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index ad53388b22a5..c8b27769fd18 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -39,13 +39,11 @@ SvxZoomSliderItem::SvxZoomSliderItem( sal_uInt16 nCurrentZoom, sal_uInt16 nMinZo { } - -SfxPoolItem* SvxZoomSliderItem::Clone( SfxItemPool * /*pPool*/ ) const +SvxZoomSliderItem* SvxZoomSliderItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SvxZoomSliderItem( *this ); } - bool SvxZoomSliderItem::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index d83a9a08ae66..0b050bb708a4 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -755,7 +755,7 @@ void AreaPropertyPanelBase::updateFillTransparence(bool bDisabled, bool bDefault if (pState) { const SfxUInt16Item* pItem = static_cast<const SfxUInt16Item*>(pState); - mpTransparanceItem.reset(static_cast<SfxUInt16Item*>(pItem->Clone())); + mpTransparanceItem.reset(pItem->Clone()); } else { @@ -784,7 +784,7 @@ void AreaPropertyPanelBase::updateFillFloatTransparence(bool bDisabled, bool bDe if (pState) { const XFillFloatTransparenceItem* pItem = static_cast<const XFillFloatTransparenceItem*>(pState); - mpFloatTransparenceItem.reset(static_cast<XFillFloatTransparenceItem*>(pItem->Clone())); + mpFloatTransparenceItem.reset(pItem->Clone()); } else { @@ -817,7 +817,7 @@ void AreaPropertyPanelBase::updateFillStyle(bool bDisabled, bool bDefaultOrSet, else if (bDefaultOrSet && pState) { const XFillStyleItem* pItem = static_cast<const XFillStyleItem*>(pState); - mpStyleItem.reset(dynamic_cast< XFillStyleItem* >(pItem->Clone())); + mpStyleItem.reset(pItem->Clone()); mpLbFillType->Enable(); mpColorTextFT->Enable(); drawing::FillStyle eXFS = mpStyleItem->GetValue(); @@ -877,7 +877,7 @@ void AreaPropertyPanelBase::updateFillGradient(bool bDisabled, bool bDefaultOrSe if (bDefaultOrSet) { const XFillGradientItem* pItem = static_cast<const XFillGradientItem*>(pState); - mpFillGradientItem.reset(pItem ? static_cast<XFillGradientItem*>(pItem->Clone()) : nullptr); + mpFillGradientItem.reset(pItem ? pItem->Clone() : nullptr); } if(mpStyleItem && drawing::FillStyle_GRADIENT == mpStyleItem->GetValue()) @@ -918,7 +918,7 @@ void AreaPropertyPanelBase::updateFillHatch(bool bDisabled, bool bDefaultOrSet, if (bDefaultOrSet) { const XFillHatchItem* pItem = static_cast<const XFillHatchItem*>(pState); - mpHatchItem.reset(pItem ? static_cast<XFillHatchItem*>(pItem->Clone()) : nullptr); + mpHatchItem.reset(pItem ? pItem->Clone() : nullptr); } if(mpStyleItem && drawing::FillStyle_HATCH == mpStyleItem->GetValue()) @@ -951,7 +951,7 @@ void AreaPropertyPanelBase::updateFillColor(bool bDefaultOrSet, const SfxPoolIte if (bDefaultOrSet) { const XFillColorItem* pItem = static_cast<const XFillColorItem*>(pState); - mpColorItem.reset(pItem ? static_cast<XFillColorItem*>(pItem->Clone()) : nullptr); + mpColorItem.reset(pItem ? pItem->Clone() : nullptr); } if(mpStyleItem && drawing::FillStyle_SOLID == mpStyleItem->GetValue()) @@ -970,7 +970,7 @@ void AreaPropertyPanelBase::updateFillBitmap(bool bDisabled, bool bDefaultOrSet, if (bDefaultOrSet) { const XFillBitmapItem* pItem = static_cast<const XFillBitmapItem*>(pState); - mpBitmapItem.reset(pItem ? static_cast<XFillBitmapItem*>(pItem->Clone()) : nullptr); + mpBitmapItem.reset(pItem ? pItem->Clone() : nullptr); } if(mpStyleItem && drawing::FillStyle_BITMAP == mpStyleItem->GetValue()) diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 7460e002c86f..a068447a82f3 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -360,7 +360,7 @@ SdrItemPool::SdrItemPool(const SdrItemPool& rPool) { } -SfxItemPool* SdrItemPool::Clone() const +SdrItemPool* SdrItemPool::Clone() const { return new SdrItemPool(*this); } @@ -652,7 +652,7 @@ bool SdrFractionItem::GetPresentation( return false; } -SfxPoolItem* SdrFractionItem::Clone(SfxItemPool * /*pPool*/) const +SdrFractionItem* SdrFractionItem::Clone(SfxItemPool * /*pPool*/) const { return new SdrFractionItem(Which(),GetValue()); } @@ -684,7 +684,7 @@ bool SdrScaleItem::GetPresentation( return true; } -SfxPoolItem* SdrScaleItem::Clone(SfxItemPool * /*pPool*/) const +SdrScaleItem* SdrScaleItem::Clone(SfxItemPool * /*pPool*/) const { return new SdrScaleItem(Which(),GetValue()); } @@ -693,7 +693,7 @@ SfxPoolItem* SdrScaleItem::Clone(SfxItemPool * /*pPool*/) const // OnOffItem -SfxPoolItem* SdrOnOffItem::Clone(SfxItemPool* /*pPool*/) const +SdrOnOffItem* SdrOnOffItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrOnOffItem(Which(),GetValue()); } @@ -716,7 +716,7 @@ bool SdrOnOffItem::GetPresentation(SfxItemPresentation ePres, } -SfxPoolItem* SdrYesNoItem::Clone(SfxItemPool* /*pPool*/) const +SdrYesNoItem* SdrYesNoItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrYesNoItem(Which(),GetValue()); } @@ -738,10 +738,7 @@ bool SdrYesNoItem::GetPresentation(SfxItemPresentation ePres, return true; } - - - -SfxPoolItem* SdrPercentItem::Clone(SfxItemPool* /*pPool*/) const +SdrPercentItem* SdrPercentItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrPercentItem(Which(),GetValue()); } @@ -761,10 +758,7 @@ bool SdrPercentItem::GetPresentation( return true; } - - - -SfxPoolItem* SdrAngleItem::Clone(SfxItemPool* /*pPool*/) const +SdrAngleItem* SdrAngleItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrAngleItem(Which(),GetValue()); } @@ -829,10 +823,7 @@ bool SdrAngleItem::GetPresentation( return true; } - - - -SfxPoolItem* SdrMetricItem::Clone(SfxItemPool* /*pPool*/) const +SdrMetricItem* SdrMetricItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMetricItem(Which(),GetValue()); } @@ -870,7 +861,7 @@ bool SdrMetricItem::GetPresentation(SfxItemPresentation ePres, // items of the legend object -SfxPoolItem* SdrCaptionTypeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCaptionTypeItem(*this); } +SdrCaptionTypeItem* SdrCaptionTypeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCaptionTypeItem(*this); } sal_uInt16 SdrCaptionTypeItem::GetValueCount() const { return 4; } @@ -898,7 +889,7 @@ bool SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePres, } -SfxPoolItem* SdrCaptionEscDirItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCaptionEscDirItem(*this); } +SdrCaptionEscDirItem* SdrCaptionEscDirItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCaptionEscDirItem(*this); } sal_uInt16 SdrCaptionEscDirItem::GetValueCount() const { return 3; } @@ -932,7 +923,7 @@ bool SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation ePres, SfxPoolItem* SdrTextFitToSizeTypeItem::CreateDefault() { return new SdrTextFitToSizeTypeItem; } -SfxPoolItem* SdrTextFitToSizeTypeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextFitToSizeTypeItem(*this); } +SdrTextFitToSizeTypeItem* SdrTextFitToSizeTypeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextFitToSizeTypeItem(*this); } sal_uInt16 SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; } @@ -994,7 +985,7 @@ bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemb } -SfxPoolItem* SdrTextVertAdjustItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextVertAdjustItem(*this); } +SdrTextVertAdjustItem* SdrTextVertAdjustItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextVertAdjustItem(*this); } sal_uInt16 SdrTextVertAdjustItem::GetValueCount() const { return 5; } @@ -1053,7 +1044,7 @@ void SdrTextVertAdjustItem::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterEndElement(pWriter); } -SfxPoolItem* SdrTextHorzAdjustItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextHorzAdjustItem(*this); } +SdrTextHorzAdjustItem* SdrTextHorzAdjustItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextHorzAdjustItem(*this); } sal_uInt16 SdrTextHorzAdjustItem::GetValueCount() const { return 5; } @@ -1105,7 +1096,7 @@ bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberI } -SfxPoolItem* SdrTextAniKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniKindItem(*this); } +SdrTextAniKindItem* SdrTextAniKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniKindItem(*this); } sal_uInt16 SdrTextAniKindItem::GetValueCount() const { return 5; } @@ -1156,7 +1147,7 @@ bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ } -SfxPoolItem* SdrTextAniDirectionItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniDirectionItem(*this); } +SdrTextAniDirectionItem* SdrTextAniDirectionItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniDirectionItem(*this); } sal_uInt16 SdrTextAniDirectionItem::GetValueCount() const { return 4; } @@ -1207,7 +1198,7 @@ bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMembe } -SfxPoolItem* SdrTextAniDelayItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniDelayItem(*this); } +SdrTextAniDelayItem* SdrTextAniDelayItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniDelayItem(*this); } bool SdrTextAniDelayItem::GetPresentation( SfxItemPresentation ePres, MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, @@ -1224,7 +1215,7 @@ bool SdrTextAniDelayItem::GetPresentation( } -SfxPoolItem* SdrTextAniAmountItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniAmountItem(*this); } +SdrTextAniAmountItem* SdrTextAniAmountItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniAmountItem(*this); } bool SdrTextAniAmountItem::HasMetrics() const { @@ -1286,7 +1277,8 @@ bool SdrTextFixedCellHeightItem::GetPresentation( SfxItemPresentation ePres, } return true; } -SfxPoolItem* SdrTextFixedCellHeightItem::Clone( SfxItemPool * /*pPool*/) const + +SdrTextFixedCellHeightItem* SdrTextFixedCellHeightItem::Clone( SfxItemPool * /*pPool*/) const { return new SdrTextFixedCellHeightItem( GetValue() ); } @@ -1308,7 +1300,7 @@ bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMe // EdgeKind -SfxPoolItem* SdrEdgeKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrEdgeKindItem(*this); } +SdrEdgeKindItem* SdrEdgeKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrEdgeKindItem(*this); } sal_uInt16 SdrEdgeKindItem::GetValueCount() const { return 4; } @@ -1398,7 +1390,7 @@ bool SdrEdgeNode1HorzDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemb return true; } -SfxPoolItem* SdrEdgeNode1HorzDistItem::Clone(SfxItemPool* /*pPool*/) const +SdrEdgeNode1HorzDistItem* SdrEdgeNode1HorzDistItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrEdgeNode1HorzDistItem(*this); } @@ -1419,7 +1411,7 @@ bool SdrEdgeNode1VertDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemb return true; } -SfxPoolItem* SdrEdgeNode1VertDistItem::Clone(SfxItemPool* /*pPool*/) const +SdrEdgeNode1VertDistItem* SdrEdgeNode1VertDistItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrEdgeNode1VertDistItem(*this); } @@ -1440,7 +1432,7 @@ bool SdrEdgeNode2HorzDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemb return true; } -SfxPoolItem* SdrEdgeNode2HorzDistItem::Clone(SfxItemPool* /*pPool*/) const +SdrEdgeNode2HorzDistItem* SdrEdgeNode2HorzDistItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrEdgeNode2HorzDistItem(*this); } @@ -1461,22 +1453,22 @@ bool SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemb return true; } -SfxPoolItem* SdrEdgeNode2VertDistItem::Clone(SfxItemPool* /*pPool*/) const +SdrEdgeNode2VertDistItem* SdrEdgeNode2VertDistItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrEdgeNode2VertDistItem(*this); } -SfxPoolItem* SdrEdgeNode1GlueDistItem::Clone(SfxItemPool* /*pPool*/) const +SdrEdgeNode1GlueDistItem* SdrEdgeNode1GlueDistItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrEdgeNode1GlueDistItem(*this); } -SfxPoolItem* SdrEdgeNode2GlueDistItem::Clone(SfxItemPool* /*pPool*/) const +SdrEdgeNode2GlueDistItem* SdrEdgeNode2GlueDistItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrEdgeNode2GlueDistItem(*this); } -SfxPoolItem* SdrMeasureKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureKindItem(*this); } +SdrMeasureKindItem* SdrMeasureKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureKindItem(*this); } sal_uInt16 SdrMeasureKindItem::GetValueCount() const { return 2; } @@ -1524,7 +1516,7 @@ bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ } -SfxPoolItem* SdrMeasureTextHPosItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureTextHPosItem(*this); } +SdrMeasureTextHPosItem* SdrMeasureTextHPosItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureTextHPosItem(*this); } sal_uInt16 SdrMeasureTextHPosItem::GetValueCount() const { return 4; } @@ -1573,8 +1565,7 @@ bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMember return true; } - -SfxPoolItem* SdrMeasureTextVPosItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureTextVPosItem(*this); } +SdrMeasureTextVPosItem* SdrMeasureTextVPosItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureTextVPosItem(*this); } sal_uInt16 SdrMeasureTextVPosItem::GetValueCount() const { return 5; } @@ -1624,7 +1615,7 @@ bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMember return true; } -SfxPoolItem* SdrMeasureUnitItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureUnitItem(*this); } +SdrMeasureUnitItem* SdrMeasureUnitItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureUnitItem(*this); } sal_uInt16 SdrMeasureUnitItem::GetValueCount() const { return 14; } @@ -1663,7 +1654,7 @@ bool SdrMeasureUnitItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ } -SfxPoolItem* SdrCircKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCircKindItem(*this); } +SdrCircKindItem* SdrCircKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCircKindItem(*this); } sal_uInt16 SdrCircKindItem::GetValueCount() const { return 4; } @@ -1712,10 +1703,7 @@ bool SdrCircKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) return true; } - - - -SfxPoolItem* SdrSignedPercentItem::Clone(SfxItemPool* /*pPool*/) const +SdrSignedPercentItem* SdrSignedPercentItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrSignedPercentItem( Which(), GetValue() ); } @@ -1735,38 +1723,32 @@ bool SdrSignedPercentItem::GetPresentation( return true; } - -SfxPoolItem* SdrGrafRedItem::Clone( SfxItemPool* /*pPool*/) const +SdrGrafRedItem* SdrGrafRedItem::Clone( SfxItemPool* /*pPool*/) const { return new SdrGrafRedItem( *this ); } - -SfxPoolItem* SdrGrafGreenItem::Clone( SfxItemPool* /*pPool*/) const +SdrGrafGreenItem* SdrGrafGreenItem::Clone( SfxItemPool* /*pPool*/) const { return new SdrGrafGreenItem( *this ); } - -SfxPoolItem* SdrGrafBlueItem::Clone( SfxItemPool* /*pPool*/) const +SdrGrafBlueItem* SdrGrafBlueItem::Clone( SfxItemPool* /*pPool*/) const { return new SdrGrafBlueItem( *this ); } - -SfxPoolItem* SdrGrafLuminanceItem::Clone( SfxItemPool* /*pPool*/) const +SdrGrafLuminanceItem* SdrGrafLuminanceItem::Clone( SfxItemPool* /*pPool*/) const { return new SdrGrafLuminanceItem( *this ); } - -SfxPoolItem* SdrGrafContrastItem::Clone( SfxItemPool* /*pPool*/) const +SdrGrafContrastItem* SdrGrafContrastItem::Clone( SfxItemPool* /*pPool*/) const { return new SdrGrafContrastItem( *this ); } - -SfxPoolItem* SdrGrafGamma100Item::Clone( SfxItemPool* /*pPool */) const +SdrGrafGamma100Item* SdrGrafGamma100Item::Clone( SfxItemPool* /*pPool */) const { return new SdrGrafGamma100Item( *this ); } @@ -1787,20 +1769,17 @@ bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId* return true; } - -SfxPoolItem* SdrGrafInvertItem::Clone( SfxItemPool* /*pPool*/) const +SdrGrafInvertItem* SdrGrafInvertItem::Clone( SfxItemPool* /*pPool*/) const { return new SdrGrafInvertItem( *this ); } - -SfxPoolItem* SdrGrafTransparenceItem::Clone( SfxItemPool* /*pPool*/) const +SdrGrafTransparenceItem* SdrGrafTransparenceItem::Clone( SfxItemPool* /*pPool*/) const { return new SdrGrafTransparenceItem( *this ); } - -SfxPoolItem* SdrGrafModeItem::Clone(SfxItemPool* /*pPool*/) const +SdrGrafModeItem* SdrGrafModeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrGrafModeItem( *this ); } @@ -1855,8 +1834,7 @@ bool SdrGrafModeItem::GetPresentation( SfxItemPresentation ePres, return true; } - -SfxPoolItem* SdrGrafCropItem::Clone( SfxItemPool* /*pPool*/) const +SdrGrafCropItem* SdrGrafCropItem::Clone( SfxItemPool* /*pPool*/) const { return new SdrGrafCropItem( *this ); } @@ -1864,94 +1842,117 @@ SfxPoolItem* SdrGrafCropItem::Clone( SfxItemPool* /*pPool*/) const SdrTextAniStartInsideItem::~SdrTextAniStartInsideItem() { } -SfxPoolItem* SdrTextAniStartInsideItem::Clone(SfxItemPool* ) const + +SdrTextAniStartInsideItem* SdrTextAniStartInsideItem::Clone(SfxItemPool* ) const { return new SdrTextAniStartInsideItem(*this); } + SdrTextAniStopInsideItem::~SdrTextAniStopInsideItem() { } -SfxPoolItem* SdrTextAniStopInsideItem::Clone(SfxItemPool* ) const + +SdrTextAniStopInsideItem* SdrTextAniStopInsideItem::Clone(SfxItemPool* ) const { return new SdrTextAniStopInsideItem(*this); } + SdrCaptionEscIsRelItem::~SdrCaptionEscIsRelItem() { } -SfxPoolItem* SdrCaptionEscIsRelItem::Clone(SfxItemPool* ) const + +SdrCaptionEscIsRelItem* SdrCaptionEscIsRelItem::Clone(SfxItemPool* ) const { return new SdrCaptionEscIsRelItem(*this); } + SdrCaptionEscRelItem::~SdrCaptionEscRelItem() { } -SfxPoolItem* SdrCaptionEscRelItem::Clone(SfxItemPool*) const + +SdrCaptionEscRelItem* SdrCaptionEscRelItem::Clone(SfxItemPool*) const { return new SdrCaptionEscRelItem(*this); } + SdrCaptionFitLineLenItem::~SdrCaptionFitLineLenItem() { } -SfxPoolItem* SdrCaptionFitLineLenItem::Clone(SfxItemPool* ) const + +SdrCaptionFitLineLenItem* SdrCaptionFitLineLenItem::Clone(SfxItemPool* ) const { return new SdrCaptionFitLineLenItem(*this); } + SdrCaptionLineLenItem::~SdrCaptionLineLenItem() { } -SfxPoolItem* SdrCaptionLineLenItem::Clone(SfxItemPool*) const + +SdrCaptionLineLenItem* SdrCaptionLineLenItem::Clone(SfxItemPool*) const { return new SdrCaptionLineLenItem(*this); } + SdrMeasureBelowRefEdgeItem::~SdrMeasureBelowRefEdgeItem() { } -SfxPoolItem* SdrMeasureBelowRefEdgeItem::Clone(SfxItemPool* ) const + +SdrMeasureBelowRefEdgeItem* SdrMeasureBelowRefEdgeItem::Clone(SfxItemPool* ) const { return new SdrMeasureBelowRefEdgeItem(*this); } + SdrMeasureTextIsFixedAngleItem::~SdrMeasureTextIsFixedAngleItem() { } -SfxPoolItem* SdrMeasureTextIsFixedAngleItem::Clone(SfxItemPool* ) const + +SdrMeasureTextIsFixedAngleItem* SdrMeasureTextIsFixedAngleItem::Clone(SfxItemPool* ) const { return new SdrMeasureTextIsFixedAngleItem(*this); } + SdrMeasureTextFixedAngleItem::~SdrMeasureTextFixedAngleItem() { } -SfxPoolItem* SdrMeasureTextFixedAngleItem::Clone(SfxItemPool* ) const + +SdrMeasureTextFixedAngleItem* SdrMeasureTextFixedAngleItem::Clone(SfxItemPool* ) const { return new SdrMeasureTextFixedAngleItem(*this); } + SdrMeasureDecimalPlacesItem::~SdrMeasureDecimalPlacesItem() { } -SfxPoolItem* SdrMeasureDecimalPlacesItem::Clone(SfxItemPool* ) const + +SdrMeasureDecimalPlacesItem* SdrMeasureDecimalPlacesItem::Clone(SfxItemPool* ) const { return new SdrMeasureDecimalPlacesItem(*this); } + SdrMeasureTextRota90Item::~SdrMeasureTextRota90Item() { } -SfxPoolItem* SdrMeasureTextRota90Item::Clone(SfxItemPool* ) const + +SdrMeasureTextRota90Item* SdrMeasureTextRota90Item::Clone(SfxItemPool* ) const { return new SdrMeasureTextRota90Item(*this); } + SdrMeasureTextUpsideDownItem::~SdrMeasureTextUpsideDownItem() { } -SfxPoolItem* SdrMeasureTextUpsideDownItem::Clone(SfxItemPool* ) const + +SdrMeasureTextUpsideDownItem* SdrMeasureTextUpsideDownItem::Clone(SfxItemPool* ) const { return new SdrMeasureTextUpsideDownItem(*this); } -SfxPoolItem* SdrLayerIdItem::Clone(SfxItemPool* /*pPool*/) const +SdrLayerIdItem* SdrLayerIdItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrLayerIdItem(*this); } -SfxPoolItem* SdrLayerNameItem::Clone(SfxItemPool* /*pPool*/) const +SdrLayerNameItem* SdrLayerNameItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrLayerNameItem(*this); } diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 28fb05eae8c2..76338b2a144e 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -1038,7 +1038,7 @@ SdrObject& SdrObject::operator=(const SdrObject& rObj) pGrabBagItem.reset(); if (rObj.pGrabBagItem!=nullptr) - pGrabBagItem.reset(static_cast< SfxGrabBagItem* >( rObj.pGrabBagItem->Clone() )); + pGrabBagItem.reset(rObj.pGrabBagItem->Clone()); return *this; } diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 7a9be740539c..52e0d8bc149e 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -114,7 +114,7 @@ void SvxFillToolBoxControl::StateChanged( if(pItem) { - mpStyleItem.reset(dynamic_cast< XFillStyleItem* >(pItem->Clone())); + mpStyleItem.reset(pItem->Clone()); mpLbFillType->Enable(); drawing::FillStyle eXFS = mpStyleItem->GetValue(); meLastXFS = eXFS; diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index c94fcdea4d93..b546910f85b2 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -138,9 +138,8 @@ bool NameOrIndex::operator==(const SfxPoolItem& rItem) const static_cast<const NameOrIndex&>(rItem).nPalIndex == nPalIndex ); } -SfxPoolItem* NameOrIndex::Clone(SfxItemPool* /*pPool*/) const +NameOrIndex* NameOrIndex::Clone(SfxItemPool* /*pPool*/) const { - return new NameOrIndex(*this); } @@ -305,7 +304,7 @@ XColorItem::XColorItem(const XColorItem& rItem) : { } -SfxPoolItem* XColorItem::Clone(SfxItemPool* /*pPool*/) const +XColorItem* XColorItem::Clone(SfxItemPool* /*pPool*/) const { return new XColorItem(*this); } @@ -348,7 +347,7 @@ XLineStyleItem::XLineStyleItem(css::drawing::LineStyle eTheLineStyle) : { } -SfxPoolItem* XLineStyleItem::Clone(SfxItemPool* /*pPool*/) const +XLineStyleItem* XLineStyleItem::Clone(SfxItemPool* /*pPool*/) const { return new XLineStyleItem( *this ); } @@ -598,7 +597,7 @@ XLineDashItem::XLineDashItem(const XDash& rTheDash) { } -SfxPoolItem* XLineDashItem::Clone(SfxItemPool* /*pPool*/) const +XLineDashItem* XLineDashItem::Clone(SfxItemPool* /*pPool*/) const { return new XLineDashItem(*this); } @@ -906,7 +905,7 @@ XLineWidthItem::XLineWidthItem(long nWidth) : { } -SfxPoolItem* XLineWidthItem::Clone(SfxItemPool* /*pPool*/) const +XLineWidthItem* XLineWidthItem::Clone(SfxItemPool* /*pPool*/) const { return new XLineWidthItem(*this); } @@ -958,7 +957,7 @@ XLineColorItem::XLineColorItem(const OUString& rName, const Color& rTheColor) : { } -SfxPoolItem* XLineColorItem::Clone(SfxItemPool* /*pPool*/) const +XLineColorItem* XLineColorItem::Clone(SfxItemPool* /*pPool*/) const { return new XLineColorItem(*this); } @@ -1017,7 +1016,7 @@ XLineStartItem::XLineStartItem(const basegfx::B2DPolyPolygon& rPolyPolygon) { } -SfxPoolItem* XLineStartItem::Clone(SfxItemPool* /*pPool*/) const +XLineStartItem* XLineStartItem::Clone(SfxItemPool* /*pPool*/) const { return new XLineStartItem(*this); } @@ -1314,7 +1313,7 @@ XLineEndItem::XLineEndItem(const basegfx::B2DPolyPolygon& rPolyPolygon) { } -SfxPoolItem* XLineEndItem::Clone(SfxItemPool* /*pPool*/) const +XLineEndItem* XLineEndItem::Clone(SfxItemPool* /*pPool*/) const { return new XLineEndItem(*this); } @@ -1591,7 +1590,7 @@ XLineStartWidthItem::XLineStartWidthItem(long nWidth) : { } -SfxPoolItem* XLineStartWidthItem::Clone(SfxItemPool* /*pPool*/) const +XLineStartWidthItem* XLineStartWidthItem::Clone(SfxItemPool* /*pPool*/) const { return new XLineStartWidthItem(*this); } @@ -1629,7 +1628,7 @@ XLineEndWidthItem::XLineEndWidthItem(long nWidth) : { } -SfxPoolItem* XLineEndWidthItem::Clone(SfxItemPool* /*pPool*/) const +XLineEndWidthItem* XLineEndWidthItem::Clone(SfxItemPool* /*pPool*/) const { return new XLineEndWidthItem(*this); } @@ -1667,7 +1666,7 @@ XLineStartCenterItem::XLineStartCenterItem(bool bStartCenter) : { } -SfxPoolItem* XLineStartCenterItem::Clone(SfxItemPool* /*pPool*/) const +XLineStartCenterItem* XLineStartCenterItem::Clone(SfxItemPool* /*pPool*/) const { return new XLineStartCenterItem(*this); } @@ -1706,7 +1705,7 @@ XLineEndCenterItem::XLineEndCenterItem(bool bEndCenter) : { } -SfxPoolItem* XLineEndCenterItem::Clone(SfxItemPool* /*pPool*/) const +XLineEndCenterItem* XLineEndCenterItem::Clone(SfxItemPool* /*pPool*/) const { return new XLineEndCenterItem(*this); } @@ -1750,7 +1749,7 @@ XFillStyleItem::XFillStyleItem(drawing::FillStyle eFillStyle) : { } -SfxPoolItem* XFillStyleItem::Clone(SfxItemPool* /*pPool*/) const +XFillStyleItem* XFillStyleItem::Clone(SfxItemPool* /*pPool*/) const { return new XFillStyleItem( *this ); } @@ -1884,7 +1883,7 @@ XFillColorItem::XFillColorItem(const OUString& rName, const Color& rTheColor) : { } -SfxPoolItem* XFillColorItem::Clone(SfxItemPool* /*pPool*/) const +XFillColorItem* XFillColorItem::Clone(SfxItemPool* /*pPool*/) const { return new XFillColorItem(*this); } @@ -1931,7 +1930,7 @@ XSecondaryFillColorItem::XSecondaryFillColorItem(const OUString& rName, const Co { } -SfxPoolItem* XSecondaryFillColorItem::Clone(SfxItemPool* /*pPool*/) const +XSecondaryFillColorItem* XSecondaryFillColorItem::Clone(SfxItemPool* /*pPool*/) const { return new XSecondaryFillColorItem(*this); } @@ -2125,7 +2124,7 @@ XFillGradientItem::XFillGradientItem( const XGradient& rTheGradient ) { } -SfxPoolItem* XFillGradientItem::Clone(SfxItemPool* /*pPool*/) const +XFillGradientItem* XFillGradientItem::Clone(SfxItemPool* /*pPool*/) const { return new XFillGradientItem(*this); } @@ -2445,7 +2444,7 @@ bool XFillFloatTransparenceItem::operator==( const SfxPoolItem& rItem ) const ( bEnabled == static_cast<const XFillFloatTransparenceItem&>(rItem).bEnabled ); } -SfxPoolItem* XFillFloatTransparenceItem::Clone( SfxItemPool* /*pPool*/) const +XFillFloatTransparenceItem* XFillFloatTransparenceItem::Clone( SfxItemPool* /*pPool*/) const { return new XFillFloatTransparenceItem( *this ); } @@ -2554,7 +2553,7 @@ XFillHatchItem::XFillHatchItem(const XHatch& rTheHatch) { } -SfxPoolItem* XFillHatchItem::Clone(SfxItemPool* /*pPool*/) const +XFillHatchItem* XFillHatchItem::Clone(SfxItemPool* /*pPool*/) const { return new XFillHatchItem(*this); } @@ -2771,7 +2770,7 @@ XFormTextStyleItem::XFormTextStyleItem(XFormTextStyle eTheStyle) : { } -SfxPoolItem* XFormTextStyleItem::Clone(SfxItemPool* /*pPool*/) const +XFormTextStyleItem* XFormTextStyleItem::Clone(SfxItemPool* /*pPool*/) const { return new XFormTextStyleItem( *this ); } @@ -2804,7 +2803,7 @@ XFormTextAdjustItem::XFormTextAdjustItem(XFormTextAdjust eTheAdjust) : { } -SfxPoolItem* XFormTextAdjustItem::Clone(SfxItemPool* /*pPool*/) const +XFormTextAdjustItem* XFormTextAdjustItem::Clone(SfxItemPool* /*pPool*/) const { return new XFormTextAdjustItem( *this ); } @@ -2837,7 +2836,7 @@ XFormTextDistanceItem::XFormTextDistanceItem(long nDist) : { } -SfxPoolItem* XFormTextDistanceItem::Clone(SfxItemPool* /*pPool*/) const +XFormTextDistanceItem* XFormTextDistanceItem::Clone(SfxItemPool* /*pPool*/) const { return new XFormTextDistanceItem(*this); } @@ -2849,12 +2848,11 @@ XFormTextStartItem::XFormTextStartItem(long nStart) : { } -SfxPoolItem* XFormTextStartItem::Clone(SfxItemPool* /*pPool*/) const +XFormTextStartItem* XFormTextStartItem::Clone(SfxItemPool* /*pPool*/) const { return new XFormTextStartItem(*this); } - SfxPoolItem* XFormTextMirrorItem::CreateDefault() { return new XFormTextMirrorItem; } XFormTextMirrorItem::XFormTextMirrorItem(bool bMirror) : @@ -2862,12 +2860,11 @@ XFormTextMirrorItem::XFormTextMirrorItem(bool bMirror) : { } -SfxPoolItem* XFormTextMirrorItem::Clone(SfxItemPool* /*pPool*/) const +XFormTextMirrorItem* XFormTextMirrorItem::Clone(SfxItemPool* /*pPool*/) const { return new XFormTextMirrorItem(*this); } - SfxPoolItem* XFormTextOutlineItem::CreateDefault() { return new XFormTextOutlineItem; } XFormTextOutlineItem::XFormTextOutlineItem(bool bOutline) : @@ -2875,12 +2872,11 @@ XFormTextOutlineItem::XFormTextOutlineItem(bool bOutline) : { } -SfxPoolItem* XFormTextOutlineItem::Clone(SfxItemPool* /*pPool*/) const +XFormTextOutlineItem* XFormTextOutlineItem::Clone(SfxItemPool* /*pPool*/) const { return new XFormTextOutlineItem(*this); } - SfxPoolItem* XFormTextShadowItem::CreateDefault() { return new XFormTextShadowItem; } XFormTextShadowItem::XFormTextShadowItem(XFormTextShadow eFormTextShadow) : @@ -2888,7 +2884,7 @@ XFormTextShadowItem::XFormTextShadowItem(XFormTextShadow eFormTextShadow) : { } -SfxPoolItem* XFormTextShadowItem::Clone(SfxItemPool* /*pPool*/) const +XFormTextShadowItem* XFormTextShadowItem::Clone(SfxItemPool* /*pPool*/) const { return new XFormTextShadowItem( *this ); } @@ -2922,7 +2918,7 @@ XFormTextShadowColorItem::XFormTextShadowColorItem(const OUString& rName, { } -SfxPoolItem* XFormTextShadowColorItem::Clone(SfxItemPool* /*pPool*/) const +XFormTextShadowColorItem* XFormTextShadowColorItem::Clone(SfxItemPool* /*pPool*/) const { return new XFormTextShadowColorItem(*this); } @@ -2934,12 +2930,11 @@ XFormTextShadowXValItem::XFormTextShadowXValItem(long nVal) : { } -SfxPoolItem* XFormTextShadowXValItem::Clone(SfxItemPool* /*pPool*/) const +XFormTextShadowXValItem* XFormTextShadowXValItem::Clone(SfxItemPool* /*pPool*/) const { return new XFormTextShadowXValItem(*this); } - SfxPoolItem* XFormTextShadowYValItem::CreateDefault() { return new XFormTextShadowYValItem; } XFormTextShadowYValItem::XFormTextShadowYValItem(long nVal) : @@ -2947,12 +2942,11 @@ XFormTextShadowYValItem::XFormTextShadowYValItem(long nVal) : { } -SfxPoolItem* XFormTextShadowYValItem::Clone(SfxItemPool* /*pPool*/) const +XFormTextShadowYValItem* XFormTextShadowYValItem::Clone(SfxItemPool* /*pPool*/) const { return new XFormTextShadowYValItem(*this); } - SfxPoolItem* XFormTextHideFormItem::CreateDefault() { return new XFormTextHideFormItem; } XFormTextHideFormItem::XFormTextHideFormItem(bool bHide) : @@ -2960,7 +2954,7 @@ XFormTextHideFormItem::XFormTextHideFormItem(bool bHide) : { } -SfxPoolItem* XFormTextHideFormItem::Clone(SfxItemPool* /*pPool*/) const +XFormTextHideFormItem* XFormTextHideFormItem::Clone(SfxItemPool* /*pPool*/) const { return new XFormTextHideFormItem(*this); } @@ -2991,7 +2985,7 @@ XLineAttrSetItem::XLineAttrSetItem( const XLineAttrSetItem& rLineAttr, { } -SfxPoolItem* XLineAttrSetItem::Clone( SfxItemPool* pPool ) const +XLineAttrSetItem* XLineAttrSetItem::Clone( SfxItemPool* pPool ) const { return new XLineAttrSetItem( *this, pPool ); } @@ -3019,7 +3013,7 @@ XFillAttrSetItem::XFillAttrSetItem( const XFillAttrSetItem& rFillAttr, { } -SfxPoolItem* XFillAttrSetItem::Clone( SfxItemPool* pPool ) const +XFillAttrSetItem* XFillAttrSetItem::Clone( SfxItemPool* pPool ) const { return new XFillAttrSetItem( *this, pPool ); } diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index ee1440e33497..30284c8a9a86 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -54,7 +54,7 @@ XLineTransparenceItem::XLineTransparenceItem(sal_uInt16 nLineTransparence) : { } -SfxPoolItem* XLineTransparenceItem::Clone(SfxItemPool* /*pPool*/) const +XLineTransparenceItem* XLineTransparenceItem::Clone(SfxItemPool* /*pPool*/) const { return new XLineTransparenceItem(*this); } @@ -91,7 +91,7 @@ XLineJointItem::XLineJointItem( css::drawing::LineJoint eLineJoint ) : { } -SfxPoolItem* XLineJointItem::Clone(SfxItemPool* /*pPool*/) const +XLineJointItem* XLineJointItem::Clone(SfxItemPool* /*pPool*/) const { return new XLineJointItem( *this ); } @@ -218,7 +218,7 @@ bool AffineMatrixItem::operator==(const SfxPoolItem& rRef) const && maMatrix.m12 == pRef->maMatrix.m12); } -SfxPoolItem* AffineMatrixItem::Clone( SfxItemPool* /*pPool*/ ) const +AffineMatrixItem* AffineMatrixItem::Clone( SfxItemPool* /*pPool*/ ) const { return new AffineMatrixItem(*this); } @@ -248,7 +248,7 @@ XLineCapItem::XLineCapItem(css::drawing::LineCap eLineCap) { } -SfxPoolItem* XLineCapItem::Clone(SfxItemPool* /*pPool*/) const +XLineCapItem* XLineCapItem::Clone(SfxItemPool* /*pPool*/) const { return new XLineCapItem( *this ); } @@ -332,7 +332,7 @@ XFillTransparenceItem::XFillTransparenceItem(sal_uInt16 nFillTransparence) : { } -SfxPoolItem* XFillTransparenceItem::Clone(SfxItemPool* /*pPool*/) const +XFillTransparenceItem* XFillTransparenceItem::Clone(SfxItemPool* /*pPool*/) const { return new XFillTransparenceItem(*this); } @@ -375,7 +375,7 @@ XFormTextShadowTranspItem::XFormTextShadowTranspItem(sal_uInt16 nShdwTransparenc { } -SfxPoolItem* XFormTextShadowTranspItem::Clone(SfxItemPool* /*pPool*/) const +XFormTextShadowTranspItem* XFormTextShadowTranspItem::Clone(SfxItemPool* /*pPool*/) const { return new XFormTextShadowTranspItem(*this); } @@ -386,7 +386,7 @@ XGradientStepCountItem::XGradientStepCountItem( sal_uInt16 nStepCount ) : { } -SfxPoolItem* XGradientStepCountItem::Clone( SfxItemPool* /*pPool*/) const +XGradientStepCountItem* XGradientStepCountItem::Clone( SfxItemPool* /*pPool*/) const { return new XGradientStepCountItem( *this ); } @@ -411,7 +411,7 @@ XFillBmpTileItem::XFillBmpTileItem( bool bTile ) : { } -SfxPoolItem* XFillBmpTileItem::Clone( SfxItemPool* /*pPool*/) const +XFillBmpTileItem* XFillBmpTileItem::Clone( SfxItemPool* /*pPool*/) const { return new XFillBmpTileItem( *this ); } @@ -443,7 +443,7 @@ XFillBmpPosItem::XFillBmpPosItem( RectPoint eRP ) : { } -SfxPoolItem* XFillBmpPosItem::Clone( SfxItemPool* /*pPool*/) const +XFillBmpPosItem* XFillBmpPosItem::Clone( SfxItemPool* /*pPool*/) const { return new XFillBmpPosItem( *this ); } @@ -479,7 +479,7 @@ XFillBmpSizeXItem::XFillBmpSizeXItem( long nSizeX ) : { } -SfxPoolItem* XFillBmpSizeXItem::Clone( SfxItemPool* /*pPool*/) const +XFillBmpSizeXItem* XFillBmpSizeXItem::Clone( SfxItemPool* /*pPool*/) const { return new XFillBmpSizeXItem( *this ); } @@ -508,7 +508,7 @@ XFillBmpSizeYItem::XFillBmpSizeYItem( long nSizeY ) : { } -SfxPoolItem* XFillBmpSizeYItem::Clone( SfxItemPool* /*pPool*/) const +XFillBmpSizeYItem* XFillBmpSizeYItem::Clone( SfxItemPool* /*pPool*/) const { return new XFillBmpSizeYItem( *this ); } @@ -536,7 +536,7 @@ XFillBmpSizeLogItem::XFillBmpSizeLogItem( bool bLog ) : { } -SfxPoolItem* XFillBmpSizeLogItem::Clone( SfxItemPool* /*pPool*/) const +XFillBmpSizeLogItem* XFillBmpSizeLogItem::Clone( SfxItemPool* /*pPool*/) const { return new XFillBmpSizeLogItem( *this ); } @@ -560,7 +560,7 @@ XFillBmpTileOffsetXItem::XFillBmpTileOffsetXItem( sal_uInt16 nOffX ) : { } -SfxPoolItem* XFillBmpTileOffsetXItem::Clone( SfxItemPool* /*pPool*/) const +XFillBmpTileOffsetXItem* XFillBmpTileOffsetXItem::Clone( SfxItemPool* /*pPool*/) const { return new XFillBmpTileOffsetXItem( *this ); } @@ -583,7 +583,7 @@ XFillBmpTileOffsetYItem::XFillBmpTileOffsetYItem( sal_uInt16 nOffY ) : { } -SfxPoolItem* XFillBmpTileOffsetYItem::Clone( SfxItemPool* /*pPool*/) const +XFillBmpTileOffsetYItem* XFillBmpTileOffsetYItem::Clone( SfxItemPool* /*pPool*/) const { return new XFillBmpTileOffsetYItem( *this ); } @@ -605,7 +605,7 @@ XFillBmpStretchItem::XFillBmpStretchItem( bool bStretch ) : { } -SfxPoolItem* XFillBmpStretchItem::Clone( SfxItemPool* /*pPool*/) const +XFillBmpStretchItem* XFillBmpStretchItem::Clone( SfxItemPool* /*pPool*/) const { return new XFillBmpStretchItem( *this ); } @@ -636,7 +636,7 @@ XFillBmpPosOffsetXItem::XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX ) : { } -SfxPoolItem* XFillBmpPosOffsetXItem::Clone( SfxItemPool* /*pPool*/) const +XFillBmpPosOffsetXItem* XFillBmpPosOffsetXItem::Clone( SfxItemPool* /*pPool*/) const { return new XFillBmpPosOffsetXItem( *this ); } @@ -659,7 +659,7 @@ XFillBmpPosOffsetYItem::XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY ) : { } -SfxPoolItem* XFillBmpPosOffsetYItem::Clone( SfxItemPool* /*pPool*/) const +XFillBmpPosOffsetYItem* XFillBmpPosOffsetYItem::Clone( SfxItemPool* /*pPool*/) const { return new XFillBmpPosOffsetYItem( *this ); } @@ -681,7 +681,7 @@ XFillBackgroundItem::XFillBackgroundItem( bool bFill ) : { } -SfxPoolItem* XFillBackgroundItem::Clone( SfxItemPool* /*pPool*/) const +XFillBackgroundItem* XFillBackgroundItem::Clone( SfxItemPool* /*pPool*/) const { return new XFillBackgroundItem( *this ); } diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 448005de3879..7007e651fe29 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -150,7 +150,7 @@ XFillBitmapItem::XFillBitmapItem(const GraphicObject& rGraphicObject) { } -SfxPoolItem* XFillBitmapItem::Clone(SfxItemPool* /*pPool*/) const +XFillBitmapItem* XFillBitmapItem::Clone(SfxItemPool* /*pPool*/) const { return new XFillBitmapItem(*this); } diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx index 9fa8e7468321..b4d94c5c483f 100644 --- a/sw/inc/ccoll.hxx +++ b/sw/inc/ccoll.hxx @@ -52,7 +52,7 @@ public: SwCondCollItem & operator =(SwCondCollItem const &) = delete; // due to SfxPoolItem SwCondCollItem & operator =(SwCondCollItem &&) = delete; // due to SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwCondCollItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; static const CommandStruct* GetCmds() { return aCmds; } diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx index 3b9de189478f..9c4c8a58281b 100644 --- a/sw/inc/cellatr.hxx +++ b/sw/inc/cellatr.hxx @@ -40,7 +40,7 @@ public: // "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwTableBoxNumFormat* Clone( SfxItemPool* pPool = nullptr ) const override; SwTableBoxNumFormat& operator=( const SwTableBoxNumFormat& rAttr ) { @@ -59,7 +59,7 @@ public: // "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwTableBoxFormula* Clone( SfxItemPool* pPool = nullptr ) const override; const SwModify* GetDefinedIn() const { return m_pDefinedIn; } void ChgDefinedIn( const SwModify* pNew ) @@ -84,7 +84,7 @@ public: // "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwTableBoxValue* Clone( SfxItemPool* pPool = nullptr ) const override; SwTableBoxValue& operator=( const SwTableBoxValue& rCmp ) { diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index bef670ffef5f..acca285590ea 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -50,7 +50,7 @@ public: /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwFormatCharFormat* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx index 6bba4ce42267..d04b2afcd488 100644 --- a/sw/inc/fmtanchr.hxx +++ b/sw/inc/fmtanchr.hxx @@ -52,7 +52,7 @@ public: /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwFormatAnchor* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx index 9d7638b67a44..5773bffd5329 100644 --- a/sw/inc/fmtautofmt.hxx +++ b/sw/inc/fmtautofmt.hxx @@ -35,7 +35,7 @@ public: /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwFormatAutoFormat* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx index 8b6914771fc2..9520f438e5d6 100644 --- a/sw/inc/fmtclbl.hxx +++ b/sw/inc/fmtclbl.hxx @@ -32,7 +32,7 @@ public: : SfxBoolItem( RES_COLUMNBALANCE, bFlag ) {} /// "pure virtual methods" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwFormatNoBalancedColumns* Clone( SfxItemPool *pPool = nullptr ) const override; void dumpAsXml(xmlTextWriterPtr pWriter) const override; }; diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index c300c60d1e54..1828e5f11eac 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -99,7 +99,7 @@ public: /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwFormatCol* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx index 4dcc89b44970..e34299748e55 100644 --- a/sw/inc/fmtcnct.hxx +++ b/sw/inc/fmtcnct.hxx @@ -41,7 +41,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwFormatChain* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx index 655c2ed8d7a3..afb8ce66fc01 100644 --- a/sw/inc/fmtcntnt.hxx +++ b/sw/inc/fmtcntnt.hxx @@ -41,7 +41,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwFormatContent* Clone( SfxItemPool* pPool = nullptr ) const override; const SwNodeIndex *GetContentIdx() const { return m_pStartNode.get(); } void SetNewContentIdx( const SwNodeIndex *pIdx ); diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx index 3f73105a04a0..f3e2d5d6de18 100644 --- a/sw/inc/fmteiro.hxx +++ b/sw/inc/fmteiro.hxx @@ -33,7 +33,7 @@ public: bool bPrt = false ) : SfxBoolItem( nId, bPrt ) {} /// "pure virtual method" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwFormatEditInReadonly* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx index dcda6c11aff7..882e1b328abc 100644 --- a/sw/inc/fmtflcnt.hxx +++ b/sw/inc/fmtflcnt.hxx @@ -40,7 +40,7 @@ public: SwFormatFlyCnt( SwFrameFormat *pFrameFormat ); /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwFormatFlyCnt* Clone( SfxItemPool* pPool = nullptr ) const override; SwFrameFormat *GetFrameFormat() const { return m_pFormat; } /// For Undo: delete the FlyFrameFormat "logically"; it is kept in Undo-object. diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx index 34c7d73aab5d..18d8ffb136f8 100644 --- a/sw/inc/fmtfld.hxx +++ b/sw/inc/fmtfld.hxx @@ -61,7 +61,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwFormatField* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetInfo( SfxPoolItem& rInfo ) const override; diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx index fdb0a5d755ed..01e6da304c4d 100644 --- a/sw/inc/fmtfollowtextflow.hxx +++ b/sw/inc/fmtfollowtextflow.hxx @@ -35,7 +35,7 @@ public: {} /// "pure virtual methods" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwFormatFollowTextFlow* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx index 6c648123b8ae..d9f922a1272f 100644 --- a/sw/inc/fmtfordr.hxx +++ b/sw/inc/fmtfordr.hxx @@ -39,7 +39,7 @@ public: SwFormatFillOrder( SwFillOrder = ATT_TOP_DOWN ); /// "Pure virtual methods" of SfxPoolItem. - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwFormatFillOrder* Clone( SfxItemPool *pPool = nullptr ) const override; virtual sal_uInt16 GetValueCount() const override; }; diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx index e2c1e999468e..2eb3dbf13678 100644 --- a/sw/inc/fmtfsize.hxx +++ b/sw/inc/fmtfsize.hxx @@ -68,7 +68,7 @@ public: SwTwips nWidth = 0, SwTwips nHeight = 0 ); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwFormatFrameSize* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx index de36d8b29e96..57ff12beafb1 100644 --- a/sw/inc/fmtftn.hxx +++ b/sw/inc/fmtftn.hxx @@ -60,7 +60,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwFormatFootnote* Clone( SfxItemPool* pPool = nullptr ) const override; // SwClient virtual void Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew) diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx index b6afeff29cdb..c3783178b714 100644 --- a/sw/inc/fmtftntx.hxx +++ b/sw/inc/fmtftntx.hxx @@ -88,7 +88,7 @@ public: : SwFormatFootnoteEndAtTextEnd( RES_FTN_AT_TXTEND, ePos ) {} - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwFormatFootnoteAtTextEnd* Clone( SfxItemPool *pPool = nullptr ) const override; }; class SW_DLLPUBLIC SwFormatEndAtTextEnd : public SwFormatFootnoteEndAtTextEnd @@ -100,7 +100,7 @@ public: SetNumType( SVX_NUM_ROMAN_LOWER ); } - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwFormatEndAtTextEnd* Clone( SfxItemPool *pPool = nullptr ) const override; }; inline const SwFormatFootnoteAtTextEnd &SwAttrSet::GetFootnoteAtTextEnd(bool bInP) const diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx index 25b338759062..08b4d11c86ad 100644 --- a/sw/inc/fmthdft.hxx +++ b/sw/inc/fmthdft.hxx @@ -44,7 +44,7 @@ public: /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwFormatHeader* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, @@ -75,7 +75,7 @@ public: /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwFormatFooter* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx index 731773f6f2b3..1abc322bbf2a 100644 --- a/sw/inc/fmtinfmt.hxx +++ b/sw/inc/fmtinfmt.hxx @@ -57,7 +57,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwFormatINetFormat* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx index c0589d53ffed..82a444829f77 100644 --- a/sw/inc/fmtline.hxx +++ b/sw/inc/fmtline.hxx @@ -45,7 +45,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwFormatLineNumber* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx index 89670136a5e9..4d473f29b26a 100644 --- a/sw/inc/fmtlsplt.hxx +++ b/sw/inc/fmtlsplt.hxx @@ -32,7 +32,7 @@ public: SwFormatLayoutSplit( bool bSplit = true ) : SfxBoolItem( RES_LAYOUT_SPLIT, bSplit ) {} /// "pure virtual methods" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwFormatLayoutSplit* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx index 498376e0e871..e148d86ccf17 100644 --- a/sw/inc/fmtmeta.hxx +++ b/sw/inc/fmtmeta.hxx @@ -114,7 +114,7 @@ public: /// SfxPoolItem virtual bool operator==( const SfxPoolItem & ) const override; - virtual SfxPoolItem * Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwFormatMeta* Clone( SfxItemPool *pPool = nullptr ) const override; /// notify clients registered at m_pMeta that this meta is being (re-)moved void NotifyChangeTextNode(SwTextNode *const pTextNode); diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx index 24ffdc907e26..0a8ab6f1a619 100644 --- a/sw/inc/fmtornt.hxx +++ b/sw/inc/fmtornt.hxx @@ -42,7 +42,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwFormatVertOrient* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, @@ -75,7 +75,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwFormatHoriOrient* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index 1db805950fed..9b5a59702952 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -50,7 +50,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwFormatPageDesc* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx index a11d7b6e32bd..8e4c732c4674 100644 --- a/sw/inc/fmtrfmrk.hxx +++ b/sw/inc/fmtrfmrk.hxx @@ -53,7 +53,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwFormatRefMark* Clone( SfxItemPool* pPool = nullptr ) const override; // SwClient virtual void Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew) diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx index 735625841dc4..f216aba8766b 100644 --- a/sw/inc/fmtrowsplt.hxx +++ b/sw/inc/fmtrowsplt.hxx @@ -32,7 +32,7 @@ public: SwFormatRowSplit( bool bSplit = true ) : SfxBoolItem( RES_ROW_SPLIT, bSplit ) {} // "pure virtual methods" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwFormatRowSplit* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx index a2b7379531c3..7ac18fef4f83 100644 --- a/sw/inc/fmtruby.hxx +++ b/sw/inc/fmtruby.hxx @@ -45,7 +45,7 @@ public: // "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwFormatRuby* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx index 30bd3f0a2610..e672d84f06eb 100644 --- a/sw/inc/fmtsrnd.hxx +++ b/sw/inc/fmtsrnd.hxx @@ -38,7 +38,7 @@ public: // "Pure virtual Methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwFormatSurround* Clone( SfxItemPool* pPool = nullptr ) const override; virtual sal_uInt16 GetValueCount() const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx index 9f9db75e9e9b..0f14b6dd3648 100644 --- a/sw/inc/fmturl.hxx +++ b/sw/inc/fmturl.hxx @@ -49,7 +49,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwFormatURL* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx index 897e825b14ff..84d3961a3a5d 100644 --- a/sw/inc/fmtwrapinfluenceonobjpos.hxx +++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx @@ -48,7 +48,7 @@ public: /// pure virtual methods of class <SfxPoolItem> virtual bool operator==( const SfxPoolItem& _rAttr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwFormatWrapInfluenceOnObjPos* 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; diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index bb8f41311fb7..f43fd0c1dd3d 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -46,7 +46,7 @@ public: {} // pure virtual methods of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwMirrorGrf* Clone( SfxItemPool *pPool = nullptr ) const override; // pure virtual methods of SfxEnumItem virtual sal_uInt16 GetValueCount() const override; @@ -74,7 +74,7 @@ public: sal_Int32 nTop, sal_Int32 nBottom ); // "pure virtual methods" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwCropGrf* Clone( SfxItemPool *pPool = nullptr ) const override; }; class SAL_DLLPUBLIC_RTTI SwRotationGrf : public SfxUInt16Item @@ -93,7 +93,7 @@ public: SwRotationGrf( sal_Int16 nVal, const Size& rSz ); // pure virtual methods from SfxInt16Item - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwRotationGrf* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, @@ -116,7 +116,7 @@ public: {} // pure virtual methods from SfxInt16Item - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwLuminanceGrf* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, @@ -132,7 +132,7 @@ public: {} // pure virtual methods from SfxInt16Item - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwContrastGrf* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, @@ -162,7 +162,7 @@ public: SwChannelRGrf( sal_Int16 nVal = 0 ) : SwChannelGrf( nVal, RES_GRFATR_CHANNELR ) {} - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwChannelRGrf* Clone( SfxItemPool *pPool = nullptr ) const override; }; class SwChannelGGrf : public SwChannelGrf { @@ -170,7 +170,7 @@ public: SwChannelGGrf( sal_Int16 nVal = 0 ) : SwChannelGrf( nVal, RES_GRFATR_CHANNELG ) {} - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwChannelGGrf* Clone( SfxItemPool *pPool = nullptr ) const override; }; class SwChannelBGrf : public SwChannelGrf { @@ -178,7 +178,7 @@ public: SwChannelBGrf( sal_Int16 nVal = 0 ) : SwChannelGrf( nVal, RES_GRFATR_CHANNELB ) {} - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwChannelBGrf* Clone( SfxItemPool *pPool = nullptr ) const override; }; class SW_DLLPUBLIC SwGammaGrf : public SfxPoolItem @@ -193,7 +193,7 @@ public: {} // pure virtual methods from SfxEnumItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwGammaGrf* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, @@ -217,7 +217,7 @@ public: {} // pure virtual methods from SfxInt16Item - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwInvertGrf* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, @@ -233,7 +233,7 @@ public: {} // pure virtual methods from SfxInt16Item - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwTransparencyGrf* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, @@ -260,7 +260,7 @@ public: {} // pure virtual methods of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwDrawModeGrf* Clone( SfxItemPool *pPool = nullptr ) const override; // pure virtual methods of SfxEnumItem virtual sal_uInt16 GetValueCount() const override; diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx index 136c4fc3e7d7..4b061bd50dde 100644 --- a/sw/inc/hfspacingitem.hxx +++ b/sw/inc/hfspacingitem.hxx @@ -32,7 +32,7 @@ public: bool bPrt = false ) : SfxBoolItem( nId, bPrt ) {} // "pure virtual methods" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwHeaderAndFooterEatSpacingItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx index dded9cc5f089..bb322c4c640a 100644 --- a/sw/inc/hints.hxx +++ b/sw/inc/hints.hxx @@ -42,7 +42,7 @@ public: // "Overhead" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwMsgPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; // SwPtrMsgPoolItem (old SwObjectDying!) diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index a66ec00beebd..7cc18282eed6 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -74,7 +74,7 @@ public: /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwFormatDrop* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, @@ -115,7 +115,7 @@ public: inline SwRegisterItem( const bool bRegister = false ); /// "pure virtual methods" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwRegisterItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, @@ -142,7 +142,7 @@ public: /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwNumRuleItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, @@ -162,7 +162,7 @@ public: inline SwParaConnectBorderItem( const bool bConnect = true ); /// "pure virtual methods" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwParaConnectBorderItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx index 2d87284eb3a6..bf6719833766 100644 --- a/sw/inc/tblafmt.hxx +++ b/sw/inc/tblafmt.hxx @@ -81,8 +81,8 @@ public: const LanguageType& GetNumFormatLanguage() const { return m_eNumFormatLanguage; } // The set-methods. - void SetTextOrientation( const SvxFrameDirectionItem& rNew ) { m_aTextOrientation.reset(static_cast<SvxFrameDirectionItem*>(rNew.Clone())); } - void SetVerticalAlignment( const SwFormatVertOrient& rNew ) { m_aVerticalAlignment.reset(static_cast<SwFormatVertOrient*>(rNew.Clone())); } + void SetTextOrientation( const SvxFrameDirectionItem& rNew ) { m_aTextOrientation.reset(rNew.Clone()); } + void SetVerticalAlignment( const SwFormatVertOrient& rNew ) { m_aVerticalAlignment.reset(rNew.Clone()); } void SetValueFormat( const OUString& rFormat, LanguageType eLng, LanguageType eSys ) { m_sNumFormatString = rFormat; m_eNumFormatLanguage = eLng; m_eSysLanguage = eSys; } @@ -195,9 +195,9 @@ public: const SvxFormatKeepItem& GetKeepWithNextPara() const { return *m_aKeepWithNextPara; } const SvxShadowItem& GetShadow() const { return *m_aShadow; } - void SetBreak(const SvxFormatBreakItem& rNew) { m_aBreak.reset(static_cast<SvxFormatBreakItem*>(rNew.Clone())); } - void SetKeepWithNextPara(const SvxFormatKeepItem& rNew) { m_aKeepWithNextPara.reset(static_cast<SvxFormatKeepItem*>(rNew.Clone())); } - void SetShadow(const SvxShadowItem& rNew) { m_aShadow.reset(static_cast<SvxShadowItem*>(rNew.Clone())); } + void SetBreak(const SvxFormatBreakItem& rNew) { m_aBreak.reset(rNew.Clone()); } + void SetKeepWithNextPara(const SvxFormatKeepItem& rNew) { m_aKeepWithNextPara.reset(rNew.Clone()); } + void SetShadow(const SvxShadowItem& rNew) { m_aShadow.reset(rNew.Clone()); } void SetBoxFormat( const SwBoxAutoFormat& rNew, sal_uInt8 nPos ); const SwBoxAutoFormat& GetBoxFormat( sal_uInt8 nPos ) const; diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx index c44e288cefae..8e4977344f38 100644 --- a/sw/inc/tgrditem.hxx +++ b/sw/inc/tgrditem.hxx @@ -57,7 +57,7 @@ public: // "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwTextGridItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index aecda558fcb5..b6cfb3298360 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -94,7 +94,7 @@ public: // "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual SwTOXMark* Clone( SfxItemPool* pPool = nullptr ) const override; void InvalidateTOXMark(); diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx index f0fa52017d38..908a9d2a5553 100644 --- a/sw/source/core/attr/cellatr.cxx +++ b/sw/source/core/attr/cellatr.cxx @@ -49,7 +49,7 @@ bool SwTableBoxNumFormat::operator==( const SfxPoolItem& rAttr ) const return GetValue() == static_cast<const SwTableBoxNumFormat&>(rAttr).GetValue(); } -SfxPoolItem* SwTableBoxNumFormat::Clone( SfxItemPool* ) const +SwTableBoxNumFormat* SwTableBoxNumFormat::Clone( SfxItemPool* ) const { return new SwTableBoxNumFormat( GetValue() ); } @@ -68,7 +68,7 @@ bool SwTableBoxFormula::operator==( const SfxPoolItem& rAttr ) const m_pDefinedIn == static_cast<const SwTableBoxFormula&>(rAttr).m_pDefinedIn; } -SfxPoolItem* SwTableBoxFormula::Clone( SfxItemPool* ) const +SwTableBoxFormula* SwTableBoxFormula::Clone( SfxItemPool* ) const { // switch to external rendering SwTableBoxFormula* pNew = new SwTableBoxFormula( GetFormula() ); @@ -218,7 +218,7 @@ bool SwTableBoxValue::operator==( const SfxPoolItem& rAttr ) const : ( m_nValue == rOther.m_nValue ); } -SfxPoolItem* SwTableBoxValue::Clone( SfxItemPool* ) const +SwTableBoxValue* SwTableBoxValue::Clone( SfxItemPool* ) const { return new SwTableBoxValue( m_nValue ); } diff --git a/sw/source/core/attr/fmtfollowtextflow.cxx b/sw/source/core/attr/fmtfollowtextflow.cxx index f979fd27d499..8b04869afc5a 100644 --- a/sw/source/core/attr/fmtfollowtextflow.cxx +++ b/sw/source/core/attr/fmtfollowtextflow.cxx @@ -22,7 +22,7 @@ #include <sal/log.hxx> -SfxPoolItem* SwFormatFollowTextFlow::Clone( SfxItemPool * ) const +SwFormatFollowTextFlow* SwFormatFollowTextFlow::Clone( SfxItemPool * ) const { return new SwFormatFollowTextFlow(*this); } diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx index 4182bb90a95a..21ceec2f0e68 100644 --- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx +++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx @@ -47,7 +47,7 @@ bool SwFormatWrapInfluenceOnObjPos::operator==( const SfxPoolItem& rAttr ) const && mnOverlapVertOffset == rAttribute.mnOverlapVertOffset); } -SfxPoolItem* SwFormatWrapInfluenceOnObjPos::Clone( SfxItemPool * ) const +SwFormatWrapInfluenceOnObjPos* SwFormatWrapInfluenceOnObjPos::Clone( SfxItemPool * ) const { return new SwFormatWrapInfluenceOnObjPos(*this); } diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx index 50180ce53eec..f030e78ec9e0 100644 --- a/sw/source/core/attr/format.cxx +++ b/sw/source/core/attr/format.cxx @@ -792,7 +792,7 @@ std::shared_ptr<SvxBrushItem> SwFormat::makeBackgroundBrushItem(bool bInP) const return getSvxBrushItemFromSourceSet(m_aSet, RES_BACKGROUND, bInP); } - return std::shared_ptr<SvxBrushItem>(static_cast<SvxBrushItem*>(m_aSet.GetBackground(bInP).Clone())); + return std::shared_ptr<SvxBrushItem>(m_aSet.GetBackground(bInP).Clone()); } drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwFormat::getSdrAllFillAttributesHelper() const diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx index 1b92d14c4f8d..b8d626e1b45f 100644 --- a/sw/source/core/attr/hints.cxx +++ b/sw/source/core/attr/hints.cxx @@ -143,7 +143,7 @@ bool SwMsgPoolItem::operator==( const SfxPoolItem& ) const return false; } -SfxPoolItem* SwMsgPoolItem::Clone( SfxItemPool* ) const +SwMsgPoolItem* SwMsgPoolItem::Clone( SfxItemPool* ) const { OSL_FAIL( "SwMsgPoolItem knows no Clone" ); return nullptr; diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx index 3fdc20e00271..1b9d524e33a0 100644 --- a/sw/source/core/doc/DocumentStylePoolManager.cxx +++ b/sw/source/core/doc/DocumentStylePoolManager.cxx @@ -1315,7 +1315,7 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId, aLR.SetLeft( GetMetricVal( CM_1 )); aLR.SetRight( GetMetricVal( CM_1 )); aSet.Put( aLR ); - std::unique_ptr<SvxULSpaceItem> aUL(static_cast<SvxULSpaceItem*>(pNewColl->GetULSpace().Clone())); + std::unique_ptr<SvxULSpaceItem> aUL(pNewColl->GetULSpace().Clone()); aUL->SetLower( HTML_PARSPACE ); aSet.Put(std::move(aUL)); } @@ -1330,7 +1330,7 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId, // The lower paragraph distance is set explicitly (makes // assigning hard attributes easier) - std::unique_ptr<SvxULSpaceItem> aULSpaceItem(static_cast<SvxULSpaceItem*>(pNewColl->GetULSpace().Clone())); + std::unique_ptr<SvxULSpaceItem> aULSpaceItem(pNewColl->GetULSpace().Clone()); aULSpaceItem->SetLower( 0 ); aSet.Put(std::move(aULSpaceItem)); } @@ -1350,7 +1350,7 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId, std::unique_ptr<SvxULSpaceItem> aUL; { pNewColl->SetNextTextFormatColl( *GetTextCollFromPool( RES_POOLCOLL_TEXT )); - aUL.reset(static_cast<SvxULSpaceItem*>(pNewColl->GetULSpace().Clone())); + aUL.reset(pNewColl->GetULSpace().Clone()); } aUL->SetLower( HTML_PARSPACE ); aSet.Put(std::move(aUL)); @@ -1362,7 +1362,7 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId, case RES_POOLCOLL_HTML_DD: { - std::unique_ptr<SvxLRSpaceItem> aLR(static_cast<SvxLRSpaceItem*>(pNewColl->GetLRSpace().Clone())); + std::unique_ptr<SvxLRSpaceItem> aLR(pNewColl->GetLRSpace().Clone()); // We indent by 1 cm. The IDs are always 2 away from each other! aLR->SetLeft( GetMetricVal( CM_1 )); aSet.Put(std::move(aLR)); @@ -1373,7 +1373,7 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId, std::unique_ptr<SvxLRSpaceItem> aLR; { pNewColl->SetNextTextFormatColl( *GetTextCollFromPool( RES_POOLCOLL_HTML_DD )); - aLR.reset(static_cast<SvxLRSpaceItem*>(pNewColl->GetLRSpace().Clone())); + aLR.reset(pNewColl->GetLRSpace().Clone()); } // We indent by 0 cm. The IDs are always 2 away from each other! aLR->SetLeft( 0 ); diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index ad864f3ae15c..4ff478498dcc 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -767,7 +767,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTextFormatColls *const pTextFormatCollTable, pNewSet->Put( pOldFormat->GetAnchor() ); // The new one should be changeable in its height. - std::unique_ptr<SwFormatFrameSize> aFrameSize(static_cast<SwFormatFrameSize*>(pOldFormat->GetFrameSize().Clone())); + std::unique_ptr<SwFormatFrameSize> aFrameSize(pOldFormat->GetFrameSize().Clone()); aFrameSize->SetHeightSizeType( SwFrameSize::Minimum ); pNewSet->Put( std::move(aFrameSize) ); @@ -816,7 +816,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTextFormatColls *const pTextFormatCollTable, pNewSet->Put( SwFormatVertOrient( 0, eVert ) ); pNewSet->Put( SwFormatHoriOrient( 0, text::HoriOrientation::CENTER ) ); - aFrameSize.reset(static_cast<SwFormatFrameSize*>(pOldFormat->GetFrameSize().Clone())); + aFrameSize.reset(pOldFormat->GetFrameSize().Clone()); SwOLENode* pOleNode = rDoc.GetNodes()[nNdIdx + 1]->GetOLENode(); bool isMath = false; diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index d0ec125537e6..ae7c3e6fadbb 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -266,8 +266,8 @@ SwBoxAutoFormat::SwBoxAutoFormat() SwBoxAutoFormat::SwBoxAutoFormat( const SwBoxAutoFormat& rNew ) : AutoFormatBase(rNew), - m_aTextOrientation(static_cast<SvxFrameDirectionItem*>(rNew.m_aTextOrientation->Clone())), - m_aVerticalAlignment(static_cast<SwFormatVertOrient*>(rNew.m_aVerticalAlignment->Clone())), + m_aTextOrientation(rNew.m_aTextOrientation->Clone()), + m_aVerticalAlignment(rNew.m_aVerticalAlignment->Clone()), m_sNumFormatString( rNew.m_sNumFormatString ), m_eSysLanguage( rNew.m_eSysLanguage ), m_eNumFormatLanguage( rNew.m_eNumFormatLanguage ), @@ -421,14 +421,14 @@ SwTableAutoFormat& SwTableAutoFormat::operator=( const SwTableAutoFormat& rNew ) m_bInclValueFormat = rNew.m_bInclValueFormat; m_bInclWidthHeight = rNew.m_bInclWidthHeight; - m_aBreak.reset(static_cast<SvxFormatBreakItem*>(rNew.m_aBreak->Clone())); + m_aBreak.reset(rNew.m_aBreak->Clone()); m_aPageDesc = rNew.m_aPageDesc; - m_aKeepWithNextPara.reset(static_cast<SvxFormatKeepItem*>(rNew.m_aKeepWithNextPara->Clone())); + m_aKeepWithNextPara.reset(rNew.m_aKeepWithNextPara->Clone()); m_aRepeatHeading = rNew.m_aRepeatHeading; m_bLayoutSplit = rNew.m_bLayoutSplit; m_bRowSplit = rNew.m_bRowSplit; m_bCollapsingBorders = rNew.m_bCollapsingBorders; - m_aShadow.reset(static_cast<SvxShadowItem*>(rNew.m_aShadow->Clone())); + m_aShadow.reset(rNew.m_aShadow->Clone()); m_bHidden = rNew.m_bHidden; m_bUserDefined = rNew.m_bUserDefined; @@ -716,15 +716,15 @@ void SwTableAutoFormat::StoreTableProperties(const SwTable &table) const SfxItemSet &rSet = pFormat->GetAttrSet(); - m_aBreak.reset(static_cast<SvxFormatBreakItem*>(rSet.Get(RES_BREAK).Clone())); + m_aBreak.reset(rSet.Get(RES_BREAK).Clone()); m_aPageDesc = rSet.Get(RES_PAGEDESC); const SwFormatLayoutSplit &layoutSplit = rSet.Get(RES_LAYOUT_SPLIT); m_bLayoutSplit = layoutSplit.GetValue(); m_bCollapsingBorders = rSet.Get(RES_COLLAPSING_BORDERS).GetValue(); - m_aKeepWithNextPara.reset(static_cast<SvxFormatKeepItem*>(rSet.Get(RES_KEEP).Clone())); + m_aKeepWithNextPara.reset(rSet.Get(RES_KEEP).Clone()); m_aRepeatHeading = table.GetRowsToRepeat(); - m_aShadow.reset(static_cast<SvxShadowItem*>(rSet.Get(RES_SHADOW).Clone())); + m_aShadow.reset(rSet.Get(RES_SHADOW).Clone()); } bool SwTableAutoFormat::FirstRowEndColumnIsRow() diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index 0ff6475968cc..d075c7015c55 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -1834,7 +1834,7 @@ static void lcl_CopyBoxToDoc(FndBox_ const& rFndBox, CpyPara *const pCpyPara) if(!DoCopyIt) { aFindFrame = pCpyPara->rTabFrameArr[ nFndPos ]; - aFrameSz.reset(static_cast<SwFormatFrameSize*>(aFindFrame.pNewFrameFormat->GetFrameSize().Clone())); + aFrameSz.reset(aFindFrame.pNewFrameFormat->GetFrameSize().Clone()); DoCopyIt = aFrameSz->GetWidth() != static_cast<SwTwips>(nSize); } diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx index 8fe8c6d0f5c6..05ca3c0b8133 100644 --- a/sw/source/core/docnode/ndtbl1.cxx +++ b/sw/source/core/docnode/ndtbl1.cxx @@ -884,11 +884,11 @@ void SwDoc::SetTabLineStyle( const SwCursor& rCursor, const_cast<SwTableBox*>(pCell->GetTabBox())->ClaimFrameFormat(); SwFrameFormat *pFormat = pCell->GetFormat(); - std::shared_ptr<SvxBoxItem> aBox(static_cast<SvxBoxItem*>(pFormat->GetBox().Clone())); + std::shared_ptr<SvxBoxItem> aBox(pFormat->GetBox().Clone()); if ( !pBorderLine && bSetLine ) { - aBox.reset(static_cast<SvxBoxItem*>(::GetDfltAttr(RES_BOX)->Clone())); + aBox.reset(::GetDfltAttr(RES_BOX)->Clone()); } else { diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx index e82f7e5a3f74..a8e2e63c7dcb 100644 --- a/sw/source/core/graphic/grfatr.cxx +++ b/sw/source/core/graphic/grfatr.cxx @@ -28,8 +28,7 @@ using namespace ::com::sun::star; - -SfxPoolItem* SwMirrorGrf::Clone( SfxItemPool* ) const +SwMirrorGrf* SwMirrorGrf::Clone( SfxItemPool* ) const { return new SwMirrorGrf( *this ); } @@ -141,7 +140,7 @@ SwCropGrf::SwCropGrf(sal_Int32 nL, sal_Int32 nR, sal_Int32 nT, sal_Int32 nB ) : SvxGrfCrop( nL, nR, nT, nB, RES_GRFATR_CROPGRF ) {} -SfxPoolItem* SwCropGrf::Clone( SfxItemPool* ) const +SwCropGrf* SwCropGrf::Clone( SfxItemPool* ) const { return new SwCropGrf( *this ); } @@ -171,7 +170,7 @@ SwRotationGrf::SwRotationGrf( sal_Int16 nVal, const Size& rSz ) { } -SfxPoolItem* SwRotationGrf::Clone( SfxItemPool * ) const +SwRotationGrf* SwRotationGrf::Clone( SfxItemPool * ) const { return new SwRotationGrf( *this ); } @@ -209,32 +208,32 @@ bool SwRotationGrf::PutValue( const uno::Any& rVal, sal_uInt8 ) // Sw___Grf::Clone(..) -SfxPoolItem* SwLuminanceGrf::Clone( SfxItemPool * ) const +SwLuminanceGrf* SwLuminanceGrf::Clone( SfxItemPool * ) const { return new SwLuminanceGrf( *this ); } -SfxPoolItem* SwContrastGrf::Clone( SfxItemPool * ) const +SwContrastGrf* SwContrastGrf::Clone( SfxItemPool * ) const { return new SwContrastGrf( *this ); } -SfxPoolItem* SwChannelRGrf::Clone( SfxItemPool * ) const +SwChannelRGrf* SwChannelRGrf::Clone( SfxItemPool * ) const { return new SwChannelRGrf( *this ); } -SfxPoolItem* SwChannelGGrf::Clone( SfxItemPool * ) const +SwChannelGGrf* SwChannelGGrf::Clone( SfxItemPool * ) const { return new SwChannelGGrf( *this ); } -SfxPoolItem* SwChannelBGrf::Clone( SfxItemPool * ) const +SwChannelBGrf* SwChannelBGrf::Clone( SfxItemPool * ) const { return new SwChannelBGrf( *this ); } -SfxPoolItem* SwGammaGrf::Clone( SfxItemPool * ) const +SwGammaGrf* SwGammaGrf::Clone( SfxItemPool * ) const { return new SwGammaGrf( *this ); } @@ -260,12 +259,12 @@ bool SwGammaGrf::PutValue( const uno::Any& rVal, sal_uInt8 ) // Sw___Grf::Clone(..) cont'd -SfxPoolItem* SwInvertGrf::Clone( SfxItemPool * ) const +SwInvertGrf* SwInvertGrf::Clone( SfxItemPool * ) const { return new SwInvertGrf( *this ); } -SfxPoolItem* SwTransparencyGrf::Clone( SfxItemPool * ) const +SwTransparencyGrf* SwTransparencyGrf::Clone( SfxItemPool * ) const { return new SwTransparencyGrf( *this ); } @@ -304,7 +303,7 @@ bool SwTransparencyGrf::PutValue( const uno::Any& rVal, // Sw___Grf::Clone(..) cont'd -SfxPoolItem* SwDrawModeGrf::Clone( SfxItemPool * ) const +SwDrawModeGrf* SwDrawModeGrf::Clone( SfxItemPool * ) const { return new SwDrawModeGrf( *this ); } diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 3ee1be7590e3..09f0974d22d1 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -210,7 +210,7 @@ bool SwFormatFrameSize::operator==( const SfxPoolItem& rAttr ) const m_eHeightPercentRelation == static_cast<const SwFormatFrameSize&>(rAttr).GetHeightPercentRelation() ); } -SfxPoolItem* SwFormatFrameSize::Clone( SfxItemPool* ) const +SwFormatFrameSize* SwFormatFrameSize::Clone( SfxItemPool* ) const { return new SwFormatFrameSize( *this ); } @@ -433,7 +433,8 @@ void SwFormatFrameSize::dumpAsXml(xmlTextWriterPtr pWriter) const SwFormatFillOrder::SwFormatFillOrder( SwFillOrder nFO ) : SfxEnumItem( RES_FILL_ORDER, nFO ) {} -SfxPoolItem* SwFormatFillOrder::Clone( SfxItemPool* ) const + +SwFormatFillOrder* SwFormatFillOrder::Clone( SfxItemPool* ) const { return new SwFormatFillOrder( GetValue() ); } @@ -478,7 +479,7 @@ bool SwFormatHeader::operator==( const SfxPoolItem& rAttr ) const m_bActive == static_cast<const SwFormatHeader&>(rAttr).IsActive() ); } -SfxPoolItem* SwFormatHeader::Clone( SfxItemPool* ) const +SwFormatHeader* SwFormatHeader::Clone( SfxItemPool* ) const { return new SwFormatHeader( *this ); } @@ -528,7 +529,7 @@ bool SwFormatFooter::operator==( const SfxPoolItem& rAttr ) const m_bActive == static_cast<const SwFormatFooter&>(rAttr).IsActive() ); } -SfxPoolItem* SwFormatFooter::Clone( SfxItemPool* ) const +SwFormatFooter* SwFormatFooter::Clone( SfxItemPool* ) const { return new SwFormatFooter( *this ); } @@ -566,7 +567,7 @@ bool SwFormatContent::operator==( const SfxPoolItem& rAttr ) const return true; } -SfxPoolItem* SwFormatContent::Clone( SfxItemPool* ) const +SwFormatContent* SwFormatContent::Clone( SfxItemPool* ) const { return new SwFormatContent( *this ); } @@ -623,7 +624,7 @@ bool SwFormatPageDesc::operator==( const SfxPoolItem& rAttr ) const ( GetPageDesc() == static_cast<const SwFormatPageDesc&>(rAttr).GetPageDesc() ); } -SfxPoolItem* SwFormatPageDesc::Clone( SfxItemPool* ) const +SwFormatPageDesc* SwFormatPageDesc::Clone( SfxItemPool* ) const { return new SwFormatPageDesc( *this ); } @@ -885,7 +886,7 @@ bool SwFormatCol::operator==( const SfxPoolItem& rAttr ) const return true; } -SfxPoolItem* SwFormatCol::Clone( SfxItemPool* ) const +SwFormatCol* SwFormatCol::Clone( SfxItemPool* ) const { return new SwFormatCol( *this ); } @@ -1166,7 +1167,7 @@ bool SwFormatSurround::operator==( const SfxPoolItem& rAttr ) const m_bOutside== static_cast<const SwFormatSurround&>(rAttr).m_bOutside ); } -SfxPoolItem* SwFormatSurround::Clone( SfxItemPool* ) const +SwFormatSurround* SwFormatSurround::Clone( SfxItemPool* ) const { return new SwFormatSurround( *this ); } @@ -1272,7 +1273,7 @@ bool SwFormatVertOrient::operator==( const SfxPoolItem& rAttr ) const m_eRelation == static_cast<const SwFormatVertOrient&>(rAttr).m_eRelation ); } -SfxPoolItem* SwFormatVertOrient::Clone( SfxItemPool* ) const +SwFormatVertOrient* SwFormatVertOrient::Clone( SfxItemPool* ) const { return new SwFormatVertOrient( *this ); } @@ -1366,7 +1367,7 @@ bool SwFormatHoriOrient::operator==( const SfxPoolItem& rAttr ) const m_bPosToggle == static_cast<const SwFormatHoriOrient&>(rAttr).m_bPosToggle ); } -SfxPoolItem* SwFormatHoriOrient::Clone( SfxItemPool* ) const +SwFormatHoriOrient* SwFormatHoriOrient::Clone( SfxItemPool* ) const { return new SwFormatHoriOrient( *this ); } @@ -1521,7 +1522,7 @@ bool SwFormatAnchor::operator==( const SfxPoolItem& rAttr ) const (*m_pContentAnchor == *rFormatAnchor.GetContentAnchor())))); } -SfxPoolItem* SwFormatAnchor::Clone( SfxItemPool* ) const +SwFormatAnchor* SwFormatAnchor::Clone( SfxItemPool* ) const { return new SwFormatAnchor( *this ); } @@ -1718,7 +1719,7 @@ bool SwFormatURL::operator==( const SfxPoolItem &rAttr ) const return bRet; } -SfxPoolItem* SwFormatURL::Clone( SfxItemPool* ) const +SwFormatURL* SwFormatURL::Clone( SfxItemPool* ) const { return new SwFormatURL( *this ); } @@ -1829,22 +1830,22 @@ bool SwFormatURL::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } -SfxPoolItem* SwFormatEditInReadonly::Clone( SfxItemPool* ) const +SwFormatEditInReadonly* SwFormatEditInReadonly::Clone( SfxItemPool* ) const { return new SwFormatEditInReadonly( *this ); } -SfxPoolItem* SwFormatLayoutSplit::Clone( SfxItemPool* ) const +SwFormatLayoutSplit* SwFormatLayoutSplit::Clone( SfxItemPool* ) const { return new SwFormatLayoutSplit( *this ); } -SfxPoolItem* SwFormatRowSplit::Clone( SfxItemPool* ) const +SwFormatRowSplit* SwFormatRowSplit::Clone( SfxItemPool* ) const { return new SwFormatRowSplit( *this ); } -SfxPoolItem* SwFormatNoBalancedColumns::Clone( SfxItemPool* ) const +SwFormatNoBalancedColumns* SwFormatNoBalancedColumns::Clone( SfxItemPool* ) const { return new SwFormatNoBalancedColumns( *this ); } @@ -1983,14 +1984,14 @@ bool SwFormatFootnoteEndAtTextEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMe // class SwFormatFootnoteAtTextEnd -SfxPoolItem* SwFormatFootnoteAtTextEnd::Clone( SfxItemPool* ) const +SwFormatFootnoteAtTextEnd* SwFormatFootnoteAtTextEnd::Clone( SfxItemPool* ) const { return new SwFormatFootnoteAtTextEnd(*this); } // class SwFormatEndAtTextEnd -SfxPoolItem* SwFormatEndAtTextEnd::Clone( SfxItemPool* ) const +SwFormatEndAtTextEnd* SwFormatEndAtTextEnd::Clone( SfxItemPool* ) const { return new SwFormatEndAtTextEnd(*this); } @@ -2012,7 +2013,7 @@ SwFormatChain::SwFormatChain( const SwFormatChain &rCpy ) : SetNext( rCpy.GetNext() ); } -SfxPoolItem* SwFormatChain::Clone( SfxItemPool* ) const +SwFormatChain* SwFormatChain::Clone( SfxItemPool* ) const { SwFormatChain *pRet = new SwFormatChain; pRet->SetPrev( GetPrev() ); @@ -2079,7 +2080,7 @@ bool SwFormatLineNumber::operator==( const SfxPoolItem &rAttr ) const m_bCountLines == static_cast<const SwFormatLineNumber&>(rAttr).IsCount(); } -SfxPoolItem* SwFormatLineNumber::Clone( SfxItemPool* ) const +SwFormatLineNumber* SwFormatLineNumber::Clone( SfxItemPool* ) const { return new SwFormatLineNumber( *this ); } @@ -2159,7 +2160,7 @@ bool SwTextGridItem::operator==( const SfxPoolItem& rAttr ) const && m_bSquaredMode == rOther.GetSquaredMode(); } -SfxPoolItem* SwTextGridItem::Clone( SfxItemPool* ) const +SwTextGridItem* SwTextGridItem::Clone( SfxItemPool* ) const { return new SwTextGridItem( *this ); } @@ -2399,12 +2400,11 @@ void SwTextGridItem::Init() } } -SfxPoolItem* SwHeaderAndFooterEatSpacingItem::Clone( SfxItemPool* ) const +SwHeaderAndFooterEatSpacingItem* SwHeaderAndFooterEatSpacingItem::Clone( SfxItemPool* ) const { return new SwHeaderAndFooterEatSpacingItem( Which(), GetValue() ); } - SwFrameFormat::SwFrameFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 862db2c8a211..b8798af8a835 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -2043,7 +2043,7 @@ SwBorderAttrs::SwBorderAttrs(const SwModify *pMod, const SwFrame *pConstructor) , m_rUL(m_rAttrSet.GetULSpace()) // #i96772# // LRSpaceItem is copied due to the possibility that it is adjusted - see below - , m_rLR(static_cast<SvxLRSpaceItem*>(m_rAttrSet.GetLRSpace().Clone())) + , m_rLR(m_rAttrSet.GetLRSpace().Clone()) , m_rBox(m_rAttrSet.GetBox()) , m_rShadow(m_rAttrSet.GetShadow()) , m_aFrameSize(m_rAttrSet.GetFrameSize().GetSize()) diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx index 6c1853e01476..e12a7180585c 100644 --- a/sw/source/core/para/paratr.cxx +++ b/sw/source/core/para/paratr.cxx @@ -101,7 +101,7 @@ bool SwFormatDrop::operator==( const SfxPoolItem& rAttr ) const m_pDefinedIn == static_cast<const SwFormatDrop&>(rAttr).m_pDefinedIn ); } -SfxPoolItem* SwFormatDrop::Clone( SfxItemPool* ) const +SwFormatDrop* SwFormatDrop::Clone( SfxItemPool* ) const { return new SwFormatDrop( *this ); } @@ -188,15 +188,16 @@ bool SwFormatDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return true; } -SfxPoolItem* SwRegisterItem::Clone( SfxItemPool * ) const +SwRegisterItem* SwRegisterItem::Clone( SfxItemPool * ) const { return new SwRegisterItem( *this ); } -SfxPoolItem* SwNumRuleItem::Clone( SfxItemPool * ) const +SwNumRuleItem* SwNumRuleItem::Clone( SfxItemPool * ) const { return new SwNumRuleItem( *this ); } + bool SwNumRuleItem::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); @@ -227,7 +228,7 @@ void SwNumRuleItem::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterEndElement(pWriter); } -SfxPoolItem* SwParaConnectBorderItem::Clone( SfxItemPool * ) const +SwParaConnectBorderItem* SwParaConnectBorderItem::Clone( SfxItemPool * ) const { return new SwParaConnectBorderItem( *this ); } diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index a6e69a82e64c..2b8bd65a446a 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -768,7 +768,7 @@ SwGrfNumPortion::SwGrfNumPortion( m_bReplace = false; if( pGrfBrush ) { - pBrush.reset(static_cast<SvxBrushItem*>(pGrfBrush->Clone())); + pBrush.reset(pGrfBrush->Clone()); const Graphic* pGraph = pGrfBrush->GetGraphic(referer); if( pGraph ) SetAnimated( pGraph->IsAnimated() ); diff --git a/sw/source/core/tox/ToxTextGenerator.cxx b/sw/source/core/tox/ToxTextGenerator.cxx index 9a92776160eb..d5795458ca8f 100644 --- a/sw/source/core/tox/ToxTextGenerator.cxx +++ b/sw/source/core/tox/ToxTextGenerator.cxx @@ -330,8 +330,7 @@ void ToxTextGenerator::GetAttributesForNode( sal_Int32 const nEnd(aConversionMap.ConvertToViewPosition(pHint->GetAnyEnd())); if (nStart != nEnd) // might be in delete redline, and useless anyway { - std::unique_ptr<SwFormatAutoFormat> pClone( - static_cast<SwFormatAutoFormat*>(pHint->GetAutoFormat().Clone())); + std::unique_ptr<SwFormatAutoFormat> pClone(pHint->GetAutoFormat().Clone()); pClone->SetStyleHandle(attributesToClone); rResult.autoFormats.push_back(std::move(pClone)); // note the rStripper is on the whole merged text, so need rOffset diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index 24c5675fd5c4..7857b2eaa2c5 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -141,7 +141,7 @@ bool SwTOXMark::operator==( const SfxPoolItem& rAttr ) const return GetRegisteredIn() == static_cast<const SwTOXMark&>(rAttr).GetRegisteredIn(); } -SfxPoolItem* SwTOXMark::Clone( SfxItemPool* ) const +SwTOXMark* SwTOXMark::Clone( SfxItemPool* ) const { return new SwTOXMark( *this ); } diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx index a0f1b83f2cfc..c7587c328a85 100644 --- a/sw/source/core/txtnode/atrfld.cxx +++ b/sw/source/core/txtnode/atrfld.cxx @@ -208,7 +208,7 @@ bool SwFormatField::operator==( const SfxPoolItem& rAttr ) const ( !mpField && !static_cast<const SwFormatField&>(rAttr).mpField ); } -SfxPoolItem* SwFormatField::Clone( SfxItemPool* ) const +SwFormatField* SwFormatField::Clone( SfxItemPool* ) const { return new SwFormatField( *this ); } diff --git a/sw/source/core/txtnode/atrflyin.cxx b/sw/source/core/txtnode/atrflyin.cxx index 3fcb11019402..3fc62f51a368 100644 --- a/sw/source/core/txtnode/atrflyin.cxx +++ b/sw/source/core/txtnode/atrflyin.cxx @@ -49,7 +49,7 @@ bool SwFormatFlyCnt::operator==( const SfxPoolItem& rAttr ) const m_pFormat == static_cast<const SwFormatFlyCnt&>(rAttr).GetFrameFormat() ); } -SfxPoolItem* SwFormatFlyCnt::Clone( SfxItemPool* ) const +SwFormatFlyCnt* SwFormatFlyCnt::Clone( SfxItemPool* ) const { return new SwFormatFlyCnt( m_pFormat ); } diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx index 548ef6131e7c..a3f0332cb654 100644 --- a/sw/source/core/txtnode/atrftn.cxx +++ b/sw/source/core/txtnode/atrftn.cxx @@ -139,7 +139,7 @@ bool SwFormatFootnote::operator==( const SfxPoolItem& rAttr ) const m_bEndNote == static_cast<const SwFormatFootnote&>(rAttr).m_bEndNote; } -SfxPoolItem* SwFormatFootnote::Clone( SfxItemPool* ) const +SwFormatFootnote* SwFormatFootnote::Clone( SfxItemPool* ) const { SwFormatFootnote* pNew = new SwFormatFootnote; pNew->m_aNumber = m_aNumber; diff --git a/sw/source/core/txtnode/atrref.cxx b/sw/source/core/txtnode/atrref.cxx index d9078b5e5f98..88292c8a2f7d 100644 --- a/sw/source/core/txtnode/atrref.cxx +++ b/sw/source/core/txtnode/atrref.cxx @@ -50,7 +50,7 @@ bool SwFormatRefMark::operator==( const SfxPoolItem& rAttr ) const return m_aRefName == static_cast<const SwFormatRefMark&>(rAttr).m_aRefName; } -SfxPoolItem* SwFormatRefMark::Clone( SfxItemPool* ) const +SwFormatRefMark* SwFormatRefMark::Clone( SfxItemPool* ) const { return new SwFormatRefMark( *this ); } diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index 31a64a9ed5cd..77ee06fcd7d7 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -78,7 +78,7 @@ bool SwFormatCharFormat::operator==( const SfxPoolItem& rAttr ) const return GetCharFormat() == static_cast<const SwFormatCharFormat&>(rAttr).GetCharFormat(); } -SfxPoolItem* SwFormatCharFormat::Clone( SfxItemPool* ) const +SwFormatCharFormat* SwFormatCharFormat::Clone( SfxItemPool* ) const { return new SwFormatCharFormat( *this ); } @@ -120,7 +120,7 @@ bool SwFormatAutoFormat::operator==( const SfxPoolItem& rAttr ) const return mpHandle == static_cast<const SwFormatAutoFormat&>(rAttr).mpHandle; } -SfxPoolItem* SwFormatAutoFormat::Clone( SfxItemPool* ) const +SwFormatAutoFormat* SwFormatAutoFormat::Clone( SfxItemPool* ) const { return new SwFormatAutoFormat( *this ); } @@ -220,7 +220,7 @@ bool SwFormatINetFormat::operator==( const SfxPoolItem& rAttr ) const return rOwn == rOther; } -SfxPoolItem* SwFormatINetFormat::Clone( SfxItemPool* ) const +SwFormatINetFormat* SwFormatINetFormat::Clone( SfxItemPool* ) const { return new SwFormatINetFormat( *this ); } @@ -430,7 +430,7 @@ bool SwFormatRuby::operator==( const SfxPoolItem& rAttr ) const m_eAdjustment == static_cast<const SwFormatRuby&>(rAttr).m_eAdjustment; } -SfxPoolItem* SwFormatRuby::Clone( SfxItemPool* ) const +SwFormatRuby* SwFormatRuby::Clone( SfxItemPool* ) const { return new SwFormatRuby( *this ); } @@ -561,7 +561,7 @@ bool SwFormatMeta::operator==( const SfxPoolItem & i_rOther ) const && m_pMeta == static_cast<SwFormatMeta const &>( i_rOther ).m_pMeta; } -SfxPoolItem * SwFormatMeta::Clone( SfxItemPool * /*pPool*/ ) const +SwFormatMeta* SwFormatMeta::Clone( SfxItemPool * /*pPool*/ ) const { // if this is indeed a copy, then DoCopy must be called later! return m_pMeta // #i105148# pool default may be cloned also! diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx index 0401f3b4be17..d2c584884ac6 100644 --- a/sw/source/core/undo/unattr.cxx +++ b/sw/source/core/undo/unattr.cxx @@ -871,8 +871,7 @@ void SwUndoDefaultAttr::UndoImpl(::sw::UndoRedoContext & rContext) } if (m_pTabStop) { - std::unique_ptr<SvxTabStopItem> pOld(static_cast<SvxTabStopItem*>( - rDoc.GetDefault( RES_PARATR_TABSTOP ).Clone() )); + std::unique_ptr<SvxTabStopItem> pOld(rDoc.GetDefault(RES_PARATR_TABSTOP).Clone()); rDoc.SetDefault( *m_pTabStop ); m_pTabStop = std::move( pOld ); } diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 743ba6b7fb9e..f37db815f23f 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -1748,7 +1748,7 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any& { const SwAttrSet& rSet = pFormat->GetAttrSet(); const std::shared_ptr<SvxBrushItem> aOriginalBrushItem(getSvxBrushItemFromSourceSet(rSet, RES_BACKGROUND, true, pDoc->IsInXMLImport())); - std::shared_ptr<SvxBrushItem> aChangedBrushItem(static_cast<SvxBrushItem*>(aOriginalBrushItem->Clone())); + std::shared_ptr<SvxBrushItem> aChangedBrushItem(aOriginalBrushItem->Clone()); aChangedBrushItem->PutValue(aValue, nMemberId); @@ -2756,7 +2756,7 @@ void SwXFrame::attachToRange(uno::Reference<text::XTextRange> const& xTextRange, // to prevent conflicts if the to-be-anchored position is part of the to-be-copied text if (eAnchorId != RndStdIds::FLY_AT_PAGE) { - pAnchorItem.reset(static_cast<SwFormatAnchor*>(aFrameSet.Get(RES_ANCHOR).Clone())); + pAnchorItem.reset(aFrameSet.Get(RES_ANCHOR).Clone()); aFrameSet.Put( SwFormatAnchor( RndStdIds::FLY_AT_PAGE, 1 )); } diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 9b202ea03ae2..b7658b949927 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -1982,7 +1982,7 @@ void SwXNumberingRules::SetPropertiesToNumFormat( if(!pSetVOrient) { if(aFormat.GetGraphicOrientation()) - pSetVOrient.reset( static_cast<SwFormatVertOrient*>(aFormat.GetGraphicOrientation()->Clone()) ); + pSetVOrient.reset(aFormat.GetGraphicOrientation()->Clone()); else pSetVOrient.reset(new SwFormatVertOrient); } diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index e2c8459da312..011cd2dabf2f 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -1660,7 +1660,7 @@ void SwXStyle::SetPropertyValue<sal_uInt16(RES_BACKGROUND)>(const SfxItemPropert { SfxItemSet& rStyleSet = o_rStyleBase.GetItemSet(); const std::shared_ptr<SvxBrushItem> aOriginalBrushItem(getSvxBrushItemFromSourceSet(rStyleSet, RES_BACKGROUND, true, m_pDoc->IsInXMLImport())); - std::shared_ptr<SvxBrushItem> aChangedBrushItem(static_cast<SvxBrushItem*>(aOriginalBrushItem->Clone())); + std::shared_ptr<SvxBrushItem> aChangedBrushItem(aOriginalBrushItem->Clone()); uno::Any aValue(rValue); const auto nMemberId(lcl_TranslateMetric(rEntry, m_pDoc, aValue)); @@ -2713,7 +2713,7 @@ void SAL_CALL SwXStyle::setAllPropertiesToDefault() } else { - aFrameSz.reset(static_cast<SwFormatFrameSize*>(pStdPgDsc->GetMaster().GetFrameSize().Clone())); + aFrameSz.reset(pStdPgDsc->GetMaster().GetFrameSize().Clone()); } if(pStdPgDsc->GetLandscape()) @@ -2823,7 +2823,7 @@ SwXPageStyle::SwXPageStyle(SwDocShell* pDocSh) void SwXStyle::PutItemToSet(const SvxSetItem* pSetItem, const SfxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry& rEntry, const uno::Any& rVal, SwStyleBase_Impl& rBaseImpl) { // create a new SvxSetItem and get it's ItemSet as new target - const std::unique_ptr<SvxSetItem> pNewSetItem(static_cast<SvxSetItem*>(pSetItem->Clone())); + const std::unique_ptr<SvxSetItem> pNewSetItem(pSetItem->Clone()); SfxItemSet& rSetSet = pNewSetItem->GetItemSet(); // set parent to ItemSet to ensure XFILL_NONE as XFillStyleItem @@ -2972,7 +2972,7 @@ void SwXPageStyle::SetPropertyValues_Impl(const uno::Sequence<OUString>& rProper if(SfxItemState::SET == aBaseImpl.GetItemSet().GetItemState(bFooter ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET, false, reinterpret_cast<const SfxPoolItem**>(&pSetItem))) { // create a new SvxSetItem and get it's ItemSet as new target - std::unique_ptr<SvxSetItem> pNewSetItem(static_cast<SvxSetItem*>(pSetItem->Clone())); + std::unique_ptr<SvxSetItem> pNewSetItem(pSetItem->Clone()); SfxItemSet& rSetSet = pNewSetItem->GetItemSet(); // set parent to ItemSet to ensure XFILL_NONE as XFillStyleItem @@ -3653,7 +3653,7 @@ uno::Reference< style::XAutoStyle > SwXAutoStyleFamily::insertStyle( case RES_BACKGROUND: { const std::shared_ptr<SvxBrushItem> aOriginalBrushItem(getSvxBrushItemFromSourceSet(aSet, RES_BACKGROUND, true, m_pDocShell->GetDoc()->IsInXMLImport())); - std::shared_ptr<SvxBrushItem> aChangedBrushItem(static_cast<SvxBrushItem*>(aOriginalBrushItem->Clone())); + std::shared_ptr<SvxBrushItem> aChangedBrushItem(aOriginalBrushItem->Clone()); aChangedBrushItem->PutValue(aValue, nMemberId); diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 3844f4de8fd3..a8615e109a03 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -1985,10 +1985,10 @@ void SwTableProperties_Impl::ApplyTableAttr(const SwTable& rTable, SwDoc& rDoc) } if(bPutBreak) - AddItemToSet<std::shared_ptr<SvxFormatBreakItem>>(aSet, [&rFrameFormat]() { return std::shared_ptr<SvxFormatBreakItem>(static_cast<SvxFormatBreakItem*>(rFrameFormat.GetBreak().Clone())); }, RES_BREAK, {0}); - AddItemToSet<std::shared_ptr<SvxShadowItem>>(aSet, [&rFrameFormat]() { return std::shared_ptr<SvxShadowItem>(static_cast<SvxShadowItem*>(rFrameFormat.GetShadow().Clone())); }, RES_SHADOW, {0}, true); - AddItemToSet<std::shared_ptr<SvxFormatKeepItem>>(aSet, [&rFrameFormat]() { return std::shared_ptr<SvxFormatKeepItem>(static_cast<SvxFormatKeepItem*>(rFrameFormat.GetKeep().Clone())); }, RES_KEEP, {0}); - AddItemToSet<std::shared_ptr<SwFormatHoriOrient>>(aSet, [&rFrameFormat]() { return std::shared_ptr<SwFormatHoriOrient>(static_cast<SwFormatHoriOrient*>(rFrameFormat.GetHoriOrient().Clone())); }, RES_HORI_ORIENT, {MID_HORIORIENT_ORIENT}, true); + AddItemToSet<std::shared_ptr<SvxFormatBreakItem>>(aSet, [&rFrameFormat]() { return std::shared_ptr<SvxFormatBreakItem>(rFrameFormat.GetBreak().Clone()); }, RES_BREAK, {0}); + AddItemToSet<std::shared_ptr<SvxShadowItem>>(aSet, [&rFrameFormat]() { return std::shared_ptr<SvxShadowItem>(rFrameFormat.GetShadow().Clone()); }, RES_SHADOW, {0}, true); + AddItemToSet<std::shared_ptr<SvxFormatKeepItem>>(aSet, [&rFrameFormat]() { return std::shared_ptr<SvxFormatKeepItem>(rFrameFormat.GetKeep().Clone()); }, RES_KEEP, {0}); + AddItemToSet<std::shared_ptr<SwFormatHoriOrient>>(aSet, [&rFrameFormat]() { return std::shared_ptr<SwFormatHoriOrient>(rFrameFormat.GetHoriOrient().Clone()); }, RES_HORI_ORIENT, {MID_HORIORIENT_ORIENT}, true); const uno::Any* pSzRel(nullptr); GetProperty(FN_TABLE_IS_RELATIVE_WIDTH, 0xff, pSzRel); @@ -2015,10 +2015,10 @@ void SwTableProperties_Impl::ApplyTableAttr(const SwTable& rTable, SwDoc& rDoc) aSz.SetWidth(MINLAY); aSet.Put(aSz); } - AddItemToSet<std::shared_ptr<SvxLRSpaceItem>>(aSet, [&rFrameFormat]() { return std::shared_ptr<SvxLRSpaceItem>(static_cast<SvxLRSpaceItem*>(rFrameFormat.GetLRSpace().Clone())); }, RES_LR_SPACE, { + AddItemToSet<std::shared_ptr<SvxLRSpaceItem>>(aSet, [&rFrameFormat]() { return std::shared_ptr<SvxLRSpaceItem>(rFrameFormat.GetLRSpace().Clone()); }, RES_LR_SPACE, { MID_L_MARGIN|CONVERT_TWIPS, MID_R_MARGIN|CONVERT_TWIPS }); - AddItemToSet<std::shared_ptr<SvxULSpaceItem>>(aSet, [&rFrameFormat]() { return std::shared_ptr<SvxULSpaceItem>(static_cast<SvxULSpaceItem*>(rFrameFormat.GetULSpace().Clone())); }, RES_UL_SPACE, { + AddItemToSet<std::shared_ptr<SvxULSpaceItem>>(aSet, [&rFrameFormat]() { return std::shared_ptr<SvxULSpaceItem>(rFrameFormat.GetULSpace().Clone()); }, RES_UL_SPACE, { MID_UP_MARGIN|CONVERT_TWIPS, MID_LO_MARGIN|CONVERT_TWIPS }); const::uno::Any* pSplit(nullptr); diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 847930fc84a1..80593b032411 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -308,7 +308,7 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor, if( SfxItemState::SET != rFlySet.GetItemState( RES_FRM_SIZE, true, &pItem ) || MINFLY > static_cast<const SwFormatFrameSize*>(pItem)->GetWidth() ) { - std::shared_ptr<SwFormatFrameSize> aSz(static_cast<SwFormatFrameSize*>(rFlySet.Get(RES_FRM_SIZE).Clone())); + std::shared_ptr<SwFormatFrameSize> aSz(rFlySet.Get(RES_FRM_SIZE).Clone()); if (pItem) aSz.reset(static_cast<SwFormatFrameSize*>(pItem->Clone())); diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx index 950a3b0c2029..359ab5628e77 100644 --- a/sw/source/filter/basflt/fltshell.cxx +++ b/sw/source/filter/basflt/fltshell.cxx @@ -970,7 +970,7 @@ bool SwFltAnchor::operator==(const SfxPoolItem& rItem) const pFrameFormat == static_cast<const SwFltAnchor&>(rItem).pFrameFormat; } -SfxPoolItem* SwFltAnchor::Clone(SfxItemPool*) const +SwFltAnchor* SwFltAnchor::Clone(SfxItemPool*) const { return new SwFltAnchor(*this); } @@ -999,7 +999,7 @@ bool SwFltRedline::operator==(const SfxPoolItem& rItem) const this == &rItem; } -SfxPoolItem* SwFltRedline::Clone( SfxItemPool* ) const +SwFltRedline* SwFltRedline::Clone( SfxItemPool* ) const { return new SwFltRedline(*this); } @@ -1033,7 +1033,7 @@ bool SwFltBookmark::operator==(const SfxPoolItem& rItem) const && mnHandle == static_cast<const SwFltBookmark&>(rItem).mnHandle; } -SfxPoolItem* SwFltBookmark::Clone(SfxItemPool*) const +SwFltBookmark* SwFltBookmark::Clone(SfxItemPool*) const { return new SwFltBookmark(*this); } @@ -1054,7 +1054,7 @@ bool SwFltRDFMark::operator==(const SfxPoolItem& rItem) const return m_nHandle == rMark.m_nHandle && m_aAttributes == rMark.m_aAttributes; } -SfxPoolItem* SwFltRDFMark::Clone(SfxItemPool*) const +SwFltRDFMark* SwFltRDFMark::Clone(SfxItemPool*) const { return new SwFltRDFMark(*this); } @@ -1092,7 +1092,7 @@ bool SwFltTOX::operator==(const SfxPoolItem& rItem) const m_xTOXBase.get() == static_cast<const SwFltTOX&>(rItem).m_xTOXBase.get(); } -SfxPoolItem* SwFltTOX::Clone(SfxItemPool*) const +SwFltTOX* SwFltTOX::Clone(SfxItemPool*) const { return new SwFltTOX(*this); } diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index 40a2395ad793..8d7499a82aa2 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -382,7 +382,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SvxBrushItem *pBrush, std::shared_ptr<SvxFrameDirectionItem> aFrameDirItem(std::make_shared<SvxFrameDirectionItem>(SvxFrameDirection::Environment, RES_FRAMEDIR)); bool bSetBrush = pBrush!=nullptr, bSetBox = false, bSetFrameDir = false; if( pBrush ) - aBrushItem.reset(static_cast<SvxBrushItem*>(pBrush->Clone())); + aBrushItem.reset(pBrush->Clone()); if( pItemSet2 ) { diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index cbfbe2e919f3..6d4621c392af 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -599,7 +599,7 @@ void SvxCSS1PropertyInfo::SetBoxItem( SfxItemSet& rItemSet, std::shared_ptr<SvxBoxItem> aBoxItem(std::make_shared<SvxBoxItem>(aItemIds.nBox)); if( pDfltItem ) - aBoxItem.reset(static_cast<SvxBoxItem*>(pDfltItem->Clone())); + aBoxItem.reset(pDfltItem->Clone()); SvxCSS1BorderInfo *pInfo = GetBorderInfo( SvxBoxItemLine::TOP, false ); if( pInfo ) diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index f1fcfbbbacf2..7cc45bbe1a04 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -5160,7 +5160,7 @@ void SwHTMLParser::InsertLineBreak() { if( m_pCSS1Parser->SetFormatBreak( aItemSet, aPropInfo ) ) { - aBreakItem.reset(static_cast<SvxFormatBreakItem*>(aItemSet.Get(RES_BREAK).Clone())); + aBreakItem.reset(aItemSet.Get(RES_BREAK).Clone()); bBreakItem = true; } if( !aPropInfo.m_aId.isEmpty() ) diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx index 83478a939cb5..3bff180bc1cf 100644 --- a/sw/source/filter/inc/fltshell.hxx +++ b/sw/source/filter/inc/fltshell.hxx @@ -192,7 +192,7 @@ public: // "purely virtual methods" of SfxPoolItem virtual bool operator==(const SfxPoolItem&) const override; - virtual SfxPoolItem* Clone(SfxItemPool* = nullptr) const override; + virtual SwFltAnchor* Clone(SfxItemPool* = nullptr) const override; void SetFrameFormat(SwFrameFormat* _pFrameFormat); const SwFrameFormat* GetFrameFormat() const { return pFrameFormat; } SwFrameFormat* GetFrameFormat() { return pFrameFormat; } @@ -224,7 +224,7 @@ public: // "purely virtual methods" of SfxPoolItem virtual bool operator==(const SfxPoolItem& rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* = nullptr) const override; + virtual SwFltRedline* Clone(SfxItemPool* = nullptr) const override; }; class SW_DLLPUBLIC SwFltBookmark : public SfxPoolItem @@ -244,7 +244,7 @@ public: // "purely virtual methods" of SfxPoolItem virtual bool operator==(const SfxPoolItem&) const override; - virtual SfxPoolItem* Clone(SfxItemPool* = nullptr) const override; + virtual SwFltBookmark* Clone(SfxItemPool* = nullptr) const override; long GetHandle() const { return mnHandle; } const OUString& GetName() const { return maName; } @@ -265,7 +265,7 @@ public: SwFltRDFMark(); virtual bool operator==(const SfxPoolItem&) const override; - virtual SfxPoolItem* Clone(SfxItemPool* = nullptr) const override; + virtual SwFltRDFMark* Clone(SfxItemPool* = nullptr) const override; void SetHandle(long nHandle); long GetHandle() const; @@ -282,7 +282,7 @@ public: SwFltTOX(SwTOXBase* pBase); // "purely virtual methods" of SfxPoolItem virtual bool operator==(const SfxPoolItem&) const override; - virtual SfxPoolItem* Clone(SfxItemPool* = nullptr) const override; + virtual SwFltTOX* Clone(SfxItemPool* = nullptr) const override; const SwTOXBase& GetBase() const { return *m_xTOXBase; } void SetHadBreakItem( bool bVal ) { bHadBreakItem = bVal; } void SetHadPageDescItem( bool bVal ) { bHadPageDescItem = bVal; } diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index f3d1fb00997e..18f8386751b1 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -1602,7 +1602,7 @@ void SwBasicEscherEx::WriteGrfBullet(const Graphic& rGrf) std::shared_ptr<SvxBrushItem> aBrush(std::make_shared<SvxBrushItem>(aTmpColor, RES_BACKGROUND)); const SvxBrushItem* pRet = rWrt.GetCurrentPageBgBrush(); if (pRet && (pRet->GetGraphic() ||( pRet->GetColor() != COL_TRANSPARENT))) - aBrush.reset(static_cast<SvxBrushItem*>(pRet->Clone())); + aBrush.reset(pRet->Clone()); WriteBrushAttr(*aBrush, aPropOpt); aPropOpt.AddOpt( ESCHER_Prop_pictureActive, 0 ); diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 83563e42aa0f..b3afd2ce0729 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -483,7 +483,7 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bWriteCombChars) { if (const SfxGrabBagItem *pCharFmtGrabBag = aExportSet.GetItem<SfxGrabBagItem>(RES_CHRATR_GRABBAG, false)) { - std::unique_ptr<SfxGrabBagItem> pNewCharFmtGrabBag(static_cast<SfxGrabBagItem*>(pCharFmtGrabBag->Clone())); + std::unique_ptr<SfxGrabBagItem> pNewCharFmtGrabBag(pCharFmtGrabBag->Clone()); assert(pNewCharFmtGrabBag); auto & rNewFmtMap = pNewCharFmtGrabBag->GetGrabBag(); for (auto const & item : pAutoFmtGrabBag->GetGrabBag()) @@ -1655,7 +1655,7 @@ std::shared_ptr<SvxBrushItem> WW8Export::TrueFrameBgBrush(const SwFrameFormat &r if (pRet && (pRet->GetGraphic() ||( pRet->GetColor() != COL_TRANSPARENT))) { - aRet.reset(static_cast<SvxBrushItem*>(pRet->Clone())); + aRet.reset(pRet->Clone()); } return aRet; diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index ecdb725c3e76..f0aee3225cdc 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -1762,7 +1762,7 @@ void SwWW8ImplReader::RegisterNumFormatOnStyle(sal_uInt16 nStyle) if (rStyleInf.m_bValid && rStyleInf.m_pFormat) { //Save old pre-list modified indent, which are the word indent values - rStyleInf.maWordLR.reset(static_cast<SvxLRSpaceItem*>(ItemGet<SvxLRSpaceItem>(*rStyleInf.m_pFormat, RES_LR_SPACE).Clone())); + rStyleInf.maWordLR.reset(ItemGet<SvxLRSpaceItem>(*rStyleInf.m_pFormat, RES_LR_SPACE).Clone()); // Phase 2: refresh StyleDef after reading all Lists SwNumRule* pNmRule = nullptr; diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index a27b27749c0a..f16ca7565bd7 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -3621,8 +3621,7 @@ void SwWW8ImplReader::Read_UnderlineColor(sal_uInt16, const sal_uInt8* pData, sh if (nLen >= 4) { const SwAttrSet& aSet = m_pCurrentColl->GetAttrSet(); - std::unique_ptr<SvxUnderlineItem> pUnderline( - static_cast<SvxUnderlineItem *>(aSet.Get( RES_CHRATR_UNDERLINE, false ).Clone())); + std::unique_ptr<SvxUnderlineItem> pUnderline(aSet.Get(RES_CHRATR_UNDERLINE, false).Clone()); pUnderline->SetColor( msfilter::util::BGRToRGB(SVBT32ToUInt32(pData)) ); m_pCurrentColl->SetFormatAttr( *pUnderline ); } @@ -3634,7 +3633,7 @@ void SwWW8ImplReader::Read_UnderlineColor(sal_uInt16, const sal_uInt8* pData, sh { if (nLen >= 4) { - std::unique_ptr<SvxUnderlineItem> pUnderline(static_cast<SvxUnderlineItem*>(m_xCurrentItemSet->Get(RES_CHRATR_UNDERLINE, false).Clone())); + std::unique_ptr<SvxUnderlineItem> pUnderline(m_xCurrentItemSet->Get(RES_CHRATR_UNDERLINE, false).Clone()); pUnderline->SetColor( msfilter::util::BGRToRGB(SVBT32ToUInt32(pData)) ); m_xCurrentItemSet->Put( std::move(pUnderline) ); } @@ -5010,7 +5009,7 @@ void SwWW8ImplReader::Read_Border(sal_uInt16 , const sal_uInt8*, short nLen) = static_cast<const SvxBoxItem*>(GetFormatAttr( RES_BOX )); std::shared_ptr<SvxBoxItem> aBox(std::make_shared<SvxBoxItem>(RES_BOX)); if (pBox) - aBox.reset(static_cast<SvxBoxItem*>(pBox->Clone())); + aBox.reset(pBox->Clone()); short aSizeArray[5]={0}; SetBorder(*aBox, aBrcs, &aSizeArray[0], nBorder); @@ -5057,7 +5056,7 @@ void SwWW8ImplReader::Read_CharBorder(sal_uInt16 nId, const sal_uInt8* pData, sh = static_cast<const SvxBoxItem*>(GetFormatAttr( RES_CHRATR_BOX )); if( pBox ) { - std::shared_ptr<SvxBoxItem> aBoxItem(static_cast<SvxBoxItem*>(pBox->Clone())); + std::shared_ptr<SvxBoxItem> aBoxItem(pBox->Clone()); WW8_BRCVer9 aBrc; int nBrcVer = (nId == NS_sprm::sprmCBrc) ? 9 : (m_bVer67 ? 6 : 8); diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index fe7458310a6d..fcabb9bb525b 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -111,7 +111,7 @@ bool SwParagraphNumTabPage::FillItemSet( SfxItemSet* rSet ) const SfxUInt16Item* pOldOutlineLv = static_cast<const SfxUInt16Item*>(GetOldItem( *rSet, SID_ATTR_PARA_OUTLINE_LEVEL)); if (pOldOutlineLv) { - std::unique_ptr<SfxUInt16Item> pOutlineLv(static_cast<SfxUInt16Item*>(pOldOutlineLv->Clone())); + std::unique_ptr<SfxUInt16Item> pOutlineLv(pOldOutlineLv->Clone()); pOutlineLv->SetValue( aOutlineLv ); rSet->Put(std::move(pOutlineLv)); bModified = true; @@ -126,7 +126,7 @@ bool SwParagraphNumTabPage::FillItemSet( SfxItemSet* rSet ) const SfxStringItem* pOldRule = static_cast<const SfxStringItem*>(GetOldItem( *rSet, SID_ATTR_PARA_NUMRULE)); if (pOldRule) { - std::unique_ptr<SfxStringItem> pRule(static_cast<SfxStringItem*>(pOldRule->Clone())); + std::unique_ptr<SfxStringItem> pRule(pOldRule->Clone()); pRule->SetValue(aStyle); rSet->Put(std::move(pRule)); bModified = true; diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 840cdf7c7904..33f82dd0a25f 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -209,8 +209,8 @@ SectRepr::SectRepr( size_t nPos, SwSection& rSect ) m_FootnoteNtAtEnd = pFormat->GetFootnoteAtTextEnd(); m_EndNtAtEnd = pFormat->GetEndAtTextEnd(); m_Balance.SetValue(pFormat->GetBalancedColumns().GetValue()); - m_FrameDirItem.reset(static_cast<SvxFrameDirectionItem*>(pFormat->GetFrameDir().Clone())); - m_LRSpaceItem.reset(static_cast<SvxLRSpaceItem*>(pFormat->GetLRSpace().Clone())); + m_FrameDirItem.reset(pFormat->GetFrameDir().Clone()); + m_LRSpaceItem.reset(pFormat->GetLRSpace().Clone()); } } diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index f83dd0232525..d99562c06266 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2728,7 +2728,7 @@ bool SwFrameURLPage::FillItemSet(SfxItemSet *rSet) const SwFormatURL* pOldURL = GetOldItem(*rSet, RES_URL); std::unique_ptr<SwFormatURL> pFormatURL; if(pOldURL) - pFormatURL.reset(static_cast<SwFormatURL*>(pOldURL->Clone())); + pFormatURL.reset(pOldURL->Clone()); else pFormatURL.reset(new SwFormatURL()); diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 33a95f2cca83..4353f00588cd 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -269,7 +269,7 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet *rSet) if (!m_bDrawMode) { - aOp.reset(static_cast<SvxOpaqueItem*>(GetItemSet().Get(RES_OPAQUE).Clone())); + aOp.reset(GetItemSet().Get(RES_OPAQUE).Clone()); aOp->SetValue(true); } diff --git a/sw/source/uibase/chrdlg/ccoll.cxx b/sw/source/uibase/chrdlg/ccoll.cxx index 0f2d122016c6..be2a72d1c558 100644 --- a/sw/source/uibase/chrdlg/ccoll.cxx +++ b/sw/source/uibase/chrdlg/ccoll.cxx @@ -140,7 +140,7 @@ SwCondCollItem::~SwCondCollItem() { } -SfxPoolItem* SwCondCollItem::Clone( SfxItemPool * /*pPool*/ ) const +SwCondCollItem* SwCondCollItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SwCondCollItem(*this); } diff --git a/sw/source/uibase/config/cfgitems.cxx b/sw/source/uibase/config/cfgitems.cxx index 3c6114c9a9a6..3c20fcce7b1e 100644 --- a/sw/source/uibase/config/cfgitems.cxx +++ b/sw/source/uibase/config/cfgitems.cxx @@ -55,7 +55,7 @@ SwDocDisplayItem::SwDocDisplayItem(const SwViewOption& rVOpt ) : bManualBreak = rVOpt.IsLineBreak(true); } -SfxPoolItem* SwDocDisplayItem::Clone( SfxItemPool* ) const +SwDocDisplayItem* SwDocDisplayItem::Clone( SfxItemPool* ) const { return new SwDocDisplayItem( *this ); } @@ -120,7 +120,7 @@ SwElemItem::SwElemItem(const SwViewOption& rVOpt) : m_bShowHiddenPara = rVOpt.IsShowHiddenPara(); } -SfxPoolItem* SwElemItem::Clone( SfxItemPool* ) const +SwElemItem* SwElemItem::Clone( SfxItemPool* ) const { return new SwElemItem( *this ); } @@ -175,7 +175,7 @@ SwAddPrinterItem::SwAddPrinterItem( const SwPrintData& rPrtData ) : SwPrintData::operator=(rPrtData); } -SfxPoolItem* SwAddPrinterItem::Clone( SfxItemPool* ) const +SwAddPrinterItem* SwAddPrinterItem::Clone( SfxItemPool* ) const { return new SwAddPrinterItem( *this ); } @@ -205,7 +205,7 @@ SwShadowCursorItem::SwShadowCursorItem( const SwViewOption& rVOpt ) { } -SfxPoolItem* SwShadowCursorItem::Clone( SfxItemPool* ) const +SwShadowCursorItem* SwShadowCursorItem::Clone( SfxItemPool* ) const { return new SwShadowCursorItem( *this ); } @@ -224,7 +224,7 @@ void SwShadowCursorItem::FillViewOptions( SwViewOption& rVOpt ) const } #ifdef DBG_UTIL -SfxPoolItem* SwTestItem::Clone( SfxItemPool* ) const +SwTestItem* SwTestItem::Clone( SfxItemPool* ) const { return new SwTestItem( *this ); } diff --git a/sw/source/uibase/dialog/swwrtshitem.cxx b/sw/source/uibase/dialog/swwrtshitem.cxx index 03f7fabe4871..ad88e205e210 100644 --- a/sw/source/uibase/dialog/swwrtshitem.cxx +++ b/sw/source/uibase/dialog/swwrtshitem.cxx @@ -32,7 +32,7 @@ bool SwWrtShellItem::operator==( const SfxPoolItem& rItem) const && pWrtSh == static_cast<const SwWrtShellItem&>(rItem).pWrtSh; } -SfxPoolItem* SwWrtShellItem::Clone( SfxItemPool * /*pPool*/ ) const +SwWrtShellItem* SwWrtShellItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SwWrtShellItem( *this ); } diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx index e9bfb829dd36..85a2631935f7 100644 --- a/sw/source/uibase/envelp/envimg.cxx +++ b/sw/source/uibase/envelp/envimg.cxx @@ -147,7 +147,7 @@ bool SwEnvItem::operator ==(const SfxPoolItem& rItem) const m_nShiftDown == rEnv.m_nShiftDown; } -SfxPoolItem* SwEnvItem::Clone(SfxItemPool*) const +SwEnvItem* SwEnvItem::Clone(SfxItemPool*) const { return new SwEnvItem(*this); } diff --git a/sw/source/uibase/envelp/labimg.cxx b/sw/source/uibase/envelp/labimg.cxx index c77189bbd0fd..a8829d935d70 100644 --- a/sw/source/uibase/envelp/labimg.cxx +++ b/sw/source/uibase/envelp/labimg.cxx @@ -179,7 +179,7 @@ bool SwLabItem::operator ==(const SfxPoolItem& rItem) const m_sGlossaryBlockName == rLab.m_sGlossaryBlockName; } -SfxPoolItem* SwLabItem::Clone(SfxItemPool*) const +SwLabItem* SwLabItem::Clone(SfxItemPool*) const { return new SwLabItem(*this); } diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx index 3bfddca491c2..33a107d2641b 100644 --- a/sw/source/uibase/frmdlg/colex.cxx +++ b/sw/source/uibase/frmdlg/colex.cxx @@ -603,7 +603,7 @@ void SwPageGridExample::UpdateExample( const SfxItemSet& rSet ) pGridItem.reset(); //get the grid information if (SfxItemState::DEFAULT <= rSet.GetItemState(RES_TEXTGRID)) - pGridItem.reset(static_cast<SwTextGridItem*>(rSet.Get(RES_TEXTGRID).Clone())); + pGridItem.reset(rSet.Get(RES_TEXTGRID).Clone()); SwPageExample::UpdateExample(rSet); } diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx index 33b11bfe17f2..40f21ff6e98d 100644 --- a/sw/source/uibase/inc/cfgitems.hxx +++ b/sw/source/uibase/inc/cfgitems.hxx @@ -55,7 +55,7 @@ public: SwDocDisplayItem(); SwDocDisplayItem( const SwViewOption& rVOpt ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwDocDisplayItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; void FillViewOptions( SwViewOption& rVOpt) const; }; @@ -86,7 +86,7 @@ public: SwElemItem(); SwElemItem(const SwViewOption& rVOpt); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwElemItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; void FillViewOptions( SwViewOption& rVOpt) const; @@ -103,7 +103,7 @@ public: SwAddPrinterItem(); SwAddPrinterItem( const SwPrintData& rPrtData ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwAddPrinterItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; }; @@ -117,7 +117,7 @@ public: SwShadowCursorItem(); SwShadowCursorItem( const SwViewOption& rVOpt ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwShadowCursorItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; void FillViewOptions( SwViewOption& rVOpt) const; @@ -151,7 +151,7 @@ class SW_DLLPUBLIC SwTestItem : public SfxPoolItem public: SwTestItem() : SfxPoolItem(FN_PARAM_SWTEST) {}; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwTestItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; }; diff --git a/sw/source/uibase/inc/envimg.hxx b/sw/source/uibase/inc/envimg.hxx index 46974d37a4dd..b63d6b0a5d15 100644 --- a/sw/source/uibase/inc/envimg.hxx +++ b/sw/source/uibase/inc/envimg.hxx @@ -61,7 +61,7 @@ public: virtual bool operator ==(const SfxPoolItem& rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* = nullptr) const override; + virtual SwEnvItem* Clone(SfxItemPool* = 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; }; diff --git a/sw/source/uibase/inc/labimg.hxx b/sw/source/uibase/inc/labimg.hxx index 100cbec2d9c1..8456f8d53710 100644 --- a/sw/source/uibase/inc/labimg.hxx +++ b/sw/source/uibase/inc/labimg.hxx @@ -38,7 +38,7 @@ public: virtual bool operator ==(const SfxPoolItem& rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* = nullptr) const override; + virtual SwLabItem* Clone(SfxItemPool* = nullptr) const override; OUString m_aLstMake; // remember last selection OUString m_aLstType; diff --git a/sw/source/uibase/inc/swwrtshitem.hxx b/sw/source/uibase/inc/swwrtshitem.hxx index ef0c9ba203c5..1cffcc9193f3 100644 --- a/sw/source/uibase/inc/swwrtshitem.hxx +++ b/sw/source/uibase/inc/swwrtshitem.hxx @@ -31,7 +31,7 @@ public: SwWrtShellItem( SwWrtShell* pWrtSh ); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwWrtShellItem* Clone( SfxItemPool *pPool = nullptr ) const override; SwWrtShell* GetValue() const { return pWrtSh; } diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx index 81fa94e16f76..70174273c01d 100644 --- a/sw/source/uibase/inc/uiitems.hxx +++ b/sw/source/uibase/inc/uiitems.hxx @@ -43,7 +43,7 @@ public: SwPageFootnoteInfoItem & operator =(SwPageFootnoteInfoItem const &) = delete; // due to SfxPoolItem SwPageFootnoteInfoItem & operator =(SwPageFootnoteInfoItem &&) = delete; // due to SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwPageFootnoteInfoItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, @@ -65,7 +65,7 @@ class SW_DLLPUBLIC SwPtrItem : public SfxPoolItem public: SwPtrItem( const sal_uInt16 nId, void* pPtr); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwPtrItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; void* GetValue() const { return pMisc; } @@ -80,7 +80,7 @@ public: SwUINumRuleItem( const SwUINumRuleItem& rItem ); virtual ~SwUINumRuleItem() override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwUINumRuleItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -97,7 +97,7 @@ class SwPaMItem : public SfxPoolItem public: SwPaMItem( const sal_uInt16 nId, SwPaM* pPaM); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual SwPaMItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; SwPaM* GetValue() const { return m_pPaM; } diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx index f3df5d011fb6..324dcdec9ea8 100644 --- a/sw/source/uibase/shells/frmsh.cxx +++ b/sw/source/uibase/shells/frmsh.cxx @@ -1073,7 +1073,7 @@ void SwFrameShell::ExecFrameStyle(SfxRequest const & rReq) if (pPoolBoxItem == &rBoxItem) bDefault = true; - std::shared_ptr<SvxBoxItem> aBoxItem(static_cast<SvxBoxItem*>(rBoxItem.Clone())); + std::shared_ptr<SvxBoxItem> aBoxItem(rBoxItem.Clone()); SvxBorderLine aBorderLine; const SfxPoolItem *pItem = nullptr; diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index 1486855b4c24..35e589e3b961 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -985,7 +985,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) // #108876# a font attribute has to be set always due to a guessed script type if( !aNewFont.GetFamilyName().isEmpty() ) { - std::shared_ptr<SvxFontItem> aNewFontItem(static_cast<SvxFontItem*>(aFont->Clone())); + std::shared_ptr<SvxFontItem> aNewFontItem(aFont->Clone()); aNewFontItem->SetFamilyName( aNewFont.GetFamilyName() ); aNewFontItem->SetFamily( aNewFont.GetFamilyType()); aNewFontItem->SetPitch( aNewFont.GetPitch()); diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index 33691a4d2cba..36795a5d02ed 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -559,7 +559,7 @@ SvxSearchItem* SwSrcView::GetSearchItem() void SwSrcView::SetSearchItem( const SvxSearchItem& rItem ) { - pSearchItem.reset(static_cast<SvxSearchItem*>(rItem.Clone())); + pSearchItem.reset(rItem.Clone()); } void SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem, diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx index a1c95c2407ca..c20e8f3cd00f 100644 --- a/sw/source/uibase/uiview/viewsrch.cxx +++ b/sw/source/uibase/uiview/viewsrch.cxx @@ -160,7 +160,7 @@ void SwView::ExecSearch(SfxRequest& rReq) case SID_SEARCH_ITEM: { delete s_pSrchItem; - s_pSrchItem = static_cast<SvxSearchItem*>( pArgs->Get(SID_SEARCH_ITEM).Clone() ); + s_pSrchItem = pArgs->Get(SID_SEARCH_ITEM).Clone(); } break; @@ -174,7 +174,7 @@ void SwView::ExecSearch(SfxRequest& rReq) { // Unregister dialog delete s_pSrchItem; - s_pSrchItem = static_cast<SvxSearchItem*>( pArgs->Get(SID_SEARCH_ITEM).Clone() ); + s_pSrchItem = pArgs->Get(SID_SEARCH_ITEM).Clone(); DELETEZ( s_pSearchList ); DELETEZ( s_pReplaceList ); @@ -231,7 +231,7 @@ void SwView::ExecSearch(SfxRequest& rReq) if ( pArgs ) { delete s_pSrchItem; - s_pSrchItem = static_cast<SvxSearchItem*>( pArgs->Get(SID_SEARCH_ITEM).Clone() ); + s_pSrchItem = pArgs->Get(SID_SEARCH_ITEM).Clone(); } } SvxSearchCmd eCommand = s_pSrchItem->GetCommand(); diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx index ac46c5a1622a..2e4efe96d682 100644 --- a/sw/source/uibase/uiview/viewtab.cxx +++ b/sw/source/uibase/uiview/viewtab.cxx @@ -726,7 +726,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq ) if ( i >= rTabStops.Count() ) { // No DefTab - std::shared_ptr<SvxTabStopItem> aTabStops(static_cast<SvxTabStopItem*>(rTabStops.Clone())); + std::shared_ptr<SvxTabStopItem> aTabStops(rTabStops.Clone()); ::lcl_EraseDefTabs(*aTabStops); @@ -1538,7 +1538,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) std::shared_ptr<SvxLRSpaceItem> aLR(std::make_shared<SvxLRSpaceItem>(RES_LR_SPACE)); if ( !IsTabColFromDoc() ) { - aLR.reset(static_cast<SvxLRSpaceItem*>(aCoreSet.Get(RES_LR_SPACE).Clone())); + aLR.reset(aCoreSet.Get(RES_LR_SPACE).Clone()); // #i23726# if (m_pNumRuleNodeFromDoc) diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx index 20f9d48be8d8..dd520f91d77e 100644 --- a/sw/source/uibase/utlui/uiitems.cxx +++ b/sw/source/uibase/utlui/uiitems.cxx @@ -40,11 +40,11 @@ SwPageFootnoteInfoItem::SwPageFootnoteInfoItem( SwPageFootnoteInfo const & rInfo { } - SwPageFootnoteInfoItem::~SwPageFootnoteInfoItem() +SwPageFootnoteInfoItem::~SwPageFootnoteInfoItem() { } -SfxPoolItem* SwPageFootnoteInfoItem::Clone( SfxItemPool * /*pPool*/ ) const +SwPageFootnoteInfoItem* SwPageFootnoteInfoItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SwPageFootnoteInfoItem( *this ); } @@ -197,7 +197,7 @@ SwPtrItem::SwPtrItem( const sal_uInt16 nId, void* pPtr ) : // Cloning -SfxPoolItem* SwPtrItem::Clone( SfxItemPool * /*pPool*/ ) const +SwPtrItem* SwPtrItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SwPtrItem( *this ); } @@ -225,7 +225,7 @@ SwUINumRuleItem::~SwUINumRuleItem() { } -SfxPoolItem* SwUINumRuleItem::Clone( SfxItemPool * /*pPool*/ ) const +SwUINumRuleItem* SwUINumRuleItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SwUINumRuleItem( *this ); } @@ -262,7 +262,7 @@ SwPaMItem::SwPaMItem( const sal_uInt16 nId, SwPaM* pPaM ) : { } -SfxPoolItem* SwPaMItem::Clone( SfxItemPool * /*pPool*/ ) const +SwPaMItem* SwPaMItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SwPaMItem( *this ); } |