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, 35 insertions, 35 deletions

diff --git a/sw/source/uibase/chrdlg/ccoll.cxx b/sw/source/uibase/chrdlg/ccoll.cxx
index 0f2d122016c6..be2a72d1c558 100644
--- a/sw/source/uibase/chrdlg/ccoll.cxx
+++ b/sw/source/uibase/chrdlg/ccoll.cxx
@@ -140,7 +140,7 @@ SwCondCollItem::~SwCondCollItem()
 {
 }
 
-SfxPoolItem*   SwCondCollItem::Clone( SfxItemPool * /*pPool*/ ) const
+SwCondCollItem* SwCondCollItem::Clone( SfxItemPool * /*pPool*/ ) const
 {
     return new SwCondCollItem(*this);
 }
diff --git a/sw/source/uibase/config/cfgitems.cxx b/sw/source/uibase/config/cfgitems.cxx
index 3c6114c9a9a6..3c20fcce7b1e 100644
--- a/sw/source/uibase/config/cfgitems.cxx
+++ b/sw/source/uibase/config/cfgitems.cxx
@@ -55,7 +55,7 @@ SwDocDisplayItem::SwDocDisplayItem(const SwViewOption& rVOpt ) :
     bManualBreak        = rVOpt.IsLineBreak(true);
 }
 
-SfxPoolItem* SwDocDisplayItem::Clone( SfxItemPool*  ) const
+SwDocDisplayItem* SwDocDisplayItem::Clone( SfxItemPool*  ) const
 {
     return new SwDocDisplayItem( *this );
 }
@@ -120,7 +120,7 @@ SwElemItem::SwElemItem(const SwViewOption& rVOpt) :
     m_bShowHiddenPara  = rVOpt.IsShowHiddenPara();
 }
 
-SfxPoolItem* SwElemItem::Clone( SfxItemPool* ) const
+SwElemItem* SwElemItem::Clone( SfxItemPool* ) const
 {
     return new SwElemItem( *this );
 }
@@ -175,7 +175,7 @@ SwAddPrinterItem::SwAddPrinterItem( const SwPrintData& rPrtData ) :
     SwPrintData::operator=(rPrtData);
 }
 
-SfxPoolItem* SwAddPrinterItem::Clone( SfxItemPool* ) const
+SwAddPrinterItem* SwAddPrinterItem::Clone( SfxItemPool* ) const
 {
     return new SwAddPrinterItem( *this );
 }
@@ -205,7 +205,7 @@ SwShadowCursorItem::SwShadowCursorItem( const SwViewOption& rVOpt )
 {
 }
 
-SfxPoolItem* SwShadowCursorItem::Clone( SfxItemPool* ) const
+SwShadowCursorItem* SwShadowCursorItem::Clone( SfxItemPool* ) const
 {
     return new SwShadowCursorItem( *this );
 }
@@ -224,7 +224,7 @@ void SwShadowCursorItem::FillViewOptions( SwViewOption& rVOpt ) const
 }
 
 #ifdef DBG_UTIL
-SfxPoolItem* SwTestItem::Clone( SfxItemPool* ) const
+SwTestItem* SwTestItem::Clone( SfxItemPool* ) const
 {
     return new SwTestItem( *this );
 }
diff --git a/sw/source/uibase/dialog/swwrtshitem.cxx b/sw/source/uibase/dialog/swwrtshitem.cxx
index 03f7fabe4871..ad88e205e210 100644
--- a/sw/source/uibase/dialog/swwrtshitem.cxx
+++ b/sw/source/uibase/dialog/swwrtshitem.cxx
@@ -32,7 +32,7 @@ bool SwWrtShellItem::operator==( const SfxPoolItem& rItem) const
         && pWrtSh == static_cast<const SwWrtShellItem&>(rItem).pWrtSh;
 }
 
-SfxPoolItem* SwWrtShellItem::Clone( SfxItemPool * /*pPool*/ ) const
+SwWrtShellItem* SwWrtShellItem::Clone( SfxItemPool * /*pPool*/ ) const
 {
     return new SwWrtShellItem( *this );
 }
diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx
index e9bfb829dd36..85a2631935f7 100644
--- a/sw/source/uibase/envelp/envimg.cxx
+++ b/sw/source/uibase/envelp/envimg.cxx
@@ -147,7 +147,7 @@ bool SwEnvItem::operator ==(const SfxPoolItem& rItem) const
            m_nShiftDown      == rEnv.m_nShiftDown;
 }
 
-SfxPoolItem* SwEnvItem::Clone(SfxItemPool*) const
+SwEnvItem* SwEnvItem::Clone(SfxItemPool*) const
 {
     return new SwEnvItem(*this);
 }
