diff options
Diffstat (limited to 'svx')
49 files changed, 288 insertions, 332 deletions
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); } |