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>

32 files changed, 139 insertions, 159 deletions

diff --git a/include/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx
index b644d31d808e..c87aa57e2f14 100644
--- a/include/editeng/charreliefitem.hxx
+++ b/include/editeng/charreliefitem.hxx
@@ -31,7 +31,7 @@
     emboss, relief.
 */
 
-class EDITENG_DLLPUBLIC SvxCharReliefItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxCharReliefItem : public SfxEnumItem<FontRelief>
 {
 public:
     static SfxPoolItem* CreateDefault();
@@ -46,8 +46,6 @@ public:
 
     virtual OUString        GetValueTextByPos( sal_uInt16 nPos ) const override;
     virtual sal_uInt16      GetValueCount() const override;
-    FontRelief              GetValue() const { return (FontRelief)SfxEnumItem::GetValue(); }
-    void                    SetValue(FontRelief f) { SfxEnumItem::SetValue((sal_uInt16)f); }
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
                                   MapUnit eCoreMetric,
diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx
index f140a88f090b..d1a38a051dee 100644
--- a/include/editeng/cmapitem.hxx
+++ b/include/editeng/cmapitem.hxx
@@ -32,7 +32,7 @@ class SvXMLUnitConverter;
     This item describe the font type (uppercase, small caps ,...).
 */
 
-class EDITENG_DLLPUBLIC SvxCaseMapItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxCaseMapItem : public SfxEnumItem<SvxCaseMap>
 {
 public:
     static SfxPoolItem* CreateDefault();
@@ -49,11 +49,9 @@ public:
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
     virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const override;
     virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion) const override;
-    virtual OUString   GetValueTextByPos( sal_uInt16 nPos ) const override;
+    virtual OUString        GetValueTextByPos( sal_uInt16 nPos ) const override;
     virtual sal_uInt16      GetValueCount() const override;
 
-    using SfxEnumItem::SetValue;
-
     inline SvxCaseMapItem& operator=(const SvxCaseMapItem& rMap)
         {
             SetValue( rMap.GetValue() );
@@ -61,8 +59,7 @@ public:
         }
 
     // enum cast
-    SvxCaseMap              GetCaseMap() const
-                                { return (SvxCaseMap)GetValue(); }
+    SvxCaseMap              GetCaseMap() const { return GetValue(); }
     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/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx
index e91d9af09ddb..6bf4d4250ffe 100644
--- a/include/editeng/crossedoutitem.hxx
+++ b/include/editeng/crossedoutitem.hxx
@@ -31,7 +31,7 @@ class SvXMLUnitConverter;
     This item describes, whether and how it is striked out.
 */
 
-class EDITENG_DLLPUBLIC SvxCrossedOutItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxCrossedOutItem : public SfxEnumItem<FontStrikeout>
 {
 public:
     static SfxPoolItem* CreateDefault();
@@ -67,7 +67,7 @@ public:
 
     // enum cast
     FontStrikeout           GetStrikeout() const
-                                { return (FontStrikeout)GetValue(); }
+                                { return GetValue(); }
 };
 
 #endif // INCLUDED_EDITENG_CROSSEDOUTITEM_HXX
diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx
index 38894da2678c..e0fd881162b1 100644
--- a/include/editeng/formatbreakitem.hxx
+++ b/include/editeng/formatbreakitem.hxx
@@ -33,7 +33,7 @@
 */
 #define FMTBREAK_NOAUTO ((sal_uInt16)0x0001)
 
-class EDITENG_DLLPUBLIC SvxFormatBreakItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxFormatBreakItem : public SfxEnumItem<SvxBreak>
 {
 public:
     static SfxPoolItem* CreateDefault();
@@ -52,7 +52,7 @@ public:
                                   MapUnit eCoreMetric,
                                   MapUnit ePresMetric,
                                   OUString &rText, const IntlWrapper * = nullptr ) const override;
-    virtual OUString    GetValueTextByPos( sal_uInt16 nPos ) const override;
+    virtual OUString         GetValueTextByPos( sal_uInt16 nPos ) const override;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = nullptr ) const override;
     virtual SvStream&        Store( SvStream& , sal_uInt16 nItemVersion ) const override;
@@ -60,15 +60,13 @@ public:
     virtual SfxPoolItem*     Create( SvStream&, sal_uInt16 ) const override;
     virtual sal_uInt16       GetValueCount() const override;
 
-    void                     SetValue( SvxBreak nNewVal )
-                                {SfxEnumItem::SetValue((sal_uInt16) nNewVal); }
-    SvxBreak                 GetBreak() const { return (SvxBreak) GetValue(); }
+    SvxBreak                 GetBreak() const { return GetValue(); }
 };
 
 
 inline SvxFormatBreakItem::SvxFormatBreakItem( const SvxBreak eBreak,
                                          const sal_uInt16 _nWhich ) :
-    SfxEnumItem( _nWhich, (sal_uInt16)eBreak )
+    SfxEnumItem( _nWhich, eBreak )
 {}
 
 inline SvxFormatBreakItem::SvxFormatBreakItem( const SvxFormatBreakItem& rBreak ) :
diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx
index 9ffaf6f66aa8..e246bb5b73ba 100644
--- a/include/editeng/justifyitem.hxx
+++ b/include/editeng/justifyitem.hxx
@@ -25,7 +25,7 @@
 #include <svl/eitem.hxx>
 #include <sal/types.h>
 