diff --git a/sw/source/uibase/envelp/labimg.cxx b/sw/source/uibase/envelp/labimg.cxx
index c77189bbd0fd..a8829d935d70 100644
--- a/sw/source/uibase/envelp/labimg.cxx
+++ b/sw/source/uibase/envelp/labimg.cxx
@@ -179,7 +179,7 @@ bool SwLabItem::operator ==(const SfxPoolItem& rItem) const
             m_sGlossaryBlockName ==    rLab.m_sGlossaryBlockName;
 }
 
-SfxPoolItem* SwLabItem::Clone(SfxItemPool*) const
+SwLabItem* SwLabItem::Clone(SfxItemPool*) const
 {
     return new SwLabItem(*this);
 }
diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx
index 3bfddca491c2..33a107d2641b 100644
--- a/sw/source/uibase/frmdlg/colex.cxx
+++ b/sw/source/uibase/frmdlg/colex.cxx
@@ -603,7 +603,7 @@ void SwPageGridExample::UpdateExample( const SfxItemSet& rSet )
     pGridItem.reset();
     //get the grid information
     if (SfxItemState::DEFAULT <= rSet.GetItemState(RES_TEXTGRID))
-        pGridItem.reset(static_cast<SwTextGridItem*>(rSet.Get(RES_TEXTGRID).Clone()));
+        pGridItem.reset(rSet.Get(RES_TEXTGRID).Clone());
     SwPageExample::UpdateExample(rSet);
 }
 
diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx
index 33b11bfe17f2..40f21ff6e98d 100644
--- a/sw/source/uibase/inc/cfgitems.hxx
+++ b/sw/source/uibase/inc/cfgitems.hxx
@@ -55,7 +55,7 @@ public:
                                 SwDocDisplayItem();
                                 SwDocDisplayItem( const SwViewOption& rVOpt );
 
-    virtual SfxPoolItem*        Clone( SfxItemPool *pPool = nullptr ) const override;
+    virtual SwDocDisplayItem*   Clone( SfxItemPool *pPool = nullptr ) const override;
     virtual bool                operator==( const SfxPoolItem& ) const override;
     void                        FillViewOptions( SwViewOption& rVOpt) const;
 };
@@ -86,7 +86,7 @@ public:
                             SwElemItem();
                             SwElemItem(const SwViewOption& rVOpt);
 
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
+    virtual SwElemItem*     Clone( SfxItemPool *pPool = nullptr ) const override;
     virtual bool            operator==( const SfxPoolItem& ) const override;
 
     void                    FillViewOptions( SwViewOption& rVOpt) const;
@@ -103,7 +103,7 @@ public:
     SwAddPrinterItem();
     SwAddPrinterItem( const SwPrintData& rPrtData );
 
-    virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
+    virtual SwAddPrinterItem* Clone( SfxItemPool *pPool = nullptr ) const override;
 
     virtual bool         operator==( const SfxPoolItem& ) const override;
 };
@@ -117,7 +117,7 @@ public:
     SwShadowCursorItem();
     SwShadowCursorItem( const SwViewOption& rVOpt );
 
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
+    virtual SwShadowCursorItem* Clone( SfxItemPool *pPool = nullptr ) const override;
     virtual bool            operator==( const SfxPoolItem& ) const override;
 
     void FillViewOptions( SwViewOption& rVOpt) const;
@@ -151,7 +151,7 @@ class SW_DLLPUBLIC SwTestItem : public SfxPoolItem
 public:
                             SwTestItem() : SfxPoolItem(FN_PARAM_SWTEST) {};
 
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
+    virtual SwTestItem*     Clone( SfxItemPool *pPool = nullptr ) const override;
     virtual bool            operator==( const SfxPoolItem& ) const override;
 
 };
diff --git a/sw/source/uibase/inc/envimg.hxx b/sw/source/uibase/inc/envimg.hxx
index 46974d37a4dd..b63d6b0a5d15 100644
--- a/sw/source/uibase/inc/envimg.hxx
+++ b/sw/source/uibase/inc/envimg.hxx
@@ -61,7 +61,7 @@ public:
 
     virtual bool operator ==(const SfxPoolItem& rItem) const override;
 
-    virtual SfxPoolItem*     Clone(SfxItemPool* = nullptr) const override;
+    virtual SwEnvItem*       Clone(SfxItemPool* = nullptr) const override;
     virtual bool             QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
     virtual bool             PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 };
diff --git a/sw/source/uibase/inc/labimg.hxx b/sw/source/uibase/inc/labimg.hxx
index 100cbec2d9c1..8456f8d53710 100644
--- a/sw/source/uibase/inc/labimg.hxx
+++ b/sw/source/uibase/inc/labimg.hxx
@@ -38,7 +38,7 @@ public:
 
     virtual bool operator ==(const SfxPoolItem& rItem) const override;
 
