cui/source/tabpages/connect.cxx | 8 -----
editeng/source/items/frmitems.cxx | 5 ---
editeng/source/items/justifyitem.cxx | 14 ---------
editeng/source/items/textitem.cxx | 41 ----------------------------
include/editeng/charreliefitem.hxx | 1
include/editeng/cmapitem.hxx | 1
include/editeng/crossedoutitem.hxx | 1
include/editeng/formatbreakitem.hxx | 1
include/editeng/frmdiritem.hxx | 5 ---
include/editeng/justifyitem.hxx | 3 --
include/editeng/langitem.hxx | 1
include/editeng/postitem.hxx | 1
include/editeng/scripthintitem.hxx | 1
include/editeng/udlnitem.hxx | 1
include/editeng/wghtitem.hxx | 1
include/svl/cenumitm.hxx | 2 -
include/svx/RectangleAlignmentItem.hxx | 2 -
include/svx/algitem.hxx | 1
include/svx/chrtitem.hxx | 8 -----
include/svx/rotmodit.hxx | 1
include/svx/sdgmoitm.hxx | 1
include/svx/sdtaditm.hxx | 1
include/svx/sdtaitm.hxx | 2 -
include/svx/sdtakitm.hxx | 1
include/svx/sdtfsitm.hxx | 1
include/svx/sxcecitm.hxx | 1
include/svx/sxctitm.hxx | 1
include/svx/sxekitm.hxx | 2 -
include/svx/sxmtpitm.hxx | 2 -
include/svx/sxmuitm.hxx | 1
include/svx/xfillit0.hxx | 1
include/svx/xflbmpit.hxx | 1
include/svx/xftadit.hxx | 1
include/svx/xftshit.hxx | 1
include/svx/xlineit0.hxx | 1
include/svx/xlinjoit.hxx | 2 -
include/svx/xlncapit.hxx | 1
include/svx/xtextit0.hxx | 1
sc/inc/attrib.hxx | 1
sc/source/core/data/attrib.cxx | 5 ---
svx/inc/sxcikitm.hxx | 1
svx/inc/sxmkitm.hxx | 1
svx/source/items/RectangleAlignmentItem.cxx | 5 ---
svx/source/items/algitem.cxx | 5 ---
svx/source/items/rotmodit.cxx | 5 ---
svx/source/svdraw/svdattr.cxx | 31 ---------------------
svx/source/xoutdev/xattr.cxx | 25 -----------------
svx/source/xoutdev/xattr2.cxx | 17 -----------
sw/inc/fmtfordr.hxx | 1
sw/inc/fmtftntx.hxx | 2 -
sw/inc/fmtsrnd.hxx | 1
sw/inc/formatlinebreak.hxx | 2 -
sw/inc/grfatr.hxx | 2 -
sw/source/core/graphic/grfatr.cxx | 10 ------
sw/source/core/layout/atrfrm.cxx | 15 ----------
sw/source/core/txtnode/attrlinebreak.cxx | 5 ---
56 files changed, 3 insertions(+), 252 deletions(-)
New commits:
commit b6b6b7ec3f4fee4695187bd372e2d60f0ecc6469
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Jun 10 21:05:19 2025 +0500
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Jun 11 12:21:07 2025 +0200
SfxEnumItemInterface::GetValueCount virtual method is unneeded
It is used only for one class, and the place using it knows the
specific type.
Change-Id: I2331169e4844b92e14bcb3daea9a630d608b6341
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186332
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186358
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index fa7109844fec..0fda24224e16 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -370,13 +370,7 @@ IMPL_LINK(SvxConnectionPage, ChangeAttrEditHdl_Impl,
weld::MetricSpinButton&, r,
void SvxConnectionPage::FillTypeLB()
{
// fill ListBox with connector names
- const SfxPoolItem* pItem = GetItem( rOutAttrs, SDRATTR_EDGEKIND );
- const SfxItemPool* pPool = rOutAttrs.GetPool();
-
- if( !pItem )
- pItem = &pPool->GetUserOrPoolDefaultItem( SDRATTR_EDGEKIND );
- const SdrEdgeKindItem* pEdgeKindItem =
&pItem->StaticWhichCast(SDRATTR_EDGEKIND);
- const sal_uInt16 nCount = pEdgeKindItem->GetValueCount();
+ const sal_uInt16 nCount = SdrEdgeKindItem::GetValueCount();
for (sal_uInt16 i = 0; i < nCount; i++)
{
OUString aStr = SdrEdgeKindItem::GetValueTextByPos(i);
diff --git a/editeng/source/items/frmitems.cxx
b/editeng/source/items/frmitems.cxx
index 8408205ad735..58def7907e9f 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -4349,11 +4349,6 @@ SvxFormatBreakItem* SvxFormatBreakItem::Clone(
SfxItemPool* ) const
return new SvxFormatBreakItem( *this );
}
-sal_uInt16 SvxFormatBreakItem::GetValueCount() const
-{
- return sal_uInt16(SvxBreak::End); // SvxBreak::PageBoth + 1
-}
-
SvxFormatKeepItem* SvxFormatKeepItem::Clone( SfxItemPool* ) const
{
return new SvxFormatKeepItem( *this );
diff --git a/editeng/source/items/justifyitem.cxx
b/editeng/source/items/justifyitem.cxx
index 7fe699cb2c36..10efb4228e25 100644
--- a/editeng/source/items/justifyitem.cxx
+++ b/editeng/source/items/justifyitem.cxx
@@ -166,10 +166,6 @@ SvxHorJustifyItem* SvxHorJustifyItem::Clone( SfxItemPool*
) const
return new SvxHorJustifyItem( *this );
}
-sal_uInt16 SvxHorJustifyItem::GetValueCount() const
-{
- return sal_uInt16(SvxCellHorJustify::Repeat) + 1; // Last Enum value + 1
-}
SvxVerJustifyItem::SvxVerJustifyItem( const sal_uInt16 nId ) :
@@ -291,11 +287,6 @@ SvxVerJustifyItem* SvxVerJustifyItem::Clone( SfxItemPool*
) const
return new SvxVerJustifyItem( *this );
}
-sal_uInt16 SvxVerJustifyItem::GetValueCount() const
-{
- return static_cast<sal_uInt16>(SvxCellVerJustify::Bottom) + 1; // Last
Enum value + 1
-}
-
SvxJustifyMethodItem::SvxJustifyMethodItem( const SvxCellJustifyMethod
eJustify,
const sal_uInt16 nId ) :
SfxEnumItem( nId, eJustify )
@@ -360,9 +351,4 @@ SvxJustifyMethodItem* SvxJustifyMethodItem::Clone(
SfxItemPool* ) const
return new SvxJustifyMethodItem( *this );
}
-sal_uInt16 SvxJustifyMethodItem::GetValueCount() const
-{
- return static_cast<sal_uInt16>(SvxCellJustifyMethod::Distribute) + 1; //
Last Enum value + 1
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/items/textitem.cxx
b/editeng/source/items/textitem.cxx
index e9c728fddb69..b9c259dfaec7 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -420,11 +420,6 @@ SvxPostureItem* SvxPostureItem::Clone( SfxItemPool * )
const
return new SvxPostureItem( *this );
}
-sal_uInt16 SvxPostureItem::GetValueCount() const
-{
- return ITALIC_NORMAL + 1; // ITALIC_NONE also belongs here
-}
-
bool SvxPostureItem::GetPresentation
(
@@ -557,11 +552,6 @@ void SvxWeightItem::SetBoolValue( bool bVal )
}
-sal_uInt16 SvxWeightItem::GetValueCount() const
-{
- return WEIGHT_BLACK; // WEIGHT_DONTKNOW does not belong
-}
-
SvxWeightItem* SvxWeightItem::Clone( SfxItemPool * ) const
{
return new SvxWeightItem( *this );
@@ -667,8 +657,6 @@ SvxScriptHintItem::SvxScriptHintItem(const sal_uInt16 nId)
{
}
-sal_uInt16 SvxScriptHintItem::GetValueCount() const { return 5; }
-
SvxScriptHintItem* SvxScriptHintItem::Clone(SfxItemPool*) const
{
return new SvxScriptHintItem(*this);
@@ -1124,11 +1112,6 @@ SvxTextLineItem* SvxTextLineItem::Clone( SfxItemPool * )
const
return new SvxTextLineItem( *this );
}
-sal_uInt16 SvxTextLineItem::GetValueCount() const
-{
- return LINESTYLE_DOTTED + 1; // LINESTYLE_NONE also belongs here
-}
-
bool SvxTextLineItem::GetPresentation
(
@@ -1371,11 +1354,6 @@ void SvxCrossedOutItem::SetBoolValue( bool bVal )
}
-sal_uInt16 SvxCrossedOutItem::GetValueCount() const
-{
- return STRIKEOUT_DOUBLE + 1; // STRIKEOUT_NONE belongs also here
-}
-
SvxCrossedOutItem* SvxCrossedOutItem::Clone( SfxItemPool * ) const
{
return new SvxCrossedOutItem( *this );
@@ -1914,11 +1892,6 @@ SvxCaseMapItem::SvxCaseMapItem( const SvxCaseMap eMap,
const sal_uInt16 nId ) :
{
}
-sal_uInt16 SvxCaseMapItem::GetValueCount() const
-{
- return sal_uInt16(SvxCaseMap::End); // SvxCaseMap::SmallCaps + 1
-}
-
SvxCaseMapItem* SvxCaseMapItem::Clone( SfxItemPool * ) const
{
return new SvxCaseMapItem( *this );
@@ -2147,15 +2120,6 @@ SvxLanguageItem::SvxLanguageItem( const LanguageType
eLang, const sal_uInt16 nId
}
-sal_uInt16 SvxLanguageItem::GetValueCount() const
-{
- // #i50205# got rid of class International
- SAL_WARN( "editeng.items", "SvxLanguageItem::GetValueCount: supposed to
return a count of what?");
- // Could be SvtLanguageTable::GetEntryCount() (all locales with resource
string)?
- // Could be LocaleDataWrapper::getInstalledLanguageTypes() (all locales
with locale data)?
- return 0;
-}
-
SvxLanguageItem* SvxLanguageItem::Clone( SfxItemPool * ) const
{
return new SvxLanguageItem( *this );
@@ -2754,11 +2718,6 @@ OUString SvxCharReliefItem::GetValueTextByPos(sal_uInt16
nPos)
return EditResId(RID_SVXITEMS_RELIEF[nPos]);
}
-sal_uInt16 SvxCharReliefItem::GetValueCount() const
-{
- return std::size(RID_SVXITEMS_RELIEF) - 1;
-}
-
bool SvxCharReliefItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
diff --git a/include/editeng/charreliefitem.hxx
b/include/editeng/charreliefitem.hxx
index b4e0ec16e61a..e5ad26b1189a 100644
--- a/include/editeng/charreliefitem.hxx
+++ b/include/editeng/charreliefitem.hxx
@@ -46,7 +46,6 @@ public:
virtual SvxCharReliefItem* Clone( SfxItemPool *pPool = nullptr ) const
override;
static OUString GetValueTextByPos( sal_uInt16 nPos );
- virtual sal_uInt16 GetValueCount() const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx
index f109558c6608..7dbe8db4c9a8 100644
--- a/include/editeng/cmapitem.hxx
+++ b/include/editeng/cmapitem.hxx
@@ -47,7 +47,6 @@ public:
virtual SvxCaseMapItem* Clone( SfxItemPool *pPool = nullptr ) const
override;
static OUString GetValueTextByPos( sal_uInt16 nPos );
- virtual sal_uInt16 GetValueCount() const override;
// enum cast
SvxCaseMap GetCaseMap() const { return GetValue(); }
diff --git a/include/editeng/crossedoutitem.hxx
b/include/editeng/crossedoutitem.hxx
index 2e85f39c0020..fc75cc183f08 100644
--- a/include/editeng/crossedoutitem.hxx
+++ b/include/editeng/crossedoutitem.hxx
@@ -49,7 +49,6 @@ public:
virtual SvxCrossedOutItem* Clone( SfxItemPool *pPool = nullptr ) const
override;
static OUString GetValueTextByPos( sal_uInt16 nPos );
- 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/editeng/formatbreakitem.hxx
b/include/editeng/formatbreakitem.hxx
index 2e696cae795f..b19ba9b10f1c 100644
--- a/include/editeng/formatbreakitem.hxx
+++ b/include/editeng/formatbreakitem.hxx
@@ -55,7 +55,6 @@ public:
static OUString GetValueTextByPos( sal_uInt16 nPos );
virtual SvxFormatBreakItem* Clone( SfxItemPool *pPool = nullptr ) const
override;
- virtual sal_uInt16 GetValueCount() const override;
SvxBreak GetBreak() const { return GetValue(); }
};
diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx
index 6a7d2623628c..32f3f93474c0 100644
--- a/include/editeng/frmdiritem.hxx
+++ b/include/editeng/frmdiritem.hxx
@@ -54,11 +54,6 @@ public:
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 sal_uInt16 GetValueCount() const override
- {
- return sal_uInt16(SvxFrameDirection::Vertical_RL_TB90) + 1;
- }
-
// SfxPoolItem copy function dichotomy
void dumpAsXml(xmlTextWriterPtr pWriter) const override;
};
diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx
index 82e02932a035..abc1885bd9e8 100644
--- a/include/editeng/justifyitem.hxx
+++ b/include/editeng/justifyitem.hxx
@@ -45,7 +45,6 @@ public:
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 sal_uInt16 GetValueCount() const override;
static OUString GetValueText( SvxCellHorJustify nVal );
virtual SvxHorJustifyItem* Clone( SfxItemPool *pPool = nullptr ) const
override;
@@ -73,7 +72,6 @@ public:
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 sal_uInt16 GetValueCount() const override;
static OUString GetValueText( SvxCellVerJustify nVal );
virtual SvxVerJustifyItem* Clone( SfxItemPool *pPool = nullptr ) const
override;
@@ -97,7 +95,6 @@ public:
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 sal_uInt16 GetValueCount() const override;
static OUString GetValueText( SvxCellJustifyMethod nVal );
virtual SvxJustifyMethodItem* Clone( SfxItemPool *pPool = nullptr ) const
override;
};
diff --git a/include/editeng/langitem.hxx b/include/editeng/langitem.hxx
index 524a3c9af392..06c72394e1be 100644
--- a/include/editeng/langitem.hxx
+++ b/include/editeng/langitem.hxx
@@ -57,7 +57,6 @@ public:
OUString &rText, const IntlWrapper&) const
override;
virtual SvxLanguageItem* Clone( SfxItemPool *pPool = nullptr ) const
override;
- virtual sal_uInt16 GetValueCount() const override;
SvxLanguageItem(SvxLanguageItem const &) = default; // SfxPoolItem copy
function dichotomy
diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx
index 20800f656b8c..ca2f75809539 100644
--- a/include/editeng/postitem.hxx
+++ b/include/editeng/postitem.hxx
@@ -50,7 +50,6 @@ public:
virtual SvxPostureItem* Clone( SfxItemPool *pPool = nullptr ) const
override;
static OUString GetValueTextByPos( sal_uInt16 nPos );
- 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/editeng/scripthintitem.hxx
b/include/editeng/scripthintitem.hxx
index bdf36183d833..bd6a09c0e46e 100644
--- a/include/editeng/scripthintitem.hxx
+++ b/include/editeng/scripthintitem.hxx
@@ -42,7 +42,6 @@ public:
virtual SvxScriptHintItem* Clone(SfxItemPool* pPool = nullptr) const
override;
static OUString GetValueText(i18nutil::ScriptHintType eValue);
- 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/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx
index 703e4e0e39ac..096d3d90df4d 100644
--- a/include/editeng/udlnitem.hxx
+++ b/include/editeng/udlnitem.hxx
@@ -46,7 +46,6 @@ public:
virtual SvxTextLineItem* Clone( SfxItemPool *pPool = nullptr ) const
override;
virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const;
- 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/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx
index 87528d048422..0cd4eaad8a95 100644
--- a/include/editeng/wghtitem.hxx
+++ b/include/editeng/wghtitem.hxx
@@ -50,7 +50,6 @@ public:
virtual SvxWeightItem* Clone( SfxItemPool *pPool = nullptr ) const
override;
static OUString GetValueTextByPos( sal_uInt16 nPos );
- 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/svl/cenumitm.hxx b/include/svl/cenumitm.hxx
index d40d3768a3db..d488423f7138 100644
--- a/include/svl/cenumitm.hxx
+++ b/include/svl/cenumitm.hxx
@@ -43,8 +43,6 @@ public:
virtual bool PutValue(const css::uno::Any & rVal, sal_uInt8 ) override;
- virtual sal_uInt16 GetValueCount() const = 0;
-
virtual sal_uInt16 GetEnumValue() const = 0;
virtual void SetEnumValue(sal_uInt16 nValue) = 0;
diff --git a/include/svx/RectangleAlignmentItem.hxx
b/include/svx/RectangleAlignmentItem.hxx
index 24fa546d0e02..42cf3aebc689 100644
--- a/include/svx/RectangleAlignmentItem.hxx
+++ b/include/svx/RectangleAlignmentItem.hxx
@@ -37,8 +37,6 @@ public:
SvxRectangleAlignmentItem& operator=(SvxRectangleAlignmentItem&&) = delete;
virtual SvxRectangleAlignmentItem* Clone(SfxItemPool* pPool = nullptr)
const override;
-
- virtual sal_uInt16 GetValueCount() const override;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx
index 08a78123bc87..0a825bca030f 100644
--- a/include/svx/algitem.hxx
+++ b/include/svx/algitem.hxx
@@ -47,7 +47,6 @@ public:
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 sal_uInt16 GetValueCount() const override;
static OUString GetValueText( SvxCellOrientation nVal );
virtual SvxOrientationItem* Clone( SfxItemPool *pPool = nullptr ) const
override;
diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx
index db15b92ad331..5fa196fd5a50 100644
--- a/include/svx/chrtitem.hxx
+++ b/include/svx/chrtitem.hxx
@@ -85,8 +85,6 @@ public:
TypedWhichId<SvxChartRegressItem> nId );
virtual SvxChartRegressItem* Clone(SfxItemPool* pPool = nullptr) const
override;
-
- sal_uInt16 GetValueCount() const override { return CHREGRESS_COUNT; }
};
class SAL_WARN_UNUSED UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC)
SvxChartTextOrderItem final : public SfxEnumItem<SvxChartTextOrder>
@@ -100,8 +98,6 @@ public:
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;
-
- sal_uInt16 GetValueCount() const override { return CHTXTORDER_COUNT; }
};
class SAL_WARN_UNUSED UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC)
SvxChartKindErrorItem final : public SfxEnumItem<SvxChartKindError>
@@ -112,8 +108,6 @@ public:
TypedWhichId<SvxChartKindErrorItem> nId );
virtual SvxChartKindErrorItem* Clone(SfxItemPool* pPool = nullptr) const
override;
-
- sal_uInt16 GetValueCount() const override { return CHERROR_COUNT; }
};
class SAL_WARN_UNUSED UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SvxChartIndicateItem
final : public SfxEnumItem<SvxChartIndicate>
@@ -124,8 +118,6 @@ public:
TypedWhichId<SvxChartIndicateItem> nId );
virtual SvxChartIndicateItem* Clone(SfxItemPool* pPool = nullptr) const
override;
-
- sal_uInt16 GetValueCount() const override { return CHINDICATE_COUNT; }
};
class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxDoubleItem final : public
SfxPoolItem
diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx
index ff8af7ed7c53..3945b2a96f19 100644
--- a/include/svx/rotmodit.hxx
+++ b/include/svx/rotmodit.hxx
@@ -44,7 +44,6 @@ public:
SvxRotateModeItem( const SvxRotateModeItem& rItem );
virtual ~SvxRotateModeItem() override;
- virtual sal_uInt16 GetValueCount() const override;
virtual SvxRotateModeItem* Clone( SfxItemPool *pPool = nullptr ) const
override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx
index 89b0bfa951b3..a04d70a09c6c 100644
--- a/include/svx/sdgmoitm.hxx
+++ b/include/svx/sdgmoitm.hxx
@@ -40,7 +40,6 @@ public:
SdrGrafModeItem( GraphicDrawMode eMode =
GraphicDrawMode::Standard ) : SdrGrafModeItem_Base( eMode ) {}
SAL_DLLPRIVATE virtual SdrGrafModeItem* Clone( SfxItemPool* pPool =
nullptr ) const override;
- SAL_DLLPRIVATE virtual sal_uInt16 GetValueCount() const override;
SAL_DLLPRIVATE static OUString GetValueTextByPos( sal_uInt16 nPos
);
SAL_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres,
diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx
index 61b9ab7e4a9d..a4197866a765 100644
--- a/include/svx/sdtaditm.hxx
+++ b/include/svx/sdtaditm.hxx
@@ -37,7 +37,6 @@ public:
SdrTextAniDirectionItem(SdrTextAniDirection eDir=SdrTextAniDirection::Left)
: SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION, eDir) {}
virtual SdrTextAniDirectionItem* Clone(SfxItemPool* pPool=nullptr) const
override;
- 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 b0e5d3da3f7f..6f78ce9ce9c5 100644
--- a/include/svx/sdtaitm.hxx
+++ b/include/svx/sdtaitm.hxx
@@ -40,7 +40,6 @@ public:
SdrTextVertAdjustItem(SdrTextVertAdjust eAdj,
TypedWhichId<SdrTextVertAdjustItem> nWhich)
: SfxEnumItem(nWhich, eAdj) {}
virtual SdrTextVertAdjustItem* Clone(SfxItemPool* pPool=nullptr) 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;
@@ -65,7 +64,6 @@ public:
SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK):
SfxEnumItem(SDRATTR_TEXT_HORZADJUST, eAdj) {}
virtual SdrTextHorzAdjustItem* Clone(SfxItemPool* pPool=nullptr) const
override;
- 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/sdtakitm.hxx b/include/svx/sdtakitm.hxx
index bc867b4dc410..a840437bf90d 100644
--- a/include/svx/sdtakitm.hxx
+++ b/include/svx/sdtakitm.hxx
@@ -82,7 +82,6 @@ public:
SdrTextAniKindItem(SdrTextAniKind eKind=SdrTextAniKind::NONE)
: SfxEnumItem(SDRATTR_TEXT_ANIKIND, eKind) {}
virtual SdrTextAniKindItem* Clone(SfxItemPool* pPool=nullptr) 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;
diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx
index 3b4dba561f65..524cb20c8beb 100644
--- a/include/svx/sdtfsitm.hxx
+++ b/include/svx/sdtfsitm.hxx
@@ -50,7 +50,6 @@ public:
virtual SdrTextFitToSizeTypeItem* Clone(SfxItemPool* pPool=nullptr) const
override;
bool operator==(const SfxPoolItem& rItem) const override;
- 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/sxcecitm.hxx b/include/svx/sxcecitm.hxx
index ec9335c498b9..14a6c6397e6e 100644
--- a/include/svx/sxcecitm.hxx
+++ b/include/svx/sxcecitm.hxx
@@ -36,7 +36,6 @@ public:
SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SdrCaptionEscDir::Horizontal)
: SfxEnumItem(SDRATTR_CAPTIONESCDIR, eDir) {}
SAL_DLLPRIVATE virtual SdrCaptionEscDirItem* Clone(SfxItemPool*
pPool=nullptr) const override;
- SAL_DLLPRIVATE virtual sal_uInt16 GetValueCount() const override; //
{ return 3; }
SAL_DLLPRIVATE static OUString GetValueTextByPos(sal_uInt16 nPos);
diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx
index 9cde9ca99a05..00ee89996083 100644
--- a/include/svx/sxctitm.hxx
+++ b/include/svx/sxctitm.hxx
@@ -33,7 +33,6 @@ public:
SdrCaptionTypeItem(SdrCaptionType eStyle=SdrCaptionType::Type3)
: SfxEnumItem(SDRATTR_CAPTIONTYPE, eStyle) {}
SAL_DLLPRIVATE virtual SdrCaptionTypeItem* Clone(SfxItemPool*
pPool=nullptr) const override;
- SAL_DLLPRIVATE virtual sal_uInt16 GetValueCount() const override; //
{ return 4; }
SAL_DLLPRIVATE static OUString GetValueTextByPos(sal_uInt16 nPos);
SAL_DLLPRIVATE virtual bool GetPresentation(SfxItemPresentation ePres,
MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&)
const override;
};
diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx
index df6be79f8a5f..cc4e2cd458db 100644
--- a/include/svx/sxekitm.hxx
+++ b/include/svx/sxekitm.hxx
@@ -34,7 +34,7 @@ public:
SdrEdgeKindItem(SdrEdgeKind eStyle=SdrEdgeKind::OrthoLines)
: SfxEnumItem(SDRATTR_EDGEKIND, eStyle) {}
SAL_DLLPRIVATE virtual SdrEdgeKindItem* Clone(SfxItemPool* pPool=nullptr)
const override;
- virtual sal_uInt16 GetValueCount() const override; // { return 5; }
+ static sal_uInt16 GetValueCount();
SAL_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) const override;
SAL_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal,
sal_uInt8 nMemberId ) override;
static OUString GetValueTextByPos(sal_uInt16 nPos);
diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx
index ac483bd16ce2..eb90de736a48 100644
--- a/include/svx/sxmtpitm.hxx
+++ b/include/svx/sxmtpitm.hxx
@@ -33,7 +33,6 @@ public:
{
}
SAL_DLLPRIVATE virtual SdrMeasureTextHPosItem* Clone(SfxItemPool*
pPool=nullptr) const override;
- SAL_DLLPRIVATE virtual sal_uInt16 GetValueCount() const override; // {
return 4; }
SAL_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8
nMemberId = 0 ) const override;
SAL_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8
nMemberId ) override;
@@ -50,7 +49,6 @@ public:
{
}
SAL_DLLPRIVATE virtual SdrMeasureTextVPosItem* Clone(SfxItemPool*
pPool=nullptr) const override;
- SAL_DLLPRIVATE virtual sal_uInt16 GetValueCount() const override; // {
return 5; }
SAL_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8
nMemberId = 0 ) const override;
SAL_DLLPRIVATE 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 3aab0c799c27..3b51cd07b4b8 100644
--- a/include/svx/sxmuitm.hxx
+++ b/include/svx/sxmuitm.hxx
@@ -32,7 +32,6 @@ public:
SdrMeasureUnitItem(FieldUnit eUnit=FieldUnit::NONE)
: SfxEnumItem(SDRATTR_MEASUREUNIT, eUnit) {}
SAL_DLLPRIVATE virtual SdrMeasureUnitItem* Clone(SfxItemPool*
pPool=nullptr) const override;
- SAL_DLLPRIVATE virtual sal_uInt16 GetValueCount() const override; // {
return 14; }
SAL_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) const override;
SAL_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal,
sal_uInt8 nMemberId ) override;
diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx
index 5afefbe3ab12..f7b8787a5b51 100644
--- a/include/svx/xfillit0.hxx
+++ b/include/svx/xfillit0.hxx
@@ -45,7 +45,6 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const
override;
- virtual sal_uInt16 GetValueCount() const override;
void dumpAsXml(xmlTextWriterPtr pWriter) const override;
virtual boost::property_tree::ptree dumpAsJSON() const override;
diff --git a/include/svx/xflbmpit.hxx b/include/svx/xflbmpit.hxx
index 3c9f2b9247d9..bfc812e07df7 100644
--- a/include/svx/xflbmpit.hxx
+++ b/include/svx/xflbmpit.hxx
@@ -37,7 +37,6 @@ public:
MapUnit ePresMetric,
OUString &rText, const
IntlWrapper& ) const override;
- SVX_DLLPRIVATE virtual sal_uInt16 GetValueCount() const override;
void dumpAsXml(xmlTextWriterPtr pWriter) const override;
};
diff --git a/include/svx/xftadit.hxx b/include/svx/xftadit.hxx
index 556deed23eb3..67233bcb0855 100644
--- a/include/svx/xftadit.hxx
+++ b/include/svx/xftadit.hxx
@@ -38,7 +38,6 @@ public:
DECLARE_ITEM_TYPE_FUNCTION(XFormTextAdjustItem)
XFormTextAdjustItem(XFormTextAdjust =
XFormTextAdjust::Center);
virtual XFormTextAdjustItem* Clone(SfxItemPool* pPool = nullptr) const
override;
- 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 731add6ab5aa..c6c2cc5cce9d 100644
--- a/include/svx/xftshit.hxx
+++ b/include/svx/xftshit.hxx
@@ -38,7 +38,6 @@ public:
DECLARE_ITEM_TYPE_FUNCTION(XFormTextShadowItem)
XFormTextShadowItem(XFormTextShadow =
XFormTextShadow::NONE);
virtual XFormTextShadowItem* Clone(SfxItemPool* pPool = nullptr) const
override;
- 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 a0ad3e1ff5ea..034c046c60c4 100644
--- a/include/svx/xlineit0.hxx
+++ b/include/svx/xlineit0.hxx
@@ -41,7 +41,6 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const
override;
- virtual sal_uInt16 GetValueCount() const override;
};
#endif
diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx
index c6cba9573201..d5690a6a7a2a 100644
--- a/include/svx/xlinjoit.hxx
+++ b/include/svx/xlinjoit.hxx
@@ -41,8 +41,6 @@ public:
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric, MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const
override;
-
- virtual sal_uInt16 GetValueCount() const override;
};
#endif // INCLUDED_SVX_XLINJOIT_HXX
diff --git a/include/svx/xlncapit.hxx b/include/svx/xlncapit.hxx
index 0fd440f58c40..753c324fb0af 100644
--- a/include/svx/xlncapit.hxx
+++ b/include/svx/xlncapit.hxx
@@ -43,7 +43,6 @@ public:
OUString &rText, const IntlWrapper& ) const
override;
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 47d67400b322..c0e0970197fe 100644
--- a/include/svx/xtextit0.hxx
+++ b/include/svx/xtextit0.hxx
@@ -37,7 +37,6 @@ public:
DECLARE_ITEM_TYPE_FUNCTION(XFormTextStyleItem)
XFormTextStyleItem(XFormTextStyle =
XFormTextStyle::NONE);
virtual XFormTextStyleItem* Clone(SfxItemPool* pPool = nullptr) const
override;
- 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/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index f899f927c1ec..5bff67fafcb5 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -212,7 +212,6 @@ public:
ScViewObjectModeItem & operator =(ScViewObjectModeItem const &) = delete;
// due to SfxEnumItem<ScVObjMode>
ScViewObjectModeItem & operator =(ScViewObjectModeItem &&) = delete; //
due to SfxEnumItem<ScVObjMode>
- virtual sal_uInt16 GetValueCount() const override;
virtual ScViewObjectModeItem* Clone( SfxItemPool *pPool = nullptr ) const
override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index 058acab463c1..e70ed96c19d4 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -575,11 +575,6 @@ bool ScViewObjectModeItem::GetPresentation
return false;
}
-sal_uInt16 ScViewObjectModeItem::GetValueCount() const
-{
- return 2;
-}
-
ScViewObjectModeItem* ScViewObjectModeItem::Clone( SfxItemPool* ) const
{
return new ScViewObjectModeItem( *this );
diff --git a/svx/inc/sxcikitm.hxx b/svx/inc/sxcikitm.hxx
index ffbda1421732..9fbca3fb5d83 100644
--- a/svx/inc/sxcikitm.hxx
+++ b/svx/inc/sxcikitm.hxx
@@ -29,7 +29,6 @@ public:
SdrCircKindItem(SdrCircKind eKind=SdrCircKind::Full)
: SfxEnumItem(SDRATTR_CIRCKIND, eKind) {}
virtual SdrCircKindItem* Clone(SfxItemPool* pPool=nullptr) const override;
- 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;
diff --git a/svx/inc/sxmkitm.hxx b/svx/inc/sxmkitm.hxx
index ff5157cb7c0c..1c400deeef70 100644
--- a/svx/inc/sxmkitm.hxx
+++ b/svx/inc/sxmkitm.hxx
@@ -32,7 +32,6 @@ public:
SdrMeasureKindItem()
: SfxEnumItem(SDRATTR_MEASUREKIND, SDRMEASURE_STD) {}
virtual SdrMeasureKindItem* Clone(SfxItemPool* pPool=nullptr) const
override;
- virtual sal_uInt16 GetValueCount() const override; // { return 2; }
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/svx/source/items/RectangleAlignmentItem.cxx
b/svx/source/items/RectangleAlignmentItem.cxx
index 3b0b7b0f1081..62599bff44c9 100644
--- a/svx/source/items/RectangleAlignmentItem.cxx
+++ b/svx/source/items/RectangleAlignmentItem.cxx
@@ -23,9 +23,4 @@ SvxRectangleAlignmentItem*
SvxRectangleAlignmentItem::Clone(SfxItemPool*) const
return new SvxRectangleAlignmentItem(*this);
}
-sal_uInt16 SvxRectangleAlignmentItem::GetValueCount() const
-{
- return model::RECTANGLE_ALIGNMENT_COUNT;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index e7a784b90b3c..ad153199ff0c 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -120,11 +120,6 @@ SvxOrientationItem* SvxOrientationItem::Clone(
SfxItemPool* ) const
return new SvxOrientationItem( *this );
}
-sal_uInt16 SvxOrientationItem::GetValueCount() const
-{
- return static_cast<sal_uInt16>(SvxCellOrientation::Stacked) + 1; // last
enum value + 1
-}
-
bool SvxOrientationItem::IsStacked() const
{
return GetValue() == SvxCellOrientation::Stacked;
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index eb559fdaeb62..8c2860dcd233 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -74,11 +74,6 @@ bool SvxRotateModeItem::GetPresentation(
return false;
}
-sal_uInt16 SvxRotateModeItem::GetValueCount() const
-{
- return 4; // STANDARD, TOP, CENTER, BOTTOM
-}
-
SvxRotateModeItem* SvxRotateModeItem::Clone( SfxItemPool* ) const
{
return new SvxRotateModeItem( *this );
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 413f149452d0..e2e0eb9e0b0b 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -1074,8 +1074,6 @@ void SdrMetricItem::dumpAsXml(xmlTextWriterPtr pWriter)
const
SdrCaptionTypeItem* SdrCaptionTypeItem::Clone(SfxItemPool* /*pPool*/) const
{ return new SdrCaptionTypeItem(*this); }
-sal_uInt16 SdrCaptionTypeItem::GetValueCount() const { return 4; }
-
OUString SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos)
{
static TranslateId ITEMVALCAPTIONTYPES[] =
@@ -1102,8 +1100,6 @@ bool
SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePres,
SdrCaptionEscDirItem* SdrCaptionEscDirItem::Clone(SfxItemPool* /*pPool*/)
const { return new SdrCaptionEscDirItem(*this); }
-sal_uInt16 SdrCaptionEscDirItem::GetValueCount() const { return 3; }
-
OUString SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos)
{
static TranslateId ITEMVALCAPTIONTYPES[] =
@@ -1147,8 +1143,6 @@ bool SdrTextFitToSizeTypeItem::operator==(const
SfxPoolItem& rItem) const
&& mfSpacingScale == rTextFitToSizeTypeItem.mfSpacingScale;
}
-sal_uInt16 SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; }
-
OUString SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos)
{
static TranslateId ITEMVALFITTISIZETYPES[] =
@@ -1209,8 +1203,6 @@ bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any&
rVal, sal_uInt8 /*nMemb
SdrTextVertAdjustItem* SdrTextVertAdjustItem::Clone(SfxItemPool* /*pPool*/)
const { return new SdrTextVertAdjustItem(*this); }
-sal_uInt16 SdrTextVertAdjustItem::GetValueCount() const { return 5; }
-
OUString SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos)
{
static TranslateId ITEMVALTEXTVADJTYPES[] =
@@ -1268,8 +1260,6 @@ void SdrTextVertAdjustItem::dumpAsXml(xmlTextWriterPtr
pWriter) const
SdrTextHorzAdjustItem* SdrTextHorzAdjustItem::Clone(SfxItemPool* /*pPool*/)
const { return new SdrTextHorzAdjustItem(*this); }
-sal_uInt16 SdrTextHorzAdjustItem::GetValueCount() const { return 5; }
-
OUString SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos)
{
static TranslateId ITEMVALTEXTHADJTYPES[] =
@@ -1320,8 +1310,6 @@ bool SdrTextHorzAdjustItem::PutValue( const uno::Any&
rVal, sal_uInt8 /*nMemberI
SdrTextAniKindItem* SdrTextAniKindItem::Clone(SfxItemPool* /*pPool*/) const
{ return new SdrTextAniKindItem(*this); }
-sal_uInt16 SdrTextAniKindItem::GetValueCount() const { return 5; }
-
OUString SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos)
{
static TranslateId ITEMVALTEXTANITYPES[] =
@@ -1371,8 +1359,6 @@ bool SdrTextAniKindItem::PutValue( const uno::Any& rVal,
sal_uInt8 /*nMemberId*/
SdrTextAniDirectionItem* SdrTextAniDirectionItem::Clone(SfxItemPool*
/*pPool*/) const { return new SdrTextAniDirectionItem(*this); }
-sal_uInt16 SdrTextAniDirectionItem::GetValueCount() const { return 4; }
-
OUString SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos)
{
static TranslateId ITEMVALTEXTANITYPES[] =
@@ -1524,7 +1510,7 @@ bool SdrTextFixedCellHeightItem::PutValue( const
uno::Any& rVal, sal_uInt8 /*nMe
SdrEdgeKindItem* SdrEdgeKindItem::Clone(SfxItemPool* /*pPool*/) const
{ return new SdrEdgeKindItem(*this); }
-sal_uInt16 SdrEdgeKindItem::GetValueCount() const { return 4; }
+sal_uInt16 SdrEdgeKindItem::GetValueCount() { return 4; }
OUString SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos)
{
@@ -1692,8 +1678,6 @@ SdrEdgeNode2GlueDistItem*
SdrEdgeNode2GlueDistItem::Clone(SfxItemPool* /*pPool*/
SdrMeasureKindItem* SdrMeasureKindItem::Clone(SfxItemPool* /*pPool*/) const
{ return new SdrMeasureKindItem(*this); }
-sal_uInt16 SdrMeasureKindItem::GetValueCount() const { return 2; }
-
OUString SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos)
{
static TranslateId ITEMVALMEASURETYPES[] =
@@ -1740,8 +1724,6 @@ bool SdrMeasureKindItem::PutValue( const uno::Any& rVal,
sal_uInt8 /*nMemberId*/
SdrMeasureTextHPosItem* SdrMeasureTextHPosItem::Clone(SfxItemPool* /*pPool*/)
const { return new SdrMeasureTextHPosItem(*this); }
-sal_uInt16 SdrMeasureTextHPosItem::GetValueCount() const { return 4; }
-
const OUString & SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos)
{
static std::array<OUString, 4> aMeasureTextHPosItem
@@ -1789,8 +1771,6 @@ bool SdrMeasureTextHPosItem::PutValue( const uno::Any&
rVal, sal_uInt8 /*nMember
SdrMeasureTextVPosItem* SdrMeasureTextVPosItem::Clone(SfxItemPool* /*pPool*/)
const { return new SdrMeasureTextVPosItem(*this); }
-sal_uInt16 SdrMeasureTextVPosItem::GetValueCount() const { return 5; }
-
OUString SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos)
{
static TranslateId ITEMVALMEASURETEXTTYPES[] =
@@ -1839,8 +1819,6 @@ bool SdrMeasureTextVPosItem::PutValue( const uno::Any&
rVal, sal_uInt8 /*nMember
SdrMeasureUnitItem* SdrMeasureUnitItem::Clone(SfxItemPool* /*pPool*/) const
{ return new SdrMeasureUnitItem(*this); }
-sal_uInt16 SdrMeasureUnitItem::GetValueCount() const { return 14; }
-
OUString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos)
{
if(static_cast<FieldUnit>(nPos) == FieldUnit::NONE)
@@ -1878,8 +1856,6 @@ bool SdrMeasureUnitItem::PutValue( const uno::Any& rVal,
sal_uInt8 /*nMemberId*/
SdrCircKindItem* SdrCircKindItem::Clone(SfxItemPool* /*pPool*/) const
{ return new SdrCircKindItem(*this); }
-sal_uInt16 SdrCircKindItem::GetValueCount() const { return 4; }
-
OUString SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos)
{
static TranslateId ITEMVALCIRCTYPES[] =
@@ -2006,11 +1982,6 @@ SdrGrafModeItem* SdrGrafModeItem::Clone(SfxItemPool*
/*pPool*/) const
return new SdrGrafModeItem( *this );
}
-sal_uInt16 SdrGrafModeItem::GetValueCount() const
-{
- return 4;
-}
-
OUString SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos)
{
OUString aStr;
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 8f338000dd25..39dc2e26370c 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -483,11 +483,6 @@ bool XLineStyleItem::PutValue( const css::uno::Any& rVal,
sal_uInt8 /*nMemberId*
return true;
}
-sal_uInt16 XLineStyleItem::GetValueCount() const
-{
- return 3;
-}
-
XDash::XDash(css::drawing::DashStyle eTheDash, sal_uInt16 nTheDots, double
nTheDotLen,
sal_uInt16 nTheDashes, double nTheDashLen, double nTheDistance) :
m_eDash(eTheDash),
@@ -1742,11 +1737,6 @@ bool XFillStyleItem::GetPresentation
return true;
}
-sal_uInt16 XFillStyleItem::GetValueCount() const
-{
- return 5;
-}
-
bool XFillStyleItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
const
{
css::drawing::FillStyle eFS = GetValue();
@@ -2705,11 +2695,6 @@ XFormTextStyleItem*
XFormTextStyleItem::Clone(SfxItemPool* /*pPool*/) const
return new XFormTextStyleItem( *this );
}
-sal_uInt16 XFormTextStyleItem::GetValueCount() const
-{
- return 5;
-}
-
bool XFormTextStyleItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/)
const
{
rVal <<= static_cast<sal_Int32>(GetValue());
@@ -2738,11 +2723,6 @@ XFormTextAdjustItem*
XFormTextAdjustItem::Clone(SfxItemPool* /*pPool*/) const
return new XFormTextAdjustItem( *this );
}
-sal_uInt16 XFormTextAdjustItem::GetValueCount() const
-{
- return 4;
-}
-
bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/)
const
{
rVal <<= static_cast<sal_Int32>(GetValue());
@@ -2819,11 +2799,6 @@ XFormTextShadowItem*
XFormTextShadowItem::Clone(SfxItemPool* /*pPool*/) const
return new XFormTextShadowItem( *this );
}
-sal_uInt16 XFormTextShadowItem::GetValueCount() const
-{
- return 3;
-}
-
bool XFormTextShadowItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/)
const
{
rVal <<= static_cast<sal_Int32>(GetValue());
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index e9ba8d59bb37..47bc2ecc9587 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -162,12 +162,6 @@ bool XLineJointItem::PutValue( const css::uno::Any& rVal,
sal_uInt8 /*nMemberId*
return true;
}
-sal_uInt16 XLineJointItem::GetValueCount() const
-{
- // don't forget to update the api interface also
- return 5;
-}
-
AffineMatrixItem::AffineMatrixItem(const css::geometry::AffineMatrix2D*
pMatrix)
: SfxPoolItem(SID_ATTR_TRANSFORM_MATRIX)
@@ -312,12 +306,6 @@ bool XLineCapItem::PutValue( const css::uno::Any& rVal,
sal_uInt8 /*nMemberId*/)
return true;
}
-sal_uInt16 XLineCapItem::GetValueCount() const
-{
- // don't forget to update the api interface also
- return 3;
-}
-
css::drawing::LineCap XLineCapItem::GetValue() const
{
const css::drawing::LineCap eRetval(SfxEnumItem::GetValue());
@@ -461,11 +449,6 @@ bool XFillBmpPosItem::GetPresentation
return true;
}
-sal_uInt16 XFillBmpPosItem::GetValueCount() const
-{
- return 9;
-}
-
void XFillBmpPosItem::dumpAsXml(xmlTextWriterPtr pWriter) const
{
(void)xmlTextWriterStartElement(pWriter, BAD_CAST("XFillBmpPosItem"));
diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx
index 9d063d2dfff1..dffdf36c1c9c 100644
--- a/sw/inc/fmtfordr.hxx
+++ b/sw/inc/fmtfordr.hxx
@@ -44,7 +44,6 @@ public:
/// "Pure virtual methods" of SfxPoolItem.
virtual SwFormatFillOrder* Clone( SfxItemPool *pPool = nullptr ) const
override;
- virtual sal_uInt16 GetValueCount() const override;
};
inline const SwFormatFillOrder &SwAttrSet::GetFillOrder(bool bInP) const
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index 601879239bb1..f031b0fa5935 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -54,8 +54,6 @@ protected:
virtual SfxItemType ItemType() const override = 0;
public:
- virtual sal_uInt16 GetValueCount() const override;
-
virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8
nMemberId = 0 ) const override;
diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx
index e51080ba9b9c..767dbff044cf 100644
--- a/sw/inc/fmtsrnd.hxx
+++ b/sw/inc/fmtsrnd.hxx
@@ -40,7 +40,6 @@ public:
// "Pure virtual Methods" of SfxPoolItem.
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SwFormatSurround* Clone( SfxItemPool* pPool = nullptr ) const
override;
- virtual sal_uInt16 GetValueCount() const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
diff --git a/sw/inc/formatlinebreak.hxx b/sw/inc/formatlinebreak.hxx
index 7eff6c8f1008..527c57370f11 100644
--- a/sw/inc/formatlinebreak.hxx
+++ b/sw/inc/formatlinebreak.hxx
@@ -65,8 +65,6 @@ public:
/// See SfxPoolItem::Clone().
SwFormatLineBreak* Clone(SfxItemPool* pPool = nullptr) const override;
- sal_uInt16 GetValueCount() const override;
-
rtl::Reference<SwXTextRange> GetAnchor() const;
void SetTextLineBreak(SwTextLineBreak* pTextAttr) { m_pTextAttr =
pTextAttr; }
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index 62f7585fec56..5eacf5d48004 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -50,7 +50,6 @@ public:
virtual SwMirrorGrf* Clone( SfxItemPool *pPool = nullptr ) const override;
// pure virtual methods of SfxEnumItem
- virtual sal_uInt16 GetValueCount() const override;
virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
@@ -283,7 +282,6 @@ public:
virtual SwDrawModeGrf* Clone( SfxItemPool *pPool = nullptr ) const
override;
// pure virtual methods of SfxEnumItem
- virtual sal_uInt16 GetValueCount() const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
diff --git a/sw/source/core/graphic/grfatr.cxx
b/sw/source/core/graphic/grfatr.cxx
index 959ee212e053..bb1e1e1af34d 100644
--- a/sw/source/core/graphic/grfatr.cxx
+++ b/sw/source/core/graphic/grfatr.cxx
@@ -34,11 +34,6 @@ SwMirrorGrf* SwMirrorGrf::Clone( SfxItemPool* ) const
return new SwMirrorGrf( *this );
}
-sal_uInt16 SwMirrorGrf::GetValueCount() const
-{
- return 4;
-}
-
bool SwMirrorGrf::operator==( const SfxPoolItem& rItem) const
{
return SfxEnumItem::operator==(rItem) &&
@@ -309,11 +304,6 @@ SwDrawModeGrf* SwDrawModeGrf::Clone( SfxItemPool * ) const
// SwDrawModeGrf
-sal_uInt16 SwDrawModeGrf::GetValueCount() const
-{
- return sal_uInt16(GraphicDrawMode::Watermark) + 1;
-}
-
bool SwDrawModeGrf::QueryValue( uno::Any& rVal,
sal_uInt8 ) const
{
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 759a2fc89261..cc5bcf24599f 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -494,11 +494,6 @@ SwFormatFillOrder* SwFormatFillOrder::Clone( SfxItemPool*
) const
return new SwFormatFillOrder( GetValue() );
}
-sal_uInt16 SwFormatFillOrder::GetValueCount() const
-{
- return SW_FILL_ORDER_END - SW_FILL_ORDER_BEGIN;
-}
-
// Partially implemented inline in hxx
SwFormatHeader::SwFormatHeader( SwFrameFormat *pHeaderFormat )
: SfxPoolItem( RES_HEADER ),
@@ -1340,11 +1335,6 @@ SwFormatSurround* SwFormatSurround::Clone( SfxItemPool*
) const
return new SwFormatSurround( *this );
}
-sal_uInt16 SwFormatSurround::GetValueCount() const
-{
- return 6;
-}
-
bool SwFormatSurround::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// here we convert always!
@@ -2106,11 +2096,6 @@ void
SwFormatNoBalancedColumns::dumpAsXml(xmlTextWriterPtr pWriter) const
// class SwFormatFootnoteEndAtTextEnd
-sal_uInt16 SwFormatFootnoteEndAtTextEnd::GetValueCount() const
-{
- return sal_uInt16( FTNEND_ATTXTEND_END );
-}
-
SwFormatFootnoteEndAtTextEnd& SwFormatFootnoteEndAtTextEnd::operator=(
const SwFormatFootnoteEndAtTextEnd& rAttr )
{
diff --git a/sw/source/core/txtnode/attrlinebreak.cxx
b/sw/source/core/txtnode/attrlinebreak.cxx
index af9f94848656..2f061bf7c1be 100644
--- a/sw/source/core/txtnode/attrlinebreak.cxx
+++ b/sw/source/core/txtnode/attrlinebreak.cxx
@@ -57,11 +57,6 @@ SwFormatLineBreak* SwFormatLineBreak::Clone(SfxItemPool*)
const
return new SwFormatLineBreak(GetValue());
}
-sal_uInt16 SwFormatLineBreak::GetValueCount() const
-{
- return static_cast<sal_uInt16>(SwLineBreakClear::LAST) + 1;
-}
-
rtl::Reference<SwXTextRange> SwFormatLineBreak::GetAnchor() const
{
SolarMutexGuard aGuard;
