From f091259ad2ec1590714645839668580cd7b8c7c4 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 1 Mar 2017 14:17:08 +0200 Subject: 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 Reviewed-by: Noel Grandin --- include/svx/algitem.hxx | 2 +- include/svx/chrtitem.hxx | 28 ++++------------------------ include/svx/rotmodit.hxx | 2 +- include/svx/sdgmoitm.hxx | 11 ++++------- include/svx/sdtaditm.hxx | 7 +++---- include/svx/sdtaitm.hxx | 16 +++++++--------- include/svx/sdtakitm.hxx | 9 ++++----- include/svx/sdtfsitm.hxx | 9 +++------ include/svx/sxcecitm.hxx | 7 +++---- include/svx/sxctitm.hxx | 9 ++++----- include/svx/sxekitm.hxx | 13 ++++++------- include/svx/sxmtpitm.hxx | 14 ++++++-------- include/svx/sxmuitm.hxx | 11 +++++------ include/svx/xfillit0.hxx | 3 +-- include/svx/xflbmpit.hxx | 5 ++--- include/svx/xftadit.hxx | 5 ++--- include/svx/xftshit.hxx | 5 ++--- include/svx/xlineit0.hxx | 3 +-- include/svx/xlinjoit.hxx | 7 +++---- include/svx/xlncapit.hxx | 6 +++--- include/svx/xtextit0.hxx | 5 ++--- 21 files changed, 67 insertions(+), 110 deletions(-) (limited to 'include/svx') 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 // class SdrMeasureTextHPosItem -class SVX_DLLPUBLIC SdrMeasureTextHPosItem: public SfxEnumItem { +class SVX_DLLPUBLIC SdrMeasureTextHPosItem: public SfxEnumItem { public: SdrMeasureTextHPosItem(css::drawing::MeasureTextHorzPos ePos = css::drawing::MeasureTextHorzPos::MeasureTextHorzPos_AUTO) - : SfxEnumItem(SDRATTR_MEASURETEXTHPOS, sal::static_int_cast(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 { public: SdrMeasureTextVPosItem(css::drawing::MeasureTextVertPos ePos = css::drawing::MeasureTextVertPos_AUTO) - : SfxEnumItem(SDRATTR_MEASURETEXTVPOS, sal::static_int_cast(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 { 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 { 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 #include -class SVX_DLLPUBLIC XFillBmpPosItem : public SfxEnumItem +class SVX_DLLPUBLIC XFillBmpPosItem : public SfxEnumItem { 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 { 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 { 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 #include -class SVX_DLLPUBLIC XLineStyleItem : public SfxEnumItem +class SVX_DLLPUBLIC XLineStyleItem : public SfxEnumItem { 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 { 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 { 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 { 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; -- cgit