-    virtual SfxPoolItem*     Clone(SfxItemPool* = nullptr) const override;
+    virtual SwLabItem*       Clone(SfxItemPool* = nullptr) const override;
 
     OUString   m_aLstMake; // remember last selection
     OUString   m_aLstType;
diff --git a/sw/source/uibase/inc/swwrtshitem.hxx b/sw/source/uibase/inc/swwrtshitem.hxx
index ef0c9ba203c5..1cffcc9193f3 100644
--- a/sw/source/uibase/inc/swwrtshitem.hxx
+++ b/sw/source/uibase/inc/swwrtshitem.hxx
@@ -31,7 +31,7 @@ public:
                             SwWrtShellItem( SwWrtShell* pWrtSh );
 
     virtual bool            operator==( const SfxPoolItem& ) const override;
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
+    virtual SwWrtShellItem* Clone( SfxItemPool *pPool = nullptr ) const override;
 
     SwWrtShell*             GetValue() const { return pWrtSh; }
 
diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx
index 81fa94e16f76..70174273c01d 100644
--- a/sw/source/uibase/inc/uiitems.hxx
+++ b/sw/source/uibase/inc/uiitems.hxx
@@ -43,7 +43,7 @@ public:
     SwPageFootnoteInfoItem & operator =(SwPageFootnoteInfoItem const &) = delete; // due to SfxPoolItem
     SwPageFootnoteInfoItem & operator =(SwPageFootnoteInfoItem &&) = delete; // due to SfxPoolItem
 
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
+    virtual SwPageFootnoteInfoItem* Clone( SfxItemPool *pPool = nullptr ) const override;
     virtual bool            operator==( const SfxPoolItem& ) const override;
     virtual bool GetPresentation( SfxItemPresentation ePres,
                                   MapUnit eCoreMetric,
@@ -65,7 +65,7 @@ class SW_DLLPUBLIC SwPtrItem : public SfxPoolItem
 public:
     SwPtrItem( const sal_uInt16 nId, void* pPtr);
 
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
+    virtual SwPtrItem*      Clone( SfxItemPool *pPool = nullptr ) const override;
     virtual bool            operator==( const SfxPoolItem& ) const override;
 
     void*   GetValue() const        { return pMisc; }
@@ -80,7 +80,7 @@ public:
     SwUINumRuleItem( const SwUINumRuleItem& rItem );
     virtual ~SwUINumRuleItem() override;
 
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
+    virtual SwUINumRuleItem* Clone( SfxItemPool *pPool = nullptr ) const override;
     virtual bool            operator==( const SfxPoolItem& ) const override;
 
     virtual bool             QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
@@ -97,7 +97,7 @@ class SwPaMItem : public SfxPoolItem
 public:
     SwPaMItem( const sal_uInt16 nId, SwPaM* pPaM);
 
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
+    virtual SwPaMItem*      Clone( SfxItemPool *pPool = nullptr ) const override;
     virtual bool            operator==( const SfxPoolItem& ) const override;
 
     SwPaM*   GetValue() const        { return m_pPaM; }
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index f3df5d011fb6..324dcdec9ea8 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -1073,7 +1073,7 @@ void SwFrameShell::ExecFrameStyle(SfxRequest const & rReq)
     if (pPoolBoxItem == &rBoxItem)
         bDefault = true;
 
-    std::shared_ptr<SvxBoxItem> aBoxItem(static_cast<SvxBoxItem*>(rBoxItem.Clone()));
+    std::shared_ptr<SvxBoxItem> aBoxItem(rBoxItem.Clone());
 
     SvxBorderLine aBorderLine;
     const SfxPoolItem *pItem = nullptr;
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 1486855b4c24..35e589e3b961 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -985,7 +985,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
         // #108876# a font attribute has to be set always due to a guessed script type
         if( !aNewFont.GetFamilyName().isEmpty() )
         {
-            std::shared_ptr<SvxFontItem> aNewFontItem(static_cast<SvxFontItem*>(aFont->Clone()));
+            std::shared_ptr<SvxFontItem> aNewFontItem(aFont->Clone());
             aNewFontItem->SetFamilyName( aNewFont.GetFamilyName() );
             aNewFontItem->SetFamily(  aNewFont.GetFamilyType());
             aNewFontItem->SetPitch(   aNewFont.GetPitch());
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index 33691a4d2cba..36795a5d02ed 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -559,7 +559,7 @@ SvxSearchItem* SwSrcView::GetSearchItem()
 
 void SwSrcView::SetSearchItem( const SvxSearchItem& rItem )
 {
-    pSearchItem.reset(static_cast<SvxSearchItem*>(rItem.Clone()));
+    pSearchItem.reset(rItem.Clone());
 }
 
 void SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem,
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index a1c95c2407ca..c20e8f3cd00f 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -160,7 +160,7 @@ void SwView::ExecSearch(SfxRequest& rReq)
     case SID_SEARCH_ITEM:
     {
         delete s_pSrchItem;
-        s_pSrchItem = static_cast<SvxSearchItem*>( pArgs->Get(SID_SEARCH_ITEM).Clone() );
+        s_pSrchItem = pArgs->Get(SID_SEARCH_ITEM).Clone();
     }
     break;
 
@@ -174,7 +174,7 @@ void SwView::ExecSearch(SfxRequest& rReq)
         {
             // Unregister dialog
             delete s_pSrchItem;
-            s_pSrchItem = static_cast<SvxSearchItem*>( pArgs->Get(SID_SEARCH_ITEM).Clone() );
+            s_pSrchItem = pArgs->Get(SID_SEARCH_ITEM).Clone();
 
             DELETEZ( s_pSearchList );
             DELETEZ( s_pReplaceList );
@@ -231,7 +231,7 @@ void SwView::ExecSearch(SfxRequest& rReq)
                 if ( pArgs )
                 {
                     delete s_pSrchItem;
-                    s_pSrchItem = static_cast<SvxSearchItem*>( pArgs->Get(SID_SEARCH_ITEM).Clone() );
+                    s_pSrchItem = pArgs->Get(SID_SEARCH_ITEM).Clone();
                 }
             }
             SvxSearchCmd eCommand = s_pSrchItem->GetCommand();
diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx
index ac46c5a1622a..2e4efe96d682 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -726,7 +726,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
                 if ( i >= rTabStops.Count() )
                 {
                     // No DefTab
-                    std::shared_ptr<SvxTabStopItem> aTabStops(static_cast<SvxTabStopItem*>(rTabStops.Clone()));
+                    std::shared_ptr<SvxTabStopItem> aTabStops(rTabStops.Clone());
 
                     ::lcl_EraseDefTabs(*aTabStops);
 
@@ -1538,7 +1538,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                 std::shared_ptr<SvxLRSpaceItem> aLR(std::make_shared<SvxLRSpaceItem>(RES_LR_SPACE));
                 if ( !IsTabColFromDoc() )
                 {
-                    aLR.reset(static_cast<SvxLRSpaceItem*>(aCoreSet.Get(RES_LR_SPACE).Clone()));
+                    aLR.reset(aCoreSet.Get(RES_LR_SPACE).Clone());
 
                     // #i23726#
                     if (m_pNumRuleNodeFromDoc)
diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx
index 20f9d48be8d8..dd520f91d77e 100644
--- a/sw/source/uibase/utlui/uiitems.cxx
+++ b/sw/source/uibase/utlui/uiitems.cxx
@@ -40,11 +40,11 @@ SwPageFootnoteInfoItem::SwPageFootnoteInfoItem( SwPageFootnoteInfo const & rInfo
 {
 }
 
- SwPageFootnoteInfoItem::~SwPageFootnoteInfoItem()
+SwPageFootnoteInfoItem::~SwPageFootnoteInfoItem()
 {
 }
 
-SfxPoolItem*  SwPageFootnoteInfoItem::Clone( SfxItemPool * /*pPool*/ ) const
+SwPageFootnoteInfoItem* SwPageFootnoteInfoItem::Clone( SfxItemPool * /*pPool*/ ) const
 {
     return new SwPageFootnoteInfoItem( *this );
 }
@@ -197,7 +197,7 @@ SwPtrItem::SwPtrItem( const sal_uInt16 nId, void* pPtr ) :
 
 // Cloning
 
-SfxPoolItem* SwPtrItem::Clone( SfxItemPool * /*pPool*/ ) const
+SwPtrItem* SwPtrItem::Clone( SfxItemPool * /*pPool*/ ) const
 {
     return new SwPtrItem( *this );
 }
@@ -225,7 +225,7 @@ SwUINumRuleItem::~SwUINumRuleItem()
 {
 }
 
-SfxPoolItem*  SwUINumRuleItem::Clone( SfxItemPool * /*pPool*/ ) const
+SwUINumRuleItem* SwUINumRuleItem::Clone( SfxItemPool * /*pPool*/ ) const
 {
     return new SwUINumRuleItem( *this );
 }
@@ -262,7 +262,7 @@ SwPaMItem::SwPaMItem( const sal_uInt16 nId, SwPaM* pPaM ) :
 {
 }
 
-SfxPoolItem* SwPaMItem::Clone( SfxItemPool * /*pPool*/ ) const
+SwPaMItem* SwPaMItem::Clone( SfxItemPool * /*pPool*/ ) const
 {
     return new SwPaMItem( *this );
 }