[Libreoffice-commits] core.git: include/editeng include/svl include/svtools include/svx svl/source svx/inc
Noel Grandin
noel.grandin at collabora.co.uk
Thu Mar 29 06:35:49 UTC 2018
include/editeng/adjustitem.hxx | 2 +-
include/editeng/charreliefitem.hxx | 2 +-
include/editeng/cmapitem.hxx | 2 +-
include/editeng/crossedoutitem.hxx | 2 +-
include/editeng/escapementitem.hxx | 2 +-
include/editeng/formatbreakitem.hxx | 2 +-
include/editeng/lspcitem.hxx | 2 +-
include/editeng/postitem.hxx | 2 +-
include/editeng/shaditem.hxx | 2 +-
include/editeng/udlnitem.hxx | 2 +-
include/editeng/wghtitem.hxx | 2 +-
include/svl/aeitem.hxx | 4 ++--
include/svl/cenumitm.hxx | 4 ----
include/svtools/treelist.hxx | 4 ----
include/svtools/treelistbox.hxx | 3 +--
include/svx/sdgmoitm.hxx | 2 +-
include/svx/sdtaditm.hxx | 2 +-
include/svx/sdtaitm.hxx | 4 ++--
include/svx/sdtakitm.hxx | 2 +-
include/svx/sdtfsitm.hxx | 2 +-
include/svx/sxcecitm.hxx | 2 +-
include/svx/sxctitm.hxx | 2 +-
include/svx/sxekitm.hxx | 2 +-
include/svx/sxmtpitm.hxx | 4 ++--
include/svx/sxmuitm.hxx | 2 +-
svl/source/items/cenumitm.cxx | 12 ------------
svx/inc/sxcikitm.hxx | 2 +-
svx/inc/sxmkitm.hxx | 2 +-
28 files changed, 28 insertions(+), 49 deletions(-)
New commits:
commit 63c6668f06ca5921432020b5a527e43c251e5154
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Mar 28 15:35:52 2018 +0200
loplugin:virtualdown in svl,svtools
I expect a lot of the overriding methods will be removed as soon as I
run the unusedmethods plugin
Change-Id: I4fb228724fcfba51a98d2113efb93cec1bc15c7c
Reviewed-on: https://gerrit.libreoffice.org/52006
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx
index 7ef144c78d8a..a335ab5e0c76 100644
--- a/include/editeng/adjustitem.hxx
+++ b/include/editeng/adjustitem.hxx
@@ -63,7 +63,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
virtual sal_uInt16 GetValueCount() const override;
- virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
+ virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual sal_uInt16 GetEnumValue() const override;
virtual void SetEnumValue( sal_uInt16 nNewVal ) override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
diff --git a/include/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx
index cb63498f66db..8abe6c5e9455 100644
--- a/include/editeng/charreliefitem.hxx
+++ b/include/editeng/charreliefitem.hxx
@@ -42,7 +42,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override;
- virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
+ virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual sal_uInt16 GetValueCount() const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx
index 57863ecdde1b..13b68875ffc1 100644
--- a/include/editeng/cmapitem.hxx
+++ b/include/editeng/cmapitem.hxx
@@ -47,7 +47,7 @@ public:
OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
- virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
+ virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual sal_uInt16 GetValueCount() const override;
SvxCaseMapItem& operator=(const SvxCaseMapItem& rMap)
diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx
index 6e460cd869ca..fa1d79ab7ef7 100644
--- a/include/editeng/crossedoutitem.hxx
+++ b/include/editeng/crossedoutitem.hxx
@@ -48,7 +48,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 OUString GetValueTextByPos( sal_uInt16 nPos ) 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/escapementitem.hxx b/include/editeng/escapementitem.hxx
index ba46ec1ed201..59450669512b 100644
--- a/include/editeng/escapementitem.hxx
+++ b/include/editeng/escapementitem.hxx
@@ -98,7 +98,7 @@ public:
}
virtual sal_uInt16 GetValueCount() const override;
- virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
+ virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual sal_uInt16 GetEnumValue() const override;
virtual void SetEnumValue( sal_uInt16 nNewVal ) override;
};
diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx
index 771cef8f10f5..a38cc8f39360 100644
--- a/include/editeng/formatbreakitem.hxx
+++ b/include/editeng/formatbreakitem.hxx
@@ -51,7 +51,7 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
- virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
+ virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const override;
diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx
index 01fc8629d721..87308b8f97ea 100644
--- a/include/editeng/lspcitem.hxx
+++ b/include/editeng/lspcitem.hxx
@@ -93,7 +93,7 @@ public:
SvxInterLineSpaceRule GetInterLineSpaceRule() const { return eInterLineSpaceRule; }
virtual sal_uInt16 GetValueCount() const override;
- virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
+ virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual sal_uInt16 GetEnumValue() const override;
virtual void SetEnumValue( sal_uInt16 nNewVal ) override;
};
diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx
index 1db525954f4d..dba16641e3d9 100644
--- a/include/editeng/postitem.hxx
+++ b/include/editeng/postitem.hxx
@@ -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 OUString GetValueTextByPos( sal_uInt16 nPos ) 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;
diff --git a/include/editeng/shaditem.hxx b/include/editeng/shaditem.hxx
index bf85da422b58..758f57b3990d 100644
--- a/include/editeng/shaditem.hxx
+++ b/include/editeng/shaditem.hxx
@@ -76,7 +76,7 @@ public:
sal_uInt16 CalcShadowSpace( SvxShadowItemSide nShadow ) const;
virtual sal_uInt16 GetValueCount() const override;
- virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
+ virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual sal_uInt16 GetEnumValue() const override;
virtual void SetEnumValue( sal_uInt16 nNewVal ) override;
void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx
index 3c65c015c010..2942b08586d4 100644
--- a/include/editeng/udlnitem.hxx
+++ b/include/editeng/udlnitem.hxx
@@ -46,7 +46,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 OUString GetValueTextByPos( sal_uInt16 nPos ) 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;
diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx
index 40fdfcf56d83..547e7a29c6e7 100644
--- a/include/editeng/wghtitem.hxx
+++ b/include/editeng/wghtitem.hxx
@@ -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 OUString GetValueTextByPos( sal_uInt16 nPos ) 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;
diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx
index 73cb3b345a86..0eecef7d859a 100644
--- a/include/svl/aeitem.hxx
+++ b/include/svl/aeitem.hxx
@@ -60,8 +60,8 @@ public:
void RemoveValue( sal_uInt16 nValue );
virtual sal_uInt16 GetValueCount() const override;
- virtual sal_uInt16 GetValueByPos( sal_uInt16 nPos ) const override;
- virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
+ virtual sal_uInt16 GetValueByPos( sal_uInt16 nPos ) const;
+ virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const override;
};
diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx
index 92a537cb390a..9428e095ce29 100644
--- a/include/svl/cenumitm.hxx
+++ b/include/svl/cenumitm.hxx
@@ -44,10 +44,6 @@ public:
virtual sal_uInt16 GetValueCount() const = 0;
- virtual OUString GetValueTextByPos(sal_uInt16 nPos) const;
-
- virtual sal_uInt16 GetValueByPos(sal_uInt16 nPos) const;
-
virtual sal_uInt16 GetEnumValue() const = 0;
virtual void SetEnumValue(sal_uInt16 nValue) = 0;
diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx
index d921653c29fb..b5ba91d42e71 100644
--- a/include/svtools/treelist.hxx
+++ b/include/svtools/treelist.hxx
@@ -311,10 +311,6 @@ public:
sal_uLong GetChildSelectionCount( SvTreeListEntry* pParent ) const
{ return pModel->GetChildSelectionCount(this,pParent); }
- // Does not call the Select Handler
- virtual void SelectAll( bool bSelect, bool /*bPaint*/ = true )
- { pModel->SelectAll(this, bSelect); }
-
bool IsEntryVisible( SvTreeListEntry* pEntry ) const
{ return pModel->IsEntryVisible(this,pEntry); }
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index 6803524a7b13..a4f6baf2feb1 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -524,7 +524,6 @@ public:
virtual bool set_property(const OString &rKey, const OUString &rValue) override;
protected:
- using SvListView::SelectAll;
SVT_DLLPRIVATE void SetEntryHeight( SvTreeListEntry const * pEntry );
SVT_DLLPRIVATE void AdjustEntryHeight( const Image& rBmp );
@@ -721,7 +720,7 @@ public:
virtual bool Collapse( SvTreeListEntry* pParent );
virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true );
sal_uLong SelectChildren( SvTreeListEntry* pParent, bool bSelect );
- virtual void SelectAll( bool bSelect, bool bPaint = true ) override;
+ virtual void SelectAll( bool bSelect, bool bPaint = true );
void SetCurEntry( SvTreeListEntry* _pEntry );
SvTreeListEntry* GetCurEntry() const;
diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx
index e17149102821..e1709b1c7b02 100644
--- a/include/svx/sdgmoitm.hxx
+++ b/include/svx/sdgmoitm.hxx
@@ -40,7 +40,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override;
virtual sal_uInt16 GetValueCount() const override;
- virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
+ virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx
index b90074835ad2..b767e0efa376 100644
--- a/include/svx/sdtaditm.hxx
+++ b/include/svx/sdtaditm.hxx
@@ -41,7 +41,7 @@ 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 OUString GetValueTextByPos(sal_uInt16 nPos) const override;
+ virtual OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override;
};
diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx
index d21407a689fe..b1af7cad8b30 100644
--- a/include/svx/sdtaitm.hxx
+++ b/include/svx/sdtaitm.hxx
@@ -43,7 +43,7 @@ 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 OUString GetValueTextByPos(sal_uInt16 nPos) const override;
+ virtual OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override;
virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
};
@@ -67,7 +67,7 @@ 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 OUString GetValueTextByPos(sal_uInt16 nPos) const override;
+ virtual OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override;
};
diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx
index 6c9b82e76e6e..358fa8d39815 100644
--- a/include/svx/sdtakitm.hxx
+++ b/include/svx/sdtakitm.hxx
@@ -85,7 +85,7 @@ 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 OUString GetValueTextByPos(sal_uInt16 nPos) const override;
+ virtual OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override;
};
diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx
index 2c9d6bb75ddb..6fd994e9514c 100644
--- a/include/svx/sdtfsitm.hxx
+++ b/include/svx/sdtfsitm.hxx
@@ -44,7 +44,7 @@ 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 OUString GetValueTextByPos(sal_uInt16 nPos) const override;
+ virtual OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override;
virtual bool HasBoolValue() const override;
virtual bool GetBoolValue() const override;
diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx
index 22abfd440cf5..0fb29574ecd2 100644
--- a/include/svx/sxcecitm.hxx
+++ b/include/svx/sxcecitm.hxx
@@ -36,7 +36,7 @@ public:
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
virtual sal_uInt16 GetValueCount() const override; // { return 3; }
- virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override;
+ virtual OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override;
};
diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx
index 9dc5d92e6a38..92e90d1b3247 100644
--- a/include/svx/sxctitm.hxx
+++ b/include/svx/sxctitm.hxx
@@ -33,7 +33,7 @@ public:
SdrCaptionTypeItem(SdrCaptionType eStyle=SdrCaptionType::Type3): SfxEnumItem(SDRATTR_CAPTIONTYPE, eStyle) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
virtual sal_uInt16 GetValueCount() const override; // { return 4; }
- virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override;
+ virtual OUString GetValueTextByPos(sal_uInt16 nPos) const;
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 5bb103532d0e..96de5600ad11 100644
--- a/include/svx/sxekitm.hxx
+++ b/include/svx/sxekitm.hxx
@@ -38,7 +38,7 @@ public:
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 OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override;
};
diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx
index 8f59e0eeff3e..7abaeac5c9a6 100644
--- a/include/svx/sxmtpitm.hxx
+++ b/include/svx/sxmtpitm.hxx
@@ -38,7 +38,7 @@ 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 OUString GetValueTextByPos(sal_uInt16 nPos) const override;
+ virtual OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override;
};
@@ -55,7 +55,7 @@ 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 OUString GetValueTextByPos(sal_uInt16 nPos) const override;
+ virtual OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override;
};
diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx
index 9f8d725b7db7..103b6cc4bd46 100644
--- a/include/svx/sxmuitm.hxx
+++ b/include/svx/sxmuitm.hxx
@@ -35,7 +35,7 @@ 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 OUString GetValueTextByPos(sal_uInt16 nPos) const override;
+ virtual OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override;
};
diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index 7bafa1a0efcb..ae56eee86c81 100644
--- a/svl/source/items/cenumitm.cxx
+++ b/svl/source/items/cenumitm.cxx
@@ -67,18 +67,6 @@ bool SfxEnumItemInterface::PutValue(const css::uno::Any& rVal,
return false;
}
-OUString SfxEnumItemInterface::GetValueTextByPos(sal_uInt16) const
-{
- SAL_INFO("svl.items", "SfxEnumItemInterface::GetValueTextByPos(): Pure virtual");
- return OUString();
-}
-
-// virtual
-sal_uInt16 SfxEnumItemInterface::GetValueByPos(sal_uInt16 nPos) const
-{
- return nPos;
-}
-
// virtual
bool SfxEnumItemInterface::HasBoolValue() const
{
diff --git a/svx/inc/sxcikitm.hxx b/svx/inc/sxcikitm.hxx
index 5db76b7bc42b..b26d75b40ff7 100644
--- a/svx/inc/sxcikitm.hxx
+++ b/svx/inc/sxcikitm.hxx
@@ -36,7 +36,7 @@ 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 OUString GetValueTextByPos(sal_uInt16 nPos) const override;
+ virtual OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override;
};
diff --git a/svx/inc/sxmkitm.hxx b/svx/inc/sxmkitm.hxx
index 1a9566f99790..a61ea93d0848 100644
--- a/svx/inc/sxmkitm.hxx
+++ b/svx/inc/sxmkitm.hxx
@@ -36,7 +36,7 @@ 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 OUString GetValueTextByPos(sal_uInt16 nPos) const override;
+ virtual OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override;
};
More information about the Libreoffice-commits
mailing list