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 /i18npool/source | |
| 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 'i18npool/source')
| -rw-r--r-- | i18npool/source/localedata/localedata.cxx | 2 | ||||
| -rw-r--r-- | i18npool/source/localedata/saxparser.cxx | 2 | ||||
| -rw-r--r-- | i18npool/source/search/textsearch.hxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 5c7d4f8100f9..99a865e181cd 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -1328,7 +1328,7 @@ class OutlineNumbering : public cppu::WeakImplHelper < container::XIndexAccess > sal_Int16 m_nCount; public: OutlineNumbering(const OutlineNumberingLevel_Impl* pOutlineLevels, int nLevels); - virtual ~OutlineNumbering(); + virtual ~OutlineNumbering() override; //XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) throw(RuntimeException, std::exception) override; diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx index f367a5d50ea1..26da63a5e69c 100644 --- a/i18npool/source/localedata/saxparser.cxx +++ b/i18npool/source/localedata/saxparser.cxx @@ -160,7 +160,7 @@ public: theLocale[sizeof(theLocale)-1] = 0; } - virtual ~TestDocumentHandler( ) + virtual ~TestDocumentHandler( ) override { of.closeOutput(); delete rootNode; diff --git a/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx index 49c1dfb24fef..5ed122b73dd5 100644 --- a/i18npool/source/search/textsearch.hxx +++ b/i18npool/source/search/textsearch.hxx @@ -130,7 +130,7 @@ public: explicit TextSearch( const css::uno::Reference < css::uno::XComponentContext >& rxContext ); - virtual ~TextSearch(); + virtual ~TextSearch() override; // XTextSearch virtual void SAL_CALL |