use covariant return type for SfxPoolItem::Clone

and can then remove some casting

Change-Id: Id821c32ca2cbcdb7f57ef7a5fa1960042e630ffc
Reviewed-on: https://gerrit.libreoffice.org/85022
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

17 files changed, 91 insertions, 120 deletions

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));