diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /include/svl | |
parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff) |
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark
overriding destructors as 'virtual'" appears to no longer be a problem with
MSVC 2013.
(The little change in the rewriting code of compilerplugins/clang/override.cxx
was necessary to prevent an endless loop when adding "override" to
OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager();
in chart2/source/inc/LifeTime.hxx, getting stuck in the leading
OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that
isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.)
Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'include/svl')
33 files changed, 44 insertions, 44 deletions
diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx index e0f4254b3c7e..961737922047 100644 --- a/include/svl/aeitem.hxx +++ b/include/svl/aeitem.hxx @@ -42,7 +42,7 @@ public: SfxAllEnumItem( sal_uInt16 nWhich, sal_uInt16 nVal ); SfxAllEnumItem( sal_uInt16 nWhich, SvStream &rStream ); SfxAllEnumItem( const SfxAllEnumItem & ); - virtual ~SfxAllEnumItem(); + virtual ~SfxAllEnumItem() override; void InsertValue( sal_uInt16 nValue ); void InsertValue( sal_uInt16 nValue, const OUString &rText ); diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx index 12d9ce30efa8..2c8afc8aa5e3 100644 --- a/include/svl/cintitem.hxx +++ b/include/svl/cintitem.hxx @@ -37,7 +37,7 @@ public: SfxPoolItem(rItem), m_nValue(rItem.m_nValue) {} - virtual ~CntByteItem() {} + virtual ~CntByteItem() override {} virtual bool operator ==(const SfxPoolItem & rItem) const override; @@ -86,7 +86,7 @@ public: SfxPoolItem(rItem), m_nValue(rItem.m_nValue) {} - virtual ~CntUInt16Item() {} + virtual ~CntUInt16Item() override {} virtual bool operator ==(const SfxPoolItem & rItem) const override; @@ -135,7 +135,7 @@ public: SfxPoolItem(rItem), m_nValue(rItem.m_nValue) {} - virtual ~CntInt32Item() {} + virtual ~CntInt32Item() override {} virtual bool operator ==(const SfxPoolItem & rItem) const override; @@ -184,7 +184,7 @@ public: SfxPoolItem(rItem), m_nValue(rItem.m_nValue) {} - virtual ~CntUInt32Item() {} + virtual ~CntUInt32Item() override {} virtual bool operator ==(const SfxPoolItem & rItem) const override; diff --git a/include/svl/cjkoptions.hxx b/include/svl/cjkoptions.hxx index e35cfb2bfe27..e173e60f6287 100644 --- a/include/svl/cjkoptions.hxx +++ b/include/svl/cjkoptions.hxx @@ -51,7 +51,7 @@ public: // bDontLoad is for referencing purposes only SvtCJKOptions(bool bDontLoad = false); - virtual ~SvtCJKOptions(); + virtual ~SvtCJKOptions() override; bool IsCJKFontEnabled() const; bool IsVerticalTextEnabled() const; diff --git a/include/svl/cntwall.hxx b/include/svl/cntwall.hxx index cbea63600df7..cd6800f66c40 100644 --- a/include/svl/cntwall.hxx +++ b/include/svl/cntwall.hxx @@ -38,7 +38,7 @@ public: CntWallpaperItem( sal_uInt16 nWhich ); CntWallpaperItem( sal_uInt16 nWhich, SvStream& rStream, sal_uInt16 nVersion ); CntWallpaperItem( const CntWallpaperItem& rCpy ); - virtual ~CntWallpaperItem(); + virtual ~CntWallpaperItem() override; virtual sal_uInt16 GetVersion(sal_uInt16) const override; diff --git a/include/svl/ctloptions.hxx b/include/svl/ctloptions.hxx index 518f73e1d6b1..b3a941f62c48 100644 --- a/include/svl/ctloptions.hxx +++ b/include/svl/ctloptions.hxx @@ -37,7 +37,7 @@ public: // bDontLoad is for referencing purposes only SvtCTLOptions( bool bDontLoad = false ); - virtual ~SvtCTLOptions(); + virtual ~SvtCTLOptions() override; void SetCTLFontEnabled( bool _bEnabled ); bool IsCTLFontEnabled() const; diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx index e89479aa0e76..5693ceb74ca0 100644 --- a/include/svl/custritm.hxx +++ b/include/svl/custritm.hxx @@ -41,7 +41,7 @@ public: SfxPoolItem(rItem), m_aValue(rItem.m_aValue) {} - virtual ~CntUnencodedStringItem() {} + virtual ~CntUnencodedStringItem() override {} virtual bool operator ==(const SfxPoolItem & rItem) const override; diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx index ca4864ba3d8b..f9fd4c05a5d9 100644 --- a/include/svl/flagitem.hxx +++ b/include/svl/flagitem.hxx @@ -33,7 +33,7 @@ public: explicit SfxFlagItem( sal_uInt16 nWhich = 0, sal_uInt16 nValue = 0 ); SfxFlagItem( const SfxFlagItem& ); - virtual ~SfxFlagItem() {} + virtual ~SfxFlagItem() override {} virtual sal_uInt8 GetFlagCount() const; diff --git a/include/svl/globalnameitem.hxx b/include/svl/globalnameitem.hxx index 9547b4b64327..7c12cc3a6bf1 100644 --- a/include/svl/globalnameitem.hxx +++ b/include/svl/globalnameitem.hxx @@ -32,7 +32,7 @@ public: SfxGlobalNameItem(); SfxGlobalNameItem( sal_uInt16 nWhich, const SvGlobalName& ); - virtual ~SfxGlobalNameItem(); + virtual ~SfxGlobalNameItem() override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx index c4f95929a286..38c49b8b8193 100644 --- a/include/svl/grabbagitem.hxx +++ b/include/svl/grabbagitem.hxx @@ -26,7 +26,7 @@ public: SfxGrabBagItem(); SfxGrabBagItem(sal_uInt16 nWhich); SfxGrabBagItem(const SfxGrabBagItem& rItem); - virtual ~SfxGrabBagItem(); + virtual ~SfxGrabBagItem() override; const std::map<OUString, css::uno::Any>& GetGrabBag() const { diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx index cea8abce74c0..422d38d6c023 100644 --- a/include/svl/ilstitem.hxx +++ b/include/svl/ilstitem.hxx @@ -35,7 +35,7 @@ public: SfxIntegerListItem( sal_uInt16 nWhich, const ::std::vector < sal_Int32 >& rList ); SfxIntegerListItem( sal_uInt16 nWhich, const css::uno::Sequence < sal_Int32 >& rList ); SfxIntegerListItem( const SfxIntegerListItem& rItem ); - virtual ~SfxIntegerListItem(); + virtual ~SfxIntegerListItem() override; const std::vector< sal_Int32 >& GetList() const { return m_aList; } diff --git a/include/svl/imageitm.hxx b/include/svl/imageitm.hxx index d19c8be282de..f8cf163e74c0 100644 --- a/include/svl/imageitm.hxx +++ b/include/svl/imageitm.hxx @@ -32,7 +32,7 @@ public: static SfxPoolItem* CreateDefault(); SfxImageItem( sal_uInt16 nWhich = 0 ); SfxImageItem( const SfxImageItem& ); - virtual ~SfxImageItem(); + virtual ~SfxImageItem() override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx index 2a03d3b90d91..e983d1d6e05c 100644 --- a/include/svl/inethist.hxx +++ b/include/svl/inethist.hxx @@ -41,7 +41,7 @@ class SVL_DLLPUBLIC INetURLHistory : public SfxBroadcaster /** Construction/Destruction. */ SAL_DLLPRIVATE INetURLHistory(); - SAL_DLLPRIVATE virtual ~INetURLHistory(); + SAL_DLLPRIVATE virtual ~INetURLHistory() override; /** Implementation. */ @@ -105,7 +105,7 @@ class SVL_DLLPUBLIC INetURLHistoryHint: public SfxHint const INetURLObject* pObj; public: explicit INetURLHistoryHint( const INetURLObject* Object ) : pObj(Object) {} - virtual ~INetURLHistoryHint() {} + virtual ~INetURLHistoryHint() override {} const INetURLObject* GetObject() const { return pObj; } }; diff --git a/include/svl/instrm.hxx b/include/svl/instrm.hxx index 1e64eda2aecf..65d24f37d169 100644 --- a/include/svl/instrm.hxx +++ b/include/svl/instrm.hxx @@ -54,7 +54,7 @@ class SVL_DLLPUBLIC SvInputStream: public SvStream public: SvInputStream( css::uno::Reference< css::io::XInputStream > const & rTheStream ); - virtual ~SvInputStream(); + virtual ~SvInputStream() override; }; #endif // INCLUDED_SVL_INSTRM_HXX diff --git a/include/svl/int64item.hxx b/include/svl/int64item.hxx index fd6827e6d6be..4245ab13d52a 100644 --- a/include/svl/int64item.hxx +++ b/include/svl/int64item.hxx @@ -22,7 +22,7 @@ public: SfxInt64Item( sal_uInt16 nWhich, SvStream & rStream ); SfxInt64Item( const SfxInt64Item& rItem ); - virtual ~SfxInt64Item(); + virtual ~SfxInt64Item() override; virtual bool operator== ( const SfxPoolItem& rItem ) const override; diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx index dd6b1178b5a9..da2dc649d755 100644 --- a/include/svl/intitem.hxx +++ b/include/svl/intitem.hxx @@ -55,7 +55,7 @@ public: SfxPoolItem(rItem), m_nValue(rItem.m_nValue) {} - virtual ~SfxInt16Item() {} + virtual ~SfxInt16Item() override {} virtual bool operator ==(const SfxPoolItem & rItem) const override; diff --git a/include/svl/isethint.hxx b/include/svl/isethint.hxx index 41dc76f01b2a..b9e730ef6415 100644 --- a/include/svl/isethint.hxx +++ b/include/svl/isethint.hxx @@ -32,7 +32,7 @@ class SVL_DLLPUBLIC SfxItemSetHint: public SfxHint public: SfxItemSetHint( const SfxItemSet &rItemSet ); - virtual ~SfxItemSetHint(); + virtual ~SfxItemSetHint() override; const SfxItemSet& GetItemSet() const { return *_pItemSet; } }; diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx index 720cfb423ed6..216efdd954fb 100644 --- a/include/svl/itemprop.hxx +++ b/include/svl/itemprop.hxx @@ -162,7 +162,7 @@ class SVL_DLLPUBLIC SfxItemPropertySetInfo : public cppu::WeakImplHelper1<css::b public: SfxItemPropertySetInfo(const SfxItemPropertyMap &rMap ); SfxItemPropertySetInfo(const SfxItemPropertyMapEntry *pEntries ); - virtual ~SfxItemPropertySetInfo(); + virtual ~SfxItemPropertySetInfo() override; virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties( ) @@ -186,7 +186,7 @@ public: SfxExtItemPropertySetInfo( const SfxItemPropertyMapEntry *pMap, const css::uno::Sequence<css::beans::Property>& rPropSeq ); - virtual ~SfxExtItemPropertySetInfo(); + virtual ~SfxExtItemPropertySetInfo() override; virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties( ) diff --git a/include/svl/languageoptions.hxx b/include/svl/languageoptions.hxx index 92158684a461..3f1cd0e1a933 100644 --- a/include/svl/languageoptions.hxx +++ b/include/svl/languageoptions.hxx @@ -75,7 +75,7 @@ public: // bDontLoad is for referencing purposes only SvtLanguageOptions( bool _bDontLoad = false ); - virtual ~SvtLanguageOptions(); + virtual ~SvtLanguageOptions() override; // CJK options bool IsCJKFontEnabled() const; @@ -122,7 +122,7 @@ private: public: SvtSystemLanguageOptions(); - virtual ~SvtSystemLanguageOptions(); + virtual ~SvtSystemLanguageOptions() override; virtual void Notify( const css::uno::Sequence< OUString >& rPropertyNames ) override; diff --git a/include/svl/lckbitem.hxx b/include/svl/lckbitem.hxx index 64d5ff0c36d8..ef54a090fd8a 100644 --- a/include/svl/lckbitem.hxx +++ b/include/svl/lckbitem.hxx @@ -32,7 +32,7 @@ public: SfxLockBytesItem(); SfxLockBytesItem( sal_uInt16 nWhich, SvStream & ); SfxLockBytesItem( const SfxLockBytesItem& ); - virtual ~SfxLockBytesItem(); + virtual ~SfxLockBytesItem() override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/svl/metitem.hxx b/include/svl/metitem.hxx index 7dda419f245e..df11f83d36b1 100644 --- a/include/svl/metitem.hxx +++ b/include/svl/metitem.hxx @@ -28,7 +28,7 @@ public: explicit SfxMetricItem( sal_uInt16 nWhich = 0, sal_uInt32 nValue = 0 ); SfxMetricItem( sal_uInt16 nWhich, SvStream & ); SfxMetricItem( const SfxMetricItem& ); - virtual ~SfxMetricItem() {} + virtual ~SfxMetricItem() override {} virtual void ScaleMetrics( long lMult, long lDiv ) override; virtual bool HasMetrics() const override; diff --git a/include/svl/numuno.hxx b/include/svl/numuno.hxx index 37f3f419a62c..6fc990791d6b 100644 --- a/include/svl/numuno.hxx +++ b/include/svl/numuno.hxx @@ -55,7 +55,7 @@ private: public: SvNumberFormatsSupplierObj(); SvNumberFormatsSupplierObj(SvNumberFormatter* pForm); - virtual ~SvNumberFormatsSupplierObj(); + virtual ~SvNumberFormatsSupplierObj() override; void SetNumberFormatter(SvNumberFormatter* pNew); SvNumberFormatter* GetNumberFormatter() const; diff --git a/include/svl/outstrm.hxx b/include/svl/outstrm.hxx index 487d133da738..d512d46ba51d 100644 --- a/include/svl/outstrm.hxx +++ b/include/svl/outstrm.hxx @@ -46,7 +46,7 @@ class SVL_DLLPUBLIC SvOutputStream: public SvStream public: SvOutputStream(css::uno::Reference< css::io::XOutputStream > const & rTheStream); - virtual ~SvOutputStream(); + virtual ~SvOutputStream() override; }; #endif // INCLUDED_SVL_OUTSTRM_HXX diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index 81723690e7d4..feb209fa5f71 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -236,7 +236,7 @@ public: static SfxPoolItem* CreateDefault(); explicit SfxVoidItem( sal_uInt16 nWhich ); SfxVoidItem( const SfxVoidItem& ); - virtual ~SfxVoidItem(); + virtual ~SfxVoidItem() override; virtual bool operator==( const SfxPoolItem& ) const override; @@ -260,7 +260,7 @@ public: SfxSetItem( sal_uInt16 nWhich, SfxItemSet *pSet ); SfxSetItem( sal_uInt16 nWhich, const SfxItemSet &rSet ); SfxSetItem( const SfxSetItem&, SfxItemPool *pPool = nullptr ); - virtual ~SfxSetItem(); + virtual ~SfxSetItem() override; virtual bool operator==( const SfxPoolItem& ) const override; @@ -286,7 +286,7 @@ class SVL_DLLPUBLIC SfxPoolItemHint: public SfxHint SfxPoolItem* pObj; public: explicit SfxPoolItemHint( SfxPoolItem* Object ) : pObj(Object) {} - virtual ~SfxPoolItemHint() {} + virtual ~SfxPoolItemHint() override {} SfxPoolItem* GetObject() const { return pObj; } }; diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx index 846bf0ee2681..62f75172ad10 100644 --- a/include/svl/ptitem.hxx +++ b/include/svl/ptitem.hxx @@ -34,7 +34,7 @@ public: SfxPointItem(); SfxPointItem( sal_uInt16 nWhich, const Point& rVal ); SfxPointItem( const SfxPointItem& ); - virtual ~SfxPointItem() {} + virtual ~SfxPointItem() override {} virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx index af438333dc7f..28872aec9a69 100644 --- a/include/svl/rectitem.hxx +++ b/include/svl/rectitem.hxx @@ -35,7 +35,7 @@ public: SfxRectangleItem(); SfxRectangleItem( sal_uInt16 nWhich, const Rectangle& rVal ); SfxRectangleItem( const SfxRectangleItem& ); - virtual ~SfxRectangleItem() {} + virtual ~SfxRectangleItem() override {} virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx index 8d3422346d70..a776ce374cfd 100644 --- a/include/svl/rngitem.hxx +++ b/include/svl/rngitem.hxx @@ -55,7 +55,7 @@ private: public: SfxUShortRangesItem( sal_uInt16 nWID, SvStream &rStream ); SfxUShortRangesItem( const SfxUShortRangesItem& rItem ); - virtual ~SfxUShortRangesItem(); + virtual ~SfxUShortRangesItem() override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx index b06a7351baaf..183875d83a2c 100644 --- a/include/svl/slstitm.hxx +++ b/include/svl/slstitm.hxx @@ -40,7 +40,7 @@ public: SfxStringListItem( sal_uInt16 nWhich, const std::vector<OUString> *pList=nullptr ); SfxStringListItem( sal_uInt16 nWhich, SvStream& rStream ); SfxStringListItem( const SfxStringListItem& rItem ); - virtual ~SfxStringListItem(); + virtual ~SfxStringListItem() override; std::vector<OUString>& GetList(); diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx index 54c66cbb96d1..2be6271dc8a2 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -96,7 +96,7 @@ public: explicit SvxSearchItem( const sal_uInt16 nId ); SvxSearchItem( const SvxSearchItem& rItem ); - virtual ~SvxSearchItem(); + virtual ~SvxSearchItem() 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/style.hxx b/include/svl/style.hxx index ddff30a67a31..794322da11b2 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -93,7 +93,7 @@ protected: SfxStyleSheetBase( const OUString&, SfxStyleSheetBasePool*, SfxStyleFamily eFam, sal_uInt16 mask ); SfxStyleSheetBase( const SfxStyleSheetBase& ); - virtual ~SfxStyleSheetBase(); + virtual ~SfxStyleSheetBase() override; virtual void Load( SvStream&, sal_uInt16 ); void Store( SvStream& ); @@ -203,7 +203,7 @@ protected: virtual SfxStyleSheetBase* Create( const OUString&, SfxStyleFamily, sal_uInt16 ); virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& ); - virtual ~SfxStyleSheetBasePool(); + virtual ~SfxStyleSheetBasePool() override; void StoreStyleSheet(const rtl::Reference< SfxStyleSheetBase >&); @@ -279,7 +279,7 @@ protected: { assert(false); } - virtual ~SfxStyleSheet(); + virtual ~SfxStyleSheet() override; }; diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx index 4c10fa26397a..b0fd3fb17f96 100644 --- a/include/svl/svdde.hxx +++ b/include/svl/svdde.hxx @@ -132,7 +132,7 @@ class SVL_DLLPUBLIC DdeLink : public DdeTransaction public: DdeLink( DdeConnection&, const OUString&, long = 0 ); - virtual ~DdeLink(); + virtual ~DdeLink() override; void SetNotifyHdl( const Link<void*,void>& rLink ) { aNotify = rLink; } const Link<void*,void>& GetNotifyHdl() const { return aNotify; } diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx index bcca652601a0..7fac37987f25 100644 --- a/include/svl/szitem.hxx +++ b/include/svl/szitem.hxx @@ -33,7 +33,7 @@ private: public: SfxSizeItem( sal_uInt16 nWhich, const Size& rVal ); SfxSizeItem( const SfxSizeItem& ); - virtual ~SfxSizeItem() {} + virtual ~SfxSizeItem() override {} virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx index afe09557cfc9..52a2918afd36 100644 --- a/include/svl/undo.hxx +++ b/include/svl/undo.hxx @@ -136,7 +136,7 @@ public: SfxListUndoAction( const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId, sal_Int32 nViewShellId, SfxUndoArray *pFather ); - virtual ~SfxListUndoAction(); + virtual ~SfxListUndoAction() override; virtual void Undo() override; virtual void UndoWithContext( SfxUndoContext& i_context ) override; @@ -308,7 +308,7 @@ class SVL_DLLPUBLIC SfxUndoManager : public ::svl::IUndoManager m_xData; public: SfxUndoManager( size_t nMaxUndoActionCount = 20 ); - virtual ~SfxUndoManager(); + virtual ~SfxUndoManager() override; // IUndoManager overridables virtual void SetMaxUndoActionCount( size_t nMaxUndoActionCount ) override; diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx index b6c2102cfaa5..0efc712e9b7c 100644 --- a/include/svl/visitem.hxx +++ b/include/svl/visitem.hxx @@ -42,7 +42,7 @@ public: SfxPoolItem(rItem), m_nValue(rItem.m_nValue) {} - virtual ~SfxVisibilityItem() {} + virtual ~SfxVisibilityItem() override {} virtual bool operator ==(const SfxPoolItem & rItem) const override; |