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 /dbaccess | |
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 'dbaccess')
-rw-r--r-- | dbaccess/source/ui/dlg/DbAdminImpl.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/dsnItem.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/optionalboolitem.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/optionalboolitem.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/stringlistitem.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/stringlistitem.cxx | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 40efd0d7485b..d61c75314ecb 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -1071,7 +1071,7 @@ bool DbuTypeCollectionItem::operator==(const SfxPoolItem& _rItem) const static_cast<const DbuTypeCollectionItem&>( _rItem ).getCollection() == getCollection(); } -SfxPoolItem* DbuTypeCollectionItem::Clone(SfxItemPool* /*_pPool*/) const +DbuTypeCollectionItem* DbuTypeCollectionItem::Clone(SfxItemPool* /*_pPool*/) const { return new DbuTypeCollectionItem(*this); } diff --git a/dbaccess/source/ui/dlg/dsnItem.hxx b/dbaccess/source/ui/dlg/dsnItem.hxx index 7ca47d036db7..41103f8de4b8 100644 --- a/dbaccess/source/ui/dlg/dsnItem.hxx +++ b/dbaccess/source/ui/dlg/dsnItem.hxx @@ -40,7 +40,7 @@ namespace dbaui DbuTypeCollectionItem(const DbuTypeCollectionItem& _rSource); virtual bool operator==(const SfxPoolItem& _rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* _pPool = nullptr) const override; + virtual DbuTypeCollectionItem* Clone(SfxItemPool* _pPool = nullptr) const override; ::dbaccess::ODsnTypeCollection* getCollection() const { return m_pCollection; } }; diff --git a/dbaccess/source/ui/dlg/optionalboolitem.cxx b/dbaccess/source/ui/dlg/optionalboolitem.cxx index b0b4aff525b1..5eb4b1272a15 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.cxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.cxx @@ -35,7 +35,7 @@ namespace dbaui static_cast<const OptionalBoolItem&>( _rItem ).m_aValue == m_aValue; } - SfxPoolItem* OptionalBoolItem::Clone( SfxItemPool* /*_pPool*/ ) const + OptionalBoolItem* OptionalBoolItem::Clone( SfxItemPool* /*_pPool*/ ) const { return new OptionalBoolItem( *this ); } diff --git a/dbaccess/source/ui/dlg/optionalboolitem.hxx b/dbaccess/source/ui/dlg/optionalboolitem.hxx index ce0a8f0659b6..008d59046921 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.hxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.hxx @@ -36,7 +36,7 @@ namespace dbaui explicit OptionalBoolItem( sal_uInt16 nWhich ); virtual bool operator==( const SfxPoolItem& _rItem ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* _pPool = nullptr ) const override; + virtual OptionalBoolItem* Clone( SfxItemPool* _pPool = nullptr ) const override; bool HasValue() const { return !!m_aValue; } void ClearValue() { m_aValue.reset(); } diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx index 9ed631a6b7d9..7601f3030cb9 100644 --- a/dbaccess/source/ui/inc/stringlistitem.hxx +++ b/dbaccess/source/ui/inc/stringlistitem.hxx @@ -40,7 +40,7 @@ public: OStringListItem(const OStringListItem& _rSource); virtual bool operator==(const SfxPoolItem& _rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* _pPool = nullptr) const override; + virtual OStringListItem* Clone(SfxItemPool* _pPool = nullptr) const override; const css::uno::Sequence< OUString >& getList() const { return m_aList; } }; diff --git a/dbaccess/source/ui/misc/stringlistitem.cxx b/dbaccess/source/ui/misc/stringlistitem.cxx index 1d821edd2076..c5da8c21968e 100644 --- a/dbaccess/source/ui/misc/stringlistitem.cxx +++ b/dbaccess/source/ui/misc/stringlistitem.cxx @@ -53,7 +53,7 @@ bool OStringListItem::operator==(const SfxPoolItem& _rItem) const return true; } -SfxPoolItem* OStringListItem::Clone(SfxItemPool* /* _pPool */) const +OStringListItem* OStringListItem::Clone(SfxItemPool* /* _pPool */) const { return new OStringListItem(*this); } |