From 91dd2db17bd6cb9b357d1d69b187174e31eabef0 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 13 Sep 2016 13:09:01 +0200 Subject: 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 --- linguistic/inc/iprcache.hxx | 2 +- linguistic/source/convdic.hxx | 2 +- linguistic/source/convdiclist.cxx | 2 +- linguistic/source/convdiclist.hxx | 2 +- linguistic/source/convdicxml.hxx | 4 ++-- linguistic/source/dicimp.hxx | 4 ++-- linguistic/source/dlistimp.cxx | 2 +- linguistic/source/dlistimp.hxx | 2 +- linguistic/source/gciterator.hxx | 2 +- linguistic/source/hhconvdic.hxx | 2 +- linguistic/source/hyphdsp.hxx | 2 +- linguistic/source/lngsvcmgr.hxx | 2 +- linguistic/source/spelldsp.hxx | 2 +- linguistic/source/thesdsp.hxx | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) (limited to 'linguistic') diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx index ab021c5b1311..b31d38eac8cb 100644 --- a/linguistic/inc/iprcache.hxx +++ b/linguistic/inc/iprcache.hxx @@ -57,7 +57,7 @@ class FlushListener : public: FlushListener( SpellCache& rFO ) : mrSpellCache(rFO) {} - virtual ~FlushListener() {} + virtual ~FlushListener() override {} void SetDicList( css::uno::Reference< css::linguistic2::XSearchableDictionaryList > &rDL ); void SetPropSet( css::uno::Reference< css::linguistic2::XLinguProperties > &rPS ); diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx index fe5585bc6de0..1ed485665874 100644 --- a/linguistic/source/convdic.hxx +++ b/linguistic/source/convdic.hxx @@ -112,7 +112,7 @@ public: sal_Int16 nConversionType, bool bBiDirectional, const OUString &rMainURL); - virtual ~ConvDic(); + virtual ~ConvDic() override; // XConversionDictionary virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 88b10d064234..d609c9b0b4c8 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -84,7 +84,7 @@ class ConvDicNameContainer : public: ConvDicNameContainer(); - virtual ~ConvDicNameContainer(); + virtual ~ConvDicNameContainer() override; ConvDicNameContainer(const ConvDicNameContainer&) = delete; ConvDicNameContainer& operator=(const ConvDicNameContainer&) = delete; diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx index ffa0ea5dd37a..4c2bc3d0687f 100644 --- a/linguistic/source/convdiclist.hxx +++ b/linguistic/source/convdiclist.hxx @@ -71,7 +71,7 @@ class ConvDicList : public: ConvDicList(); - virtual ~ConvDicList(); + virtual ~ConvDicList() override; // XConversionDictionaryList virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getDictionaryContainer( ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx index c667d644e7a8..c490fb71572b 100644 --- a/linguistic/source/convdicxml.hxx +++ b/linguistic/source/convdicxml.hxx @@ -52,7 +52,7 @@ public: bSuccess ( false ) { } - virtual ~ConvDicXMLExport() + virtual ~ConvDicXMLExport() override { } @@ -89,7 +89,7 @@ public: nConversionType = -1; } - virtual ~ConvDicXMLImport() throw () + virtual ~ConvDicXMLImport() throw () override { } diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx index 6a8e89396779..9435dbae0750 100644 --- a/linguistic/source/dicimp.hxx +++ b/linguistic/source/dicimp.hxx @@ -79,7 +79,7 @@ public: css::linguistic2::DictionaryType eType, const OUString &rMainURL, bool bWriteable ); - virtual ~DictionaryNeo(); + virtual ~DictionaryNeo() override; // XNamed virtual OUString SAL_CALL @@ -184,7 +184,7 @@ public: DicEntry(const OUString &rDicFileWord, bool bIsNegativ); DicEntry(const OUString &rDicWord, bool bIsNegativ, const OUString &rRplcText); - virtual ~DicEntry(); + virtual ~DicEntry() override; // XDictionaryEntry virtual OUString SAL_CALL diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 1d643d6bedd8..f4506ee5343f 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -75,7 +75,7 @@ class DicEvtListenerHelper : public: explicit DicEvtListenerHelper( const uno::Reference< XDictionaryList > &rxDicList ); - virtual ~DicEvtListenerHelper(); + virtual ~DicEvtListenerHelper() override; // XEventListener virtual void SAL_CALL diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx index 2b1fa490fffa..4d4062dbf90e 100644 --- a/linguistic/source/dlistimp.hxx +++ b/linguistic/source/dlistimp.hxx @@ -88,7 +88,7 @@ class DicList : public: DicList(); - virtual ~DicList(); + virtual ~DicList() override; // XDictionaryList virtual ::sal_Int16 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx index aa6b85967750..c114c80284f4 100644 --- a/linguistic/source/gciterator.hxx +++ b/linguistic/source/gciterator.hxx @@ -146,7 +146,7 @@ public: void DequeueAndCheck(); explicit GrammarCheckingIterator(); - virtual ~GrammarCheckingIterator(); + virtual ~GrammarCheckingIterator() override; // XProofreadingIterator virtual void SAL_CALL startProofreading( const css::uno::Reference< css::uno::XInterface >& xDocument, const css::uno::Reference< css::text::XFlatParagraphIteratorProvider >& xIteratorProvider ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx index 69d227b69e9e..ed7c4497221e 100644 --- a/linguistic/source/hhconvdic.hxx +++ b/linguistic/source/hhconvdic.hxx @@ -38,7 +38,7 @@ class HHConvDic : public: HHConvDic( const OUString &rName, const OUString &rMainURL ); - virtual ~HHConvDic(); + virtual ~HHConvDic() override; // XConversionDictionary virtual void SAL_CALL addEntry( const OUString& aLeftText, const OUString& aRightText ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override; diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx index 7872c7e366ff..cf250664aaa0 100644 --- a/linguistic/source/hyphdsp.hxx +++ b/linguistic/source/hyphdsp.hxx @@ -79,7 +79,7 @@ class HyphenatorDispatcher : public: explicit HyphenatorDispatcher( LngSvcMgr &rLngSvcMgr ); - virtual ~HyphenatorDispatcher(); + virtual ~HyphenatorDispatcher() override; // XSupportedLocales virtual css::uno::Sequence< css::lang::Locale > SAL_CALL diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx index 1180444c29bc..f892ee17ed9a 100644 --- a/linguistic/source/lngsvcmgr.hxx +++ b/linguistic/source/lngsvcmgr.hxx @@ -142,7 +142,7 @@ class LngSvcMgr : public: LngSvcMgr(); - virtual ~LngSvcMgr(); + virtual ~LngSvcMgr() override; // XLinguServiceManager virtual css::uno::Reference< css::linguistic2::XSpellChecker > SAL_CALL getSpellChecker( ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx index 9dba17c2bf8f..c79054d32d41 100644 --- a/linguistic/source/spelldsp.hxx +++ b/linguistic/source/spelldsp.hxx @@ -86,7 +86,7 @@ class SpellCheckerDispatcher : public: explicit SpellCheckerDispatcher( LngSvcMgr &rLngSvcMgr ); - virtual ~SpellCheckerDispatcher(); + virtual ~SpellCheckerDispatcher() override; // XSupportedLocales (for XSpellChecker) virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales() throw(css::uno::RuntimeException, std::exception) override; diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx index cf75d4994ed1..6cb7e4be8b39 100644 --- a/linguistic/source/thesdsp.hxx +++ b/linguistic/source/thesdsp.hxx @@ -63,7 +63,7 @@ class ThesaurusDispatcher : public: ThesaurusDispatcher(); - virtual ~ThesaurusDispatcher(); + virtual ~ThesaurusDispatcher() override; // XSupportedLocales virtual css::uno::Sequence< css::lang::Locale > SAL_CALL -- cgit