From 91dd2db17bd6cb9b357d1d69b187174e31eabef0 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
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
---
 extensions/source/logging/consolehandler.cxx     | 2 +-
 extensions/source/logging/csvformatter.cxx       | 2 +-
 extensions/source/logging/filehandler.cxx        | 2 +-
 extensions/source/logging/logger.cxx             | 2 +-
 extensions/source/logging/plaintextformatter.cxx | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'extensions/source/logging')

diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx
index 964b6da10674..ea6af6884ddd 100644
--- a/extensions/source/logging/consolehandler.cxx
+++ b/extensions/source/logging/consolehandler.cxx
@@ -61,7 +61,7 @@ namespace logging
     public:
         ConsoleHandler(const Reference<XComponentContext> &context,
             const css::uno::Sequence<css::uno::Any> &arguments);
-        virtual ~ConsoleHandler();
+        virtual ~ConsoleHandler() override;
 
     private:
         // XConsoleHandler
diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx
index 3b91daefc1d7..3da67b366b77 100644
--- a/extensions/source/logging/csvformatter.cxx
+++ b/extensions/source/logging/csvformatter.cxx
@@ -46,7 +46,7 @@ namespace logging
         virtual OUString SAL_CALL formatMultiColumn(const Sequence< OUString>& column_data) throw (RuntimeException, std::exception) override;
 
         CsvFormatter();
-        virtual ~CsvFormatter();
+        virtual ~CsvFormatter() override;
 
     private:
         // XCsvLogFormatter
diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx
index ae155fbc544f..c1bd711346cb 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -83,7 +83,7 @@ namespace logging
     public:
         FileHandler(const css::uno::Reference<XComponentContext> &context,
                 const css::uno::Sequence<css::uno::Any> &arguments);
-        virtual ~FileHandler();
+        virtual ~FileHandler() override;
 
     private:
         // XLogHandler
diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx
index 6e8d757cfeb7..ff3d731879e7 100644
--- a/extensions/source/logging/logger.cxx
+++ b/extensions/source/logging/logger.cxx
@@ -76,7 +76,7 @@ namespace logging
         virtual void SAL_CALL logp( ::sal_Int32 Level, const OUString& SourceClass, const OUString& SourceMethod, const OUString& Message ) throw (RuntimeException, std::exception) override;
 
     protected:
-        virtual ~EventLogger();
+        virtual ~EventLogger() override;
 
     private:
         /** logs the given log record
diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx
index 838d7686f032..c88a1f7bd3fa 100644
--- a/extensions/source/logging/plaintextformatter.cxx
+++ b/extensions/source/logging/plaintextformatter.cxx
@@ -43,7 +43,7 @@ namespace logging
     {
     public:
         PlainTextFormatter();
-        virtual ~PlainTextFormatter();
+        virtual ~PlainTextFormatter() override;
 
     private:
         // XLogFormatter
-- 
cgit