-class EDITENG_DLLPUBLIC SvxHorJustifyItem: public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxHorJustifyItem: public SfxEnumItem<SvxCellHorJustify>
 {
 public:
     static SfxPoolItem* CreateDefault();
@@ -57,7 +57,7 @@ public:
 };
 
 
-class EDITENG_DLLPUBLIC SvxVerJustifyItem: public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxVerJustifyItem: public SfxEnumItem<SvxCellVerJustify>
 {
 public:
     static SfxPoolItem* CreateDefault();
@@ -89,7 +89,7 @@ public:
 };
 
 
-class EDITENG_DLLPUBLIC SvxJustifyMethodItem: public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxJustifyMethodItem: public SfxEnumItem<SvxCellJustifyMethod>
 {
 public:
     SvxJustifyMethodItem(
diff --git a/include/editeng/langitem.hxx b/include/editeng/langitem.hxx
index 6b611b15682d..a3a1823ecba0 100644
--- a/include/editeng/langitem.hxx
+++ b/include/editeng/langitem.hxx
@@ -32,7 +32,7 @@ class SvXMLUnitConverter;
     This item describes a Language.
 */
 
-class EDITENG_DLLPUBLIC SvxLanguageItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxLanguageItem : public SfxEnumItem<LanguageType>
 {
 public:
     static SfxPoolItem* CreateDefault();
@@ -49,7 +49,7 @@ public:
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
     virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const override;
     virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion) const override;
-    virtual sal_uInt16          GetValueCount() const override;
+    virtual sal_uInt16      GetValueCount() const override;
 
     inline SvxLanguageItem& operator=(const SvxLanguageItem& rLang)
         {
@@ -57,9 +57,8 @@ public:
             return *this;
         }
 
-    // enum cast
     LanguageType            GetLanguage() const
-                                { return (LanguageType)GetValue(); }
+                                { return GetValue(); }
     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/include/editeng/postitem.hxx b/include/editeng/postitem.hxx
index 8a6a0c58027d..674f5ba8b747 100644
--- a/include/editeng/postitem.hxx
+++ b/include/editeng/postitem.hxx
@@ -32,7 +32,7 @@ class SvXMLUnitConverter;
     This item describes the font setting (Italic)
 */
 
-class EDITENG_DLLPUBLIC SvxPostureItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxPostureItem : public SfxEnumItem<FontItalic>
 {
 public:
     static SfxPoolItem* CreateDefault();
@@ -66,7 +66,7 @@ public:
 
     // enum cast
     FontItalic              GetPosture() const
-                                { return (FontItalic)GetValue(); }
+                                { return GetValue(); }
 
     void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
 };
diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx
index 900c212c9298..6b7bb0fa49ef 100644
--- a/include/editeng/udlnitem.hxx
+++ b/include/editeng/udlnitem.hxx
@@ -30,7 +30,7 @@ class SvXMLUnitConverter;
 
 /* Value container for underline and overline font effects */
 
-class EDITENG_DLLPUBLIC SvxTextLineItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxTextLineItem : public SfxEnumItem<FontLineStyle>
 {
     Color mColor;
 public:
@@ -70,9 +70,9 @@ public:
 
     // enum cast
     FontLineStyle           GetLineStyle() const
-                                { return (FontLineStyle)GetValue(); }
+                                { return GetValue(); }
     void                    SetLineStyle( FontLineStyle eNew )
-                                { SetValue((sal_uInt16) eNew); }
+                                { SetValue(eNew); }
 
     const Color&            GetColor() const                { return mColor; }
     void                    SetColor( const Color& rCol )   { mColor = rCol; }
diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx
index 4ced552b81bb..eaa11698e337 100644
--- a/include/editeng/wghtitem.hxx
+++ b/include/editeng/wghtitem.hxx
@@ -32,7 +32,7 @@ class SvXMLUnitConverter;
     This item describes the font weight.
 */
 
-class EDITENG_DLLPUBLIC SvxWeightItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxWeightItem : public SfxEnumItem<FontWeight>
 {
 public:
     static SfxPoolItem* CreateDefault();
@@ -65,8 +65,7 @@ public:
         }
 
     // enum cast
-    FontWeight              GetWeight() const
-                                { return (FontWeight)GetValue(); }
+    FontWeight              GetWeight() const { return GetValue(); }
 
     void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
 };
diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx
index fb9125ee1443..ee38084a04c7 100644
--- a/include/svl/aeitem.hxx
+++ b/include/svl/aeitem.hxx
@@ -26,7 +26,7 @@
 
 class SfxAllEnumValueArr;
 
-class SVL_DLLPUBLIC SfxAllEnumItem: public SfxEnumItem
+class SVL_DLLPUBLIC SfxAllEnumItem: public SfxEnumItem<sal_uInt16>
 {
     SfxAllEnumValueArr*      pValues;
     std::vector<sal_uInt16>* pDisabledValues;
diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx
index 16518a7bea38..93c122b10888 100644
--- a/include/svl/eitem.hxx
+++ b/include/svl/eitem.hxx
@@ -22,15 +22,16 @@
 
 #include <svl/svldllapi.h>
 #include <svl/cenumitm.hxx>
+#include <tools/stream.hxx>
 
 
-class SVL_DLLPUBLIC SfxEnumItem
-    : public SfxEnumItemInterface
+template<typename EnumT>
+class SfxEnumItem : public SfxEnumItemInterface
 {
-    sal_uInt16 m_nValue;
+    EnumT m_nValue;
 
 protected:
-    explicit SfxEnumItem(sal_uInt16 const nWhich =0, sal_uInt16 const nValue =0)
+    explicit SfxEnumItem(sal_uInt16 const nWhich, EnumT const nValue)
         : SfxEnumItemInterface(nWhich)
         , m_nValue(nValue)
     { }
@@ -40,23 +41,54 @@ protected:
         , m_nValue(rItem.m_nValue)
     { }
 
-    SfxEnumItem(sal_uInt16 const nWhich, SvStream & rStream);
+    SfxEnumItem(sal_uInt16 const nWhich, SvStream & rStream)
+        : SfxEnumItemInterface(nWhich)
+    {
+        sal_uInt16 nTmp = 0;
+        rStream.ReadUInt16( nTmp );
+        m_nValue = static_cast<EnumT>(nTmp);
+    }
 
 public:
 
-    sal_uInt16 GetValue() const { return m_nValue; }
-
-    void SetValue(sal_uInt16 nTheValue);
-
-    // SfxPoolItem
-    virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override;
-
-    virtual sal_uInt16 GetEnumValue() const override;
-
-    virtual void SetEnumValue(sal_uInt16 nTheValue) override;
-
+    EnumT GetValue() const { return m_nValue; }
+
+    void SetValue(EnumT nTheValue)
+    {
+        assert(GetRefCount() == 0 && "SfxEnumItem::SetValue(): Pooled item");
+        m_nValue = nTheValue;
+    }
+
+    virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override
+    {
+        rStream.WriteUInt16( static_cast<sal_uInt16>(m_nValue) );
+        return rStream;
+    }
+
+    virtual sal_uInt16 GetEnumValue() const override
+    {
+        return static_cast<sal_uInt16>(GetValue());
+    }
+
+    virtual void SetEnumValue(sal_uInt16 nTheValue) override
+    {
+        SetValue(static_cast<EnumT>(nTheValue));
+    }
+
+    virtual bool operator==(SfxPoolItem const & other) const override
+    {
+        return SfxEnumItemInterface::operator==(other) &&
+               m_nValue == static_cast<const SfxEnumItem<EnumT> &>(other).m_nValue;
+    }
 };
 
+// We need to have this one instantiated only once to prevent LNK2005 "already defined" on 32-bit MSVC.
+// But then we run into the problem that "extern" and SVL_DLLPUBLIC are mutually exclusive on templates for MSVC.
+#ifdef _WIN32
+extern template class SfxEnumItem<sal_uInt16>;
+#else
+extern template class SVL_DLLPUBLIC SfxEnumItem<sal_uInt16>;
+#endif
 
 class SVL_DLLPUBLIC SfxBoolItem
     : public SfxPoolItem
diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx
index 4fc822940d98..98dc301f5355 100644
--- a/include/svx/algitem.hxx
+++ b/include/svx/algitem.hxx
@@ -27,7 +27,7 @@
 
 class SvStream;
 
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxOrientationItem: public SfxEnumItem
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxOrientationItem: public SfxEnumItem<SvxCellOrientation>
 {
 public:
     static SfxPoolItem* CreateDefault();
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;
 };
diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx
index f04420095ff9..fa2b04a2dd03 100644
--- a/include/svx/rotmodit.hxx
+++ b/include/svx/rotmodit.hxx
@@ -34,7 +34,7 @@ enum SvxRotateMode
     SVX_ROTATE_MODE_BOTTOM
 };
 
-class SVX_DLLPUBLIC SvxRotateModeItem: public SfxEnumItem
+class SVX_DLLPUBLIC SvxRotateModeItem: public SfxEnumItem<SvxRotateMode>
 {
 public:
                 static SfxPoolItem* CreateDefault();
diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx
index 411266a9fc17..3d38fb107a17 100644
--- a/include/svx/sdgmoitm.hxx
+++ b/include/svx/sdgmoitm.hxx
@@ -29,20 +29,17 @@
 // SdrGrafModeItem -
 
 
-class SVX_DLLPUBLIC SdrGrafModeItem : public SfxEnumItem
+class SVX_DLLPUBLIC SdrGrafModeItem : public SfxEnumItem<GraphicDrawMode>
 {
 public:
-
-
-                            SdrGrafModeItem( GraphicDrawMode eMode = GRAPHICDRAWMODE_STANDARD ) : SfxEnumItem( SDRATTR_GRAFMODE, (sal_uInt16)eMode ) {}
+                            SdrGrafModeItem( GraphicDrawMode eMode = GRAPHICDRAWMODE_STANDARD ) : SfxEnumItem( SDRATTR_GRAFMODE, eMode ) {}
                             SdrGrafModeItem( SvStream& rIn ) : SfxEnumItem( SDRATTR_GRAFMODE, rIn ) {}
 
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = nullptr ) const override;
     virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const override;
-    virtual sal_uInt16          GetValueCount() const override;
-    GraphicDrawMode         GetValue() const { return (GraphicDrawMode) SfxEnumItem::GetValue(); }
+    virtual sal_uInt16      GetValueCount() const override;
 
-    virtual OUString   GetValueTextByPos( sal_uInt16 nPos ) const override;
+    virtual OUString        GetValueTextByPos( sal_uInt16 nPos ) const override;
     virtual bool GetPresentation( SfxItemPresentation ePres,
                                   MapUnit eCoreMetric,
                                   MapUnit ePresMetric,
diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx
index 2481aa7daa24..84d0736c9e7e 100644
--- a/include/svx/sdtaditm.hxx
+++ b/include/svx/sdtaditm.hxx
@@ -32,14 +32,13 @@ enum class SdrTextAniDirection
     Left, Right, Up, Down
 };
 
-class SVX_DLLPUBLIC SdrTextAniDirectionItem: public SfxEnumItem {
+class SVX_DLLPUBLIC SdrTextAniDirectionItem: public SfxEnumItem<SdrTextAniDirection> {
 public:
-    SdrTextAniDirectionItem(SdrTextAniDirection eDir=SdrTextAniDirection::Left): SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,(sal_uInt16)eDir) {}
+    SdrTextAniDirectionItem(SdrTextAniDirection eDir=SdrTextAniDirection::Left): SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION, eDir) {}
     SdrTextAniDirectionItem(SvStream& rIn)                           : SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,rIn)  {}
     virtual SfxPoolItem*   Clone(SfxItemPool* pPool=nullptr) const override;
     virtual SfxPoolItem*   Create(SvStream& rIn, sal_uInt16 nVer) const override;
-    virtual sal_uInt16         GetValueCount() const override;
-    SdrTextAniDirection GetValue() const      { return (SdrTextAniDirection)SfxEnumItem::GetValue(); }
+    virtual sal_uInt16     GetValueCount() 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/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx
index 9c59352de964..7cc9fb84908e 100644
--- a/include/svx/sdtaitm.hxx
+++ b/include/svx/sdtaitm.hxx
@@ -33,15 +33,14 @@ enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP,      // aligned to top (normally
                         SDRTEXTVERTADJUST_BLOCK    // support vertical full with supported now
                         /*,SDRTEXTVERTADJUST_STRETCH*/}; // also stretch letters in their height (ni)
 
-class SVX_DLLPUBLIC SdrTextVertAdjustItem: public SfxEnumItem {
+class SVX_DLLPUBLIC SdrTextVertAdjustItem: public SfxEnumItem<SdrTextVertAdjust> {
 public:
-    SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST,(sal_uInt16)eAdj) {}
-    SdrTextVertAdjustItem(SdrTextVertAdjust eAdj, sal_uInt16 nWhich): SfxEnumItem(nWhich,(sal_uInt16)eAdj) {}
+    SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST, eAdj) {}
+    SdrTextVertAdjustItem(SdrTextVertAdjust eAdj, sal_uInt16 nWhich): SfxEnumItem(nWhich, eAdj) {}
     SdrTextVertAdjustItem(SvStream& rIn)                               : SfxEnumItem(SDRATTR_TEXT_VERTADJUST,rIn)  {}
     virtual SfxPoolItem*      Clone(SfxItemPool* pPool=nullptr) const override;
     virtual SfxPoolItem*      Create(SvStream& rIn, sal_uInt16 nVer) const override;
-    virtual sal_uInt16            GetValueCount() const override; // { return 5; }
-            SdrTextVertAdjust GetValue() const      { return (SdrTextVertAdjust)SfxEnumItem::GetValue(); }
+    virtual sal_uInt16        GetValueCount() const override; // { return 5; }
 
     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;
@@ -61,14 +60,13 @@ enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT,     // left adjusted
                         SDRTEXTHORZADJUST_BLOCK    // use the whole text frame width
                         /*,SDRTEXTHORZADJUST_STRETCH*/}; // FitToSize in X direction (ni).
 
