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

2 files changed, 9 insertions, 9 deletions

diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index 7e10ee138f25..c8927d6cb3d7 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -512,7 +512,7 @@ public:
     typedef OUStringMap::const_iterator                 const_iterator;
 
 public:
-    virtual             ~NameListBase();
+    virtual             ~NameListBase() override;
 
     /** Sets a name for the specified key. */
     void                setName( sal_Int64 nKey, const String& rName );
@@ -764,7 +764,7 @@ public:
                             const StorageRef& rxRootStrg,
                             const OUString& rSysFileName );
 
-    virtual             ~SharedConfigData();
+    virtual             ~SharedConfigData() override;
 
     const css::uno::Reference< css::uno::XComponentContext >& getContext() const { return mxContext; }
     const StorageRef& getRootStorage() const { return mxRootStrg; }
@@ -846,7 +846,7 @@ public:
                             const StorageRef& rxRootStrg,
                             const OUString& rSysFileName );
 
-    virtual             ~Config();
+    virtual             ~Config() override;
 
     const css::uno::Reference< css::uno::XComponentContext >& getContext() const { return mxCfgData->getContext(); }
     const StorageRef& getRootStorage() const { return mxCfgData->getRootStorage(); }
@@ -1079,7 +1079,7 @@ class StorageIterator : public Base
 {
 public:
     explicit            StorageIterator( const StorageRef& rxStrg );
-    virtual             ~StorageIterator();
+    virtual             ~StorageIterator() override;
 
     StorageIterator&    operator++();
 
@@ -1100,7 +1100,7 @@ private:
 class ObjectBase : public Base
 {
 public:
-    virtual             ~ObjectBase();
+    virtual             ~ObjectBase() override;
 
     const css::uno::Reference< css::uno::XComponentContext >&
                         getContext() const { return mxConfig->getContext(); }
@@ -1200,7 +1200,7 @@ private:
 class OutputObjectBase : public ObjectBase
 {
 public:
-    virtual             ~OutputObjectBase();
+    virtual             ~OutputObjectBase() override;
 
 
 protected:
@@ -1364,7 +1364,7 @@ void OutputObjectBase::writeHexPairItem( const String& rName, Type nData1, Type
 class InputObjectBase : public OutputObjectBase
 {
 public:
-    virtual             ~InputObjectBase();
+    virtual             ~InputObjectBase() override;
 
 
 protected:
@@ -1704,7 +1704,7 @@ private:
 class DumperBase : public ObjectBase
 {
 public:
-    virtual             ~DumperBase();
+    virtual             ~DumperBase() override;
 
     bool                isImportEnabled() const;
     bool                isImportCancelled() const;
diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx
index 8c4e5f31f09a..ad692ef721b9 100644
--- a/include/oox/dump/xlsbdumper.hxx
+++ b/include/oox/dump/xlsbdumper.hxx
@@ -50,7 +50,7 @@ class RecordObjectBase : public SequenceRecordObjectBase
 {
 protected:
     explicit            RecordObjectBase();
-    virtual             ~RecordObjectBase();
+    virtual             ~RecordObjectBase() override;
 
     using               SequenceRecordObjectBase::construct;