diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-01 14:17:08 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-03 06:44:41 +0000 |
commit | f091259ad2ec1590714645839668580cd7b8c7c4 (patch) | |
tree | 3bf6b328637358365848bc98a18cbf82ccd4b2d0 /include/svx/chrtitem.hxx | |
parent | d0cc5fcd5bacd8e5e0fa7fe62a78907c2febb867 (diff) |
convert SfxEnumItem to type-safe template class
and drop the SvxChartTextOrientItem class, unused.
Change-Id: I99100837d1beb953450f57b2cda47d165df1620c
Reviewed-on: https://gerrit.libreoffice.org/34747
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/svx/chrtitem.hxx')
-rw-r--r-- | include/svx/chrtitem.hxx | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx index 31c669a3bd6f..a285fd6996d7 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -71,7 +71,7 @@ enum class SvxChartRegress #define CHREGRESS_COUNT ((sal_uInt16)SvxChartRegress::Unknown + 1) -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartRegressItem : public SfxEnumItem +class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartRegressItem : public SfxEnumItem<SvxChartRegress> { public: SvxChartRegressItem(SvxChartRegress eRegress /*= SvxChartRegress::Linear*/, @@ -82,12 +82,10 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; sal_uInt16 GetValueCount() const override { return CHREGRESS_COUNT; } - SvxChartRegress GetValue() const - { return (SvxChartRegress)SfxEnumItem::GetValue(); } sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const override; }; -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartTextOrderItem : public SfxEnumItem +class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartTextOrderItem : public SfxEnumItem<SvxChartTextOrder> { public: SvxChartTextOrderItem(SvxChartTextOrder eOrder /*= SvxChartTextOrder::SideBySide*/, @@ -102,23 +100,9 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; sal_uInt16 GetValueCount() const override { return CHTXTORDER_COUNT; } - SvxChartTextOrder GetValue() const - { return (SvxChartTextOrder)SfxEnumItem::GetValue(); } }; -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartTextOrientItem : public SfxEnumItem -{ -public: - SvxChartTextOrientItem(SvStream& rIn, - sal_uInt16 nId ); - - virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; - - sal_uInt16 GetValueCount() const override { return CHTXTORDER_COUNT; } -}; - -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartKindErrorItem : public SfxEnumItem +class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartKindErrorItem : public SfxEnumItem<SvxChartKindError> { public: SvxChartKindErrorItem(SvxChartKindError /*eOrient = SvxChartKindError::NONE*/, @@ -130,13 +114,11 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; sal_uInt16 GetValueCount() const override { return CHERROR_COUNT; } - SvxChartKindError GetValue() const - { return (SvxChartKindError)SfxEnumItem::GetValue(); } sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const override; }; -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartIndicateItem : public SfxEnumItem +class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartIndicateItem : public SfxEnumItem<SvxChartIndicate> { public: SvxChartIndicateItem(SvxChartIndicate eOrient /*= SvxChartIndicate::NONE*/, @@ -148,8 +130,6 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; sal_uInt16 GetValueCount() const override { return CHINDICATE_COUNT; } - SvxChartIndicate GetValue() const - { return (SvxChartIndicate)SfxEnumItem::GetValue(); } sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const override; }; |