diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-12-11 20:57:45 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-12-12 21:12:10 +0100 |
| commit | 2431477337f4ac4384ba615f76bfb5904f1a3b47 (patch) | |
| tree | 6f676441983e9b3c8440600d09a49478353e1faf /basctl | |
| parent | 23cfd3d1004f5ddda8cd79878c00b6c64f20068c (diff) | |
use covariant return type for SfxPoolItem::Clone
and can then remove some casting
Change-Id: Id821c32ca2cbcdb7f57ef7a5fa1960042e630ffc
Reviewed-on: https://gerrit.libreoffice.org/85022
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/basides1.cxx | 4 | ||||
| -rw-r--r-- | basctl/source/basicide/sbxitem.cxx | 2 | ||||
| -rw-r--r-- | basctl/source/inc/sbxitem.hxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index a59fbcca7048..3e2b585ad320 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -83,7 +83,7 @@ void Shell::ExecuteSearch( SfxRequest& rReq ) case SID_SEARCH_OPTIONS: break; case SID_SEARCH_ITEM: - mpSearchItem.reset( static_cast<SvxSearchItem*>( pArgs->Get(SID_SEARCH_ITEM).Clone() )); + mpSearchItem.reset(pArgs->Get(SID_SEARCH_ITEM).Clone()); break; case FID_SEARCH_ON: mbJustOpened = true; @@ -106,7 +106,7 @@ void Shell::ExecuteSearch( SfxRequest& rReq ) // Get SearchItem from request if it is the first searching if ( pArgs ) { - mpSearchItem.reset( static_cast<SvxSearchItem*>( pArgs->Get( SID_SEARCH_ITEM ).Clone() )); + mpSearchItem.reset(pArgs->Get(SID_SEARCH_ITEM).Clone()); } } diff --git a/basctl/source/basicide/sbxitem.cxx b/basctl/source/basicide/sbxitem.cxx index 0de7757a52c4..db012ec6c4fa 100644 --- a/basctl/source/basicide/sbxitem.cxx +++ b/basctl/source/basicide/sbxitem.cxx @@ -53,7 +53,7 @@ SbxItem::SbxItem ( m_eType(eType) { } -SfxPoolItem *SbxItem::Clone(SfxItemPool*) const +SbxItem* SbxItem::Clone(SfxItemPool*) const { return new SbxItem(*this); } diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx index 4e97389906fd..1d70c5dc43db 100644 --- a/basctl/source/inc/sbxitem.hxx +++ b/basctl/source/inc/sbxitem.hxx @@ -48,7 +48,7 @@ public: SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, ItemType); SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, const OUString& aMethodName, ItemType eType); - virtual SfxPoolItem* Clone(SfxItemPool *pPool = nullptr) const override; + virtual SbxItem* Clone(SfxItemPool *pPool = nullptr) const override; virtual bool operator==(const SfxPoolItem&) const override; ScriptDocument const& GetDocument () const { return m_aDocument; } |