-class SVX_DLLPUBLIC SdrTextHorzAdjustItem: public SfxEnumItem {
+class SVX_DLLPUBLIC SdrTextHorzAdjustItem: public SfxEnumItem<SdrTextHorzAdjust> {
 public:
-    SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): SfxEnumItem(SDRATTR_TEXT_HORZADJUST,(sal_uInt16)eAdj) {}
-    SdrTextHorzAdjustItem(SvStream& rIn)                                 : SfxEnumItem(SDRATTR_TEXT_HORZADJUST,rIn)  {}
+    SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): SfxEnumItem(SDRATTR_TEXT_HORZADJUST, eAdj) {}
+    SdrTextHorzAdjustItem(SvStream& rIn)                                 : SfxEnumItem(SDRATTR_TEXT_HORZADJUST, rIn)  {}
     virtual SfxPoolItem*      Clone(SfxItemPool* pPool=nullptr) const override;
     virtual SfxPoolItem*      Create(SvStream& rIn, sal_uInt16 nVer) const override;
     virtual sal_uInt16        GetValueCount() const override;
-            SdrTextHorzAdjust GetValue() const      { return (SdrTextHorzAdjust)SfxEnumItem::GetValue(); }
 
     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/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx
index 2960559d69de..9cac471b0e03 100644
--- a/include/svx/sdtakitm.hxx
+++ b/include/svx/sdtakitm.hxx
@@ -76,14 +76,13 @@ enum SdrTextAniKind {
 //   of the text depends on the anchor of the drawing object.  This
 //   corresponds to the position of the text in normal Paint (without scrolling).
 
-class SVX_DLLPUBLIC SdrTextAniKindItem: public SfxEnumItem {
+class SVX_DLLPUBLIC SdrTextAniKindItem: public SfxEnumItem<SdrTextAniKind> {
 public:
-    SdrTextAniKindItem(SdrTextAniKind eKind=SDRTEXTANI_NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND,(sal_uInt16)eKind) {}
-    SdrTextAniKindItem(SvStream& rIn)                       : SfxEnumItem(SDRATTR_TEXT_ANIKIND,rIn)  {}
+    SdrTextAniKindItem(SdrTextAniKind eKind=SDRTEXTANI_NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND, eKind) {}
+    SdrTextAniKindItem(SvStream& rIn)                       : SfxEnumItem(SDRATTR_TEXT_ANIKIND, rIn)  {}
     virtual SfxPoolItem*      Clone(SfxItemPool* pPool=nullptr) const override;
     virtual SfxPoolItem*      Create(SvStream& rIn, sal_uInt16 nVer) const override;
-    virtual sal_uInt16            GetValueCount() const override; // { return 5; }
-            SdrTextAniKind GetValue() const      { return (SdrTextAniKind)SfxEnumItem::GetValue(); }
+    virtual sal_uInt16        GetValueCount() const override; // { return 5; }
 
     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/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx
index 406bd2ba80fd..ed024c85754e 100644
--- a/include/svx/sdtfsitm.hxx
+++ b/include/svx/sdtfsitm.hxx
@@ -42,17 +42,14 @@ enum class SdrFitToSizeType
 // TextMaxFrameWidth is reached).
 
 
-// class SdrTextFitToSizeTypeItem
-
-class SVX_DLLPUBLIC SdrTextFitToSizeTypeItem: public SfxEnumItem {
+class SVX_DLLPUBLIC SdrTextFitToSizeTypeItem: public SfxEnumItem<SdrFitToSizeType> {
 public:
     static SfxPoolItem* CreateDefault();
-    SdrTextFitToSizeTypeItem(SdrFitToSizeType eFit=SdrFitToSizeType::NONE): SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,(sal_uInt16)eFit) {}
-    SdrTextFitToSizeTypeItem(SvStream& rIn)                        : SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,rIn)  {}
+    SdrTextFitToSizeTypeItem(SdrFitToSizeType eFit=SdrFitToSizeType::NONE): SfxEnumItem(SDRATTR_TEXT_FITTOSIZE, eFit) {}
+    SdrTextFitToSizeTypeItem(SvStream& rIn)                        : SfxEnumItem(SDRATTR_TEXT_FITTOSIZE, rIn)  {}
     virtual SfxPoolItem*     Clone(SfxItemPool* pPool=nullptr) const override;
     virtual SfxPoolItem*     Create(SvStream& rIn, sal_uInt16 nVer) const override;
     virtual sal_uInt16       GetValueCount() const override;
-            SdrFitToSizeType GetValue() const      { return (SdrFitToSizeType)SfxEnumItem::GetValue(); }
 
     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/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx
index 4d8acea0f382..eb4f4a859cb1 100644
--- a/include/svx/sxcecitm.hxx
+++ b/include/svx/sxcecitm.hxx
@@ -30,14 +30,13 @@ enum class SdrCaptionEscDir { Horizontal, Vertical, BestFit };
 
 // class SdrCaptionEscDirItem
 
-class SVX_DLLPUBLIC SdrCaptionEscDirItem: public SfxEnumItem {
+class SVX_DLLPUBLIC SdrCaptionEscDirItem: public SfxEnumItem<SdrCaptionEscDir> {
 public:
-    SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SdrCaptionEscDir::Horizontal): SfxEnumItem(SDRATTR_CAPTIONESCDIR,sal::static_int_cast< sal_uInt16 >(eDir)) {}
+    SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SdrCaptionEscDir::Horizontal): SfxEnumItem(SDRATTR_CAPTIONESCDIR, eDir) {}
     SdrCaptionEscDirItem(SvStream& rIn)                              : SfxEnumItem(SDRATTR_CAPTIONESCDIR,rIn)  {}
     virtual SfxPoolItem*     Clone(SfxItemPool* pPool=nullptr) const override;
     virtual SfxPoolItem*     Create(SvStream& rIn, sal_uInt16 nVer) const override;
-    virtual sal_uInt16           GetValueCount() const override; // { return 3; }
-    SdrCaptionEscDir GetValue() const      { return (SdrCaptionEscDir)SfxEnumItem::GetValue(); }
+    virtual sal_uInt16       GetValueCount() const override; // { return 3; }
 
     virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override;
 
diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx
index b255b95c5b66..d75e80b35200 100644
--- a/include/svx/sxctitm.hxx
+++ b/include/svx/sxctitm.hxx
@@ -28,15 +28,14 @@ enum class SdrCaptionType { Type1, Type2, Type3, Type4 };
 
 // class SdrCaptionTypeItem
 
-class SVX_DLLPUBLIC SdrCaptionTypeItem: public SfxEnumItem {
+class SVX_DLLPUBLIC SdrCaptionTypeItem: public SfxEnumItem<SdrCaptionType> {
 public:
-    SdrCaptionTypeItem(SdrCaptionType eStyle=SdrCaptionType::Type3): SfxEnumItem(SDRATTR_CAPTIONTYPE,sal::static_int_cast< sal_uInt16 >(eStyle)) {}
+    SdrCaptionTypeItem(SdrCaptionType eStyle=SdrCaptionType::Type3): SfxEnumItem(SDRATTR_CAPTIONTYPE, eStyle) {}
     SdrCaptionTypeItem(SvStream& rIn)                      : SfxEnumItem(SDRATTR_CAPTIONTYPE,rIn)    {}
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool=nullptr) const override;
     virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const override;
-    virtual sal_uInt16          GetValueCount() const override; // { return 4; }
-            SdrCaptionType  GetValue() const      { return (SdrCaptionType)SfxEnumItem::GetValue(); }
-    virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override;
+    virtual sal_uInt16      GetValueCount() const override; // { return 4; }
+    virtual OUString        GetValueTextByPos(sal_uInt16 nPos) const override;
     virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
 };
 
diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx
index 1fce19df61a8..67a11d390b5a 100644
--- a/include/svx/sxekitm.hxx
+++ b/include/svx/sxekitm.hxx
@@ -31,17 +31,16 @@ enum class SdrEdgeKind
 
 // class SdrEdgeKindItem
 
-class SVX_DLLPUBLIC SdrEdgeKindItem: public SfxEnumItem {
+class SVX_DLLPUBLIC SdrEdgeKindItem: public SfxEnumItem<SdrEdgeKind> {
 public:
-    SdrEdgeKindItem(SdrEdgeKind eStyle=SdrEdgeKind::OrthoLines): SfxEnumItem(SDRATTR_EDGEKIND,sal::static_int_cast< sal_uInt16 >(eStyle)) {}
+    SdrEdgeKindItem(SdrEdgeKind eStyle=SdrEdgeKind::OrthoLines): SfxEnumItem(SDRATTR_EDGEKIND, eStyle) {}
     SdrEdgeKindItem(SvStream& rIn)                        : SfxEnumItem(SDRATTR_EDGEKIND,rIn)    {}
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
     virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override;
-    virtual sal_uInt16       GetValueCount() const override; // { return 5; }
-            SdrEdgeKind  GetValue() const      { return (SdrEdgeKind)SfxEnumItem::GetValue(); }
-    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;
-    virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override;
+    virtual sal_uInt16   GetValueCount() const override; // { return 5; }
+    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;
+    virtual OUString     GetValueTextByPos(sal_uInt16 nPos) const override;
     virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
 };
 
diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx
index fc9abf85dcfd..a3692fbdd151 100644
--- a/include/svx/sxmtpitm.hxx
+++ b/include/svx/sxmtpitm.hxx
@@ -26,10 +26,10 @@
 #include <com/sun/star/drawing/MeasureTextVertPos.hpp>
 
 // class SdrMeasureTextHPosItem
-class SVX_DLLPUBLIC SdrMeasureTextHPosItem: public SfxEnumItem {
+class SVX_DLLPUBLIC SdrMeasureTextHPosItem: public SfxEnumItem<css::drawing::MeasureTextHorzPos> {
 public:
     SdrMeasureTextHPosItem(css::drawing::MeasureTextHorzPos ePos = css::drawing::MeasureTextHorzPos::MeasureTextHorzPos_AUTO)
-        : SfxEnumItem(SDRATTR_MEASURETEXTHPOS, sal::static_int_cast<sal_uInt16>(ePos))
+        : SfxEnumItem(SDRATTR_MEASURETEXTHPOS, ePos)
     {
     }
     SdrMeasureTextHPosItem(SvStream& rIn)
@@ -38,8 +38,7 @@ public:
     }
     virtual SfxPoolItem*   Clone(SfxItemPool* pPool=nullptr) const override;
     virtual SfxPoolItem*   Create(SvStream& rIn, sal_uInt16 nVer) const override;
-    virtual sal_uInt16         GetValueCount() const override; // { return 4; }
-    css::drawing::MeasureTextHorzPos GetValue() const { return (css::drawing::MeasureTextHorzPos)SfxEnumItem::GetValue(); }
+    virtual sal_uInt16     GetValueCount() const override; // { return 4; }
 
     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;
@@ -49,10 +48,10 @@ public:
 };
 
 // class SdrMeasureTextVPosItem
-class SVX_DLLPUBLIC SdrMeasureTextVPosItem: public SfxEnumItem {
+class SVX_DLLPUBLIC SdrMeasureTextVPosItem: public SfxEnumItem<css::drawing::MeasureTextVertPos> {
 public:
     SdrMeasureTextVPosItem(css::drawing::MeasureTextVertPos ePos = css::drawing::MeasureTextVertPos_AUTO)
-        : SfxEnumItem(SDRATTR_MEASURETEXTVPOS, sal::static_int_cast<sal_uInt16>(ePos))
+        : SfxEnumItem(SDRATTR_MEASURETEXTVPOS, ePos)
     {
     }
     SdrMeasureTextVPosItem(SvStream& rIn)
@@ -61,8 +60,7 @@ public:
     }
     virtual SfxPoolItem*   Clone(SfxItemPool* pPool=nullptr) const override;
     virtual SfxPoolItem*   Create(SvStream& rIn, sal_uInt16 nVer) const override;
-    virtual sal_uInt16         GetValueCount() const override; // { return 5; }
-    css::drawing::MeasureTextVertPos GetValue() const { return (css::drawing::MeasureTextVertPos)SfxEnumItem::GetValue(); }
+    virtual sal_uInt16     GetValueCount() const override; // { return 5; }
 
     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/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx
index 47102dc98f32..46052c3b7dfe 100644
--- a/include/svx/sxmuitm.hxx
+++ b/include/svx/sxmuitm.hxx
@@ -26,17 +26,16 @@
 
 // specification of the unit if measurement. The numerical quantity value is converted in this unity.
 // (based on the facts of the MapUnit of the model). This unity is displayed if necessary.
-class SVX_DLLPUBLIC SdrMeasureUnitItem: public SfxEnumItem {
+class SVX_DLLPUBLIC SdrMeasureUnitItem: public SfxEnumItem<FieldUnit> {
 public:
-    SdrMeasureUnitItem(FieldUnit eUnit=FUNIT_NONE): SfxEnumItem(SDRATTR_MEASUREUNIT,sal::static_int_cast< sal_uInt16 >(eUnit)) {}
+    SdrMeasureUnitItem(FieldUnit eUnit=FUNIT_NONE): SfxEnumItem(SDRATTR_MEASUREUNIT, eUnit) {}
     SdrMeasureUnitItem(SvStream& rIn)             : SfxEnumItem(SDRATTR_MEASUREUNIT,rIn)   {}
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
     virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override;
-    virtual sal_uInt16       GetValueCount() const override; // { return 14; }
-            FieldUnit    GetValue() const { return (FieldUnit)SfxEnumItem::GetValue(); }
+    virtual sal_uInt16   GetValueCount() const override; // { return 14; }
 
-    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;
+    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;
 
     virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override;
     virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx
index 54495aa87677..53c946a18b15 100644
--- a/include/svx/xfillit0.hxx
+++ b/include/svx/xfillit0.hxx
@@ -31,7 +31,7 @@
 // class XFillStyleItem
 
 
-class SVX_DLLPUBLIC XFillStyleItem : public SfxEnumItem
+class SVX_DLLPUBLIC XFillStyleItem : public SfxEnumItem<css::drawing::FillStyle>
 {
 public:
                             static SfxPoolItem* CreateDefault();
@@ -50,7 +50,6 @@ public:
                                   MapUnit ePresMetric,
                                   OUString &rText, const IntlWrapper * = nullptr ) const override;
     virtual sal_uInt16          GetValueCount() const override;
-    css::drawing::FillStyle GetValue() const { return (css::drawing::FillStyle) SfxEnumItem::GetValue(); }
 
     void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
 };
diff --git a/include/svx/xflbmpit.hxx b/include/svx/xflbmpit.hxx
index df73cb4b4410..7be034b7df2d 100644
--- a/include/svx/xflbmpit.hxx
+++ b/include/svx/xflbmpit.hxx
@@ -24,7 +24,7 @@
 #include <svx/rectenum.hxx>
 #include <svx/svxdllapi.h>
 
-class SVX_DLLPUBLIC XFillBmpPosItem : public SfxEnumItem
+class SVX_DLLPUBLIC XFillBmpPosItem : public SfxEnumItem<RectPoint>
 {
 public:
                             static SfxPoolItem* CreateDefault();
@@ -39,8 +39,7 @@ public:
                                                  MapUnit ePresMetric,
                                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
-    SVX_DLLPRIVATE virtual sal_uInt16           GetValueCount() const override;
-    SVX_DLLPRIVATE RectPoint               GetValue() const { return (RectPoint) SfxEnumItem::GetValue(); }
+    SVX_DLLPRIVATE virtual sal_uInt16      GetValueCount() const override;
     void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
 };
 
diff --git a/include/svx/xftadit.hxx b/include/svx/xftadit.hxx
index 4346eb6afef2..c7a418eb3979 100644
--- a/include/svx/xftadit.hxx
+++ b/include/svx/xftadit.hxx
@@ -29,7 +29,7 @@
 |*
 \************************************************************************/
 
-class SVX_DLLPUBLIC XFormTextAdjustItem : public SfxEnumItem
+class SVX_DLLPUBLIC XFormTextAdjustItem : public SfxEnumItem<XFormTextAdjust>
 {
 public:
                             static SfxPoolItem* CreateDefault();
@@ -38,8 +38,7 @@ public:
                             XFormTextAdjustItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = nullptr) const override;
     virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const override;
-    virtual sal_uInt16          GetValueCount() const override;
-    XFormTextAdjust         GetValue() const { return (XFormTextAdjust) SfxEnumItem::GetValue(); }
+    virtual sal_uInt16      GetValueCount() const override;
     // #FontWork#
     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/include/svx/xftshit.hxx b/include/svx/xftshit.hxx
index 384bc306d51c..7f8518660fb2 100644
--- a/include/svx/xftshit.hxx
+++ b/include/svx/xftshit.hxx
@@ -30,7 +30,7 @@
 |*
 \************************************************************************/
 
-class SVX_DLLPUBLIC XFormTextShadowItem : public SfxEnumItem
+class SVX_DLLPUBLIC XFormTextShadowItem : public SfxEnumItem<XFormTextShadow>
 {
 public:
                             static SfxPoolItem* CreateDefault();
@@ -39,8 +39,7 @@ public:
                             XFormTextShadowItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = nullptr) const override;
     virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const override;
-    virtual sal_uInt16          GetValueCount() const override;
-    XFormTextShadow         GetValue() const { return (XFormTextShadow) SfxEnumItem::GetValue(); }
+    virtual sal_uInt16      GetValueCount() const override;
     // #FontWork#
     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/include/svx/xlineit0.hxx b/include/svx/xlineit0.hxx
index ca0148afad47..6f6e2044ff50 100644
--- a/include/svx/xlineit0.hxx
+++ b/include/svx/xlineit0.hxx
@@ -28,7 +28,7 @@
 #include <svx/svxdllapi.h>
 #include <com/sun/star/drawing/LineStyle.hpp>
 
-class SVX_DLLPUBLIC XLineStyleItem : public SfxEnumItem
+class SVX_DLLPUBLIC XLineStyleItem : public SfxEnumItem<css::drawing::LineStyle>
 {
 public:
                             static SfxPoolItem* CreateDefault();
@@ -45,7 +45,6 @@ public:
                                   MapUnit ePresMetric,
                                   OUString &rText, const IntlWrapper * = nullptr ) const override;
     virtual sal_uInt16          GetValueCount() const override;
-    css::drawing::LineStyle     GetValue() const { return (css::drawing::LineStyle) SfxEnumItem::GetValue(); }
 };
 
 #endif
diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx
index 131c9774faff..b9ac6f78f2b2 100644
--- a/include/svx/xlinjoit.hxx
+++ b/include/svx/xlinjoit.hxx
@@ -29,14 +29,14 @@
 // class XLineJointItem
 
 
-class SVX_DLLPUBLIC XLineJointItem : public SfxEnumItem
+class SVX_DLLPUBLIC XLineJointItem : public SfxEnumItem<css::drawing::LineJoint>
 {
 public:
                             static SfxPoolItem* CreateDefault();
                             XLineJointItem( css::drawing::LineJoint eLineJoint = css::drawing::LineJoint_ROUND );
                             XLineJointItem( SvStream& rIn );
 
-    virtual sal_uInt16           GetVersion( sal_uInt16 nFileFormatVersion ) const override;
+    virtual sal_uInt16      GetVersion( sal_uInt16 nFileFormatVersion ) const override;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = nullptr ) const override;
     virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const override;
 
@@ -46,8 +46,7 @@ public:
                                   MapUnit eCoreMetric, MapUnit ePresMetric,
                                   OUString &rText, const IntlWrapper * = nullptr ) const override;
 
-    virtual sal_uInt16                 GetValueCount() const override;
-    css::drawing::LineJoint GetValue() const { return (css::drawing::LineJoint) SfxEnumItem::GetValue(); }
+    virtual sal_uInt16       GetValueCount() const override;
 };
 
 #endif // INCLUDED_SVX_XLINJOIT_HXX
diff --git a/include/svx/xlncapit.hxx b/include/svx/xlncapit.hxx
index 80bf211626c8..d42224cfa9a3 100644
--- a/include/svx/xlncapit.hxx
+++ b/include/svx/xlncapit.hxx
@@ -29,7 +29,7 @@
 // class XLineCapItem
 
 
-class SVX_DLLPUBLIC XLineCapItem : public SfxEnumItem
+class SVX_DLLPUBLIC XLineCapItem : public SfxEnumItem<css::drawing::LineCap>
 {
 public:
     static SfxPoolItem* CreateDefault();
@@ -46,8 +46,8 @@ public:
                                   MapUnit eCoreMetric, MapUnit ePresMetric,
                                   OUString &rText, const IntlWrapper * = nullptr ) const override;
 
-    virtual sal_uInt16          GetValueCount() const override;
-    css::drawing::LineCap GetValue() const;
+    css::drawing::LineCap   GetValue() const;
+    virtual sal_uInt16      GetValueCount() const override;
 };
 
 #endif // INCLUDED_SVX_XLNCAPIT_HXX
diff --git a/include/svx/xtextit0.hxx b/include/svx/xtextit0.hxx
index 5cdc3774752d..8e4f57009f0c 100644
--- a/include/svx/xtextit0.hxx
+++ b/include/svx/xtextit0.hxx
@@ -30,7 +30,7 @@
 |*
 \************************************************************************/
 
-class SVX_DLLPUBLIC XFormTextStyleItem : public SfxEnumItem
+class SVX_DLLPUBLIC XFormTextStyleItem : public SfxEnumItem<XFormTextStyle>
 {
 public:
                             static SfxPoolItem* CreateDefault();
@@ -38,8 +38,7 @@ public:
                             XFormTextStyleItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = nullptr) const override;
     virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const override;
-    virtual sal_uInt16          GetValueCount() const override;
-    XFormTextStyle          GetValue() const { return (XFormTextStyle) SfxEnumItem::GetValue(); }
+    virtual sal_uInt16      GetValueCount() const override;
     // #FontWork#
     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;