summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-03-29 10:58:30 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-03-29 18:15:16 +0200
commit8e27afa534f5e3a0c610b36e7ed4d392b532b49d (patch)
tree416a0f26b455a928087df25341312eff4febe2c5 /include
parented316832e9e9028444cbb587ce644d7acaacf1e7 (diff)
loplugin:unnecessaryvirtual
Change-Id: Ic044a6e4568e707022d87bc5712205fbdf084ba2 Reviewed-on: https://gerrit.libreoffice.org/52067 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r--include/editeng/adjustitem.hxx2
-rw-r--r--include/editeng/charreliefitem.hxx2
-rw-r--r--include/editeng/cmapitem.hxx2
-rw-r--r--include/editeng/crossedoutitem.hxx2
-rw-r--r--include/editeng/escapementitem.hxx2
-rw-r--r--include/editeng/formatbreakitem.hxx2
-rw-r--r--include/editeng/postitem.hxx2
-rw-r--r--include/editeng/wghtitem.hxx2
-rw-r--r--include/svl/aeitem.hxx4
-rw-r--r--include/svx/sdgmoitm.hxx2
-rw-r--r--include/svx/sdr/properties/defaultproperties.hxx2
-rw-r--r--include/svx/sdr/table/tablecontroller.hxx2
-rw-r--r--include/svx/sdtaditm.hxx2
-rw-r--r--include/svx/sdtaitm.hxx4
-rw-r--r--include/svx/sdtakitm.hxx2
-rw-r--r--include/svx/sdtfsitm.hxx2
-rw-r--r--include/svx/svdedxv.hxx2
-rw-r--r--include/svx/sxcecitm.hxx2
-rw-r--r--include/svx/sxctitm.hxx2
-rw-r--r--include/svx/sxekitm.hxx2
-rw-r--r--include/svx/sxmtpitm.hxx4
-rw-r--r--include/svx/sxmuitm.hxx2
22 files changed, 25 insertions, 25 deletions
diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx
index a335ab5e0c76..e53c1f1d8519 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;
+ 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 8abe6c5e9455..5284040fcb86 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;
+ 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 13b68875ffc1..b3e8536bc4ed 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;
+ 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 fa1d79ab7ef7..536d1fd44f03 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;
+ 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 59450669512b..6269d1322434 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;
+ 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 a38cc8f39360..2a1292e4e4af 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;
+ 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/postitem.hxx b/include/editeng/postitem.hxx
index dba16641e3d9..d28796abd7be 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;
+ 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 547e7a29c6e7..16a4e099bada 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;
+ 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 0eecef7d859a..add7e0b2c465 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;
- virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const;
+ sal_uInt16 GetValueByPos( sal_uInt16 nPos ) const;
+ 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/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx
index e1709b1c7b02..3ce9d7d581c0 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;
+ OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
diff --git a/include/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx
index deca6ce4a60b..fec5963d4e7d 100644
--- a/include/svx/sdr/properties/defaultproperties.hxx
+++ b/include/svx/sdr/properties/defaultproperties.hxx
@@ -100,7 +100,7 @@ namespace sdr
virtual void ForceDefaultAttributes();
// Scale the included ItemSet.
- virtual void Scale(const Fraction& rScale);
+ void Scale(const Fraction& rScale);
};
} // end of namespace properties
} // end of namespace sdr
diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx
index 9b0eee19a28f..6a999a78b344 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -51,7 +51,7 @@ public:
SVX_DLLPRIVATE virtual bool onMouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin) override;
SVX_DLLPRIVATE virtual bool onMouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) override;
- SVX_DLLPRIVATE virtual bool HasMarked();
+ SVX_DLLPRIVATE bool HasMarked();
SVX_DLLPRIVATE virtual bool DeleteMarked() override;
SVX_DLLPRIVATE virtual void onSelectionHasChanged() override;
diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx
index b767e0efa376..7a0b939e4fa0 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;
+ 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 b1af7cad8b30..c56952cbf86a 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;
+ 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;
+ 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 358fa8d39815..09f990abcb9a 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;
+ 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 6fd994e9514c..939e2ab9cdc9 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;
+ 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/svdedxv.hxx b/include/svx/svdedxv.hxx
index 7a93a5590c80..2c8710a90af0 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -219,7 +219,7 @@ public:
SdrTextObj* GetTextEditObject() const { return mxTextEditObj.get(); }
// info about TextEditPageView. Default is 0L.
- virtual SdrPageView* GetTextEditPageView() const;
+ SdrPageView* GetTextEditPageView() const;
// Current window of the outliners.
void SetTextEditWin(vcl::Window* pWin);
diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx
index 0fb29574ecd2..fb7d898fcde5 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;
+ 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 92e90d1b3247..9ca7f5be2a8e 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;
+ 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 96de5600ad11..b779dedf029e 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;
+ 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 7abaeac5c9a6..d16605ba17c4 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;
+ 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;
+ 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 103b6cc4bd46..996b195f5b07 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;
+ OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override;
};