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

26 files changed, 37 insertions, 37 deletions

diff --git a/include/comphelper/ChainablePropertySetInfo.hxx b/include/comphelper/ChainablePropertySetInfo.hxx
index e7bcefe09857..a5885e2cd8b9 100644
--- a/include/comphelper/ChainablePropertySetInfo.hxx
+++ b/include/comphelper/ChainablePropertySetInfo.hxx
@@ -43,7 +43,7 @@ namespace comphelper
 
     private:
         virtual ~ChainablePropertySetInfo()
-            throw();
+            throw() override;
 
         // XPropertySetInfo
         virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties()
diff --git a/include/comphelper/MasterPropertySetInfo.hxx b/include/comphelper/MasterPropertySetInfo.hxx
index 80c1b32ad35e..55abed60a040 100644
--- a/include/comphelper/MasterPropertySetInfo.hxx
+++ b/include/comphelper/MasterPropertySetInfo.hxx
@@ -34,7 +34,7 @@ namespace comphelper
 
     private:
         virtual ~MasterPropertySetInfo()
-            throw();
+            throw() override;
 
         void add( PropertyInfoHash &rHash, sal_uInt8 nMapId );
 
diff --git a/include/comphelper/SelectionMultiplex.hxx b/include/comphelper/SelectionMultiplex.hxx
index 443e81721386..bc1c023f5a68 100644
--- a/include/comphelper/SelectionMultiplex.hxx
+++ b/include/comphelper/SelectionMultiplex.hxx
@@ -74,7 +74,7 @@ namespace comphelper
         OSelectionChangeMultiplexer(const OSelectionChangeMultiplexer&) = delete;
         OSelectionChangeMultiplexer& operator=(const OSelectionChangeMultiplexer&) = delete;
     protected:
-        virtual ~OSelectionChangeMultiplexer();
+        virtual ~OSelectionChangeMultiplexer() override;
     public:
         OSelectionChangeMultiplexer(OSelectionChangeListener* _pListener, const  css::uno::Reference< css::view::XSelectionSupplier>& _rxSet);
 
diff --git a/include/comphelper/SettingsHelper.hxx b/include/comphelper/SettingsHelper.hxx
index 5ed0029643ec..9998f3c07b32 100644
--- a/include/comphelper/SettingsHelper.hxx
+++ b/include/comphelper/SettingsHelper.hxx
@@ -43,7 +43,7 @@ namespace comphelper
         ChainableHelperNoState ( ChainablePropertySetInfo *pInfo, SolarMutex* pMutex = nullptr)
         : ChainablePropertySet ( pInfo, pMutex )
         {}
-        virtual ~ChainableHelperNoState () throw( ) {}
+        virtual ~ChainableHelperNoState () throw( ) override {}
         css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override
         { return HelperBaseNoState::queryInterface( aType ); }
         void SAL_CALL acquire(  ) throw () override
diff --git a/include/comphelper/accessiblecomponenthelper.hxx b/include/comphelper/accessiblecomponenthelper.hxx
index 9370cdfae20e..de445a2ce5bc 100644
--- a/include/comphelper/accessiblecomponenthelper.hxx
+++ b/include/comphelper/accessiblecomponenthelper.hxx
@@ -42,7 +42,7 @@ namespace comphelper
     protected:
         /// see the respective base class ctor for an extensive comment on this, please
         OCommonAccessibleComponent( IMutex* _pExternalLock );
-        virtual ~OCommonAccessibleComponent();
+        virtual ~OCommonAccessibleComponent() override;
 
     protected:
         /// implements the calculation of the bounding rectangle - still waiting to be overwritten
diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx
index 69759ee1aade..a7ad2c06a06f 100644
--- a/include/comphelper/accessiblecontexthelper.hxx
+++ b/include/comphelper/accessiblecontexthelper.hxx
@@ -90,7 +90,7 @@ namespace comphelper
         std::unique_ptr<OContextHelper_Impl>    m_pImpl;
 
     protected:
-        virtual ~OAccessibleContextHelper( );
+        virtual ~OAccessibleContextHelper( ) override;
 
         /** ctor
 
diff --git a/include/comphelper/accessiblekeybindinghelper.hxx b/include/comphelper/accessiblekeybindinghelper.hxx
index 89ea8d71b050..4ad6f425fff6 100644
--- a/include/comphelper/accessiblekeybindinghelper.hxx
+++ b/include/comphelper/accessiblekeybindinghelper.hxx
@@ -51,7 +51,7 @@ namespace comphelper
     protected:
         ::osl::Mutex    m_aMutex;
 
-        virtual ~OAccessibleKeyBindingHelper();
+        virtual ~OAccessibleKeyBindingHelper() override;
 
     public:
         OAccessibleKeyBindingHelper();
diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx
index 4676d2c45bea..d2f769fea2c4 100644
--- a/include/comphelper/accessiblewrapper.hxx
+++ b/include/comphelper/accessiblewrapper.hxx
@@ -113,7 +113,7 @@ namespace comphelper
             );
 
     protected:
-        virtual ~OAccessibleWrapper( );
+        virtual ~OAccessibleWrapper( ) override;
 
     private:
         OAccessibleWrapper( const OAccessibleWrapper& ) = delete;
@@ -224,7 +224,7 @@ namespace comphelper
         virtual void notifyTranslatedEvent( const css::accessibility::AccessibleEventObject& _rEvent ) throw (css::uno::RuntimeException) = 0;
 
     protected:
-        virtual ~OAccessibleContextWrapperHelper( );
+        virtual ~OAccessibleContextWrapperHelper( ) override;
 
         OAccessibleContextWrapperHelper(const OAccessibleContextWrapperHelper&) = delete;
         OAccessibleContextWrapperHelper& operator=(const OAccessibleContextWrapperHelper&) = delete;
@@ -299,7 +299,7 @@ namespace comphelper
         virtual void SAL_CALL disposing()  throw (css::uno::RuntimeException) override;
 
     protected:
-        virtual ~OAccessibleContextWrapper();
+        virtual ~OAccessibleContextWrapper() override;
 
     private:
         OAccessibleContextWrapper( const OAccessibleContextWrapper& ) = delete;
@@ -385,7 +385,7 @@ namespace comphelper
         void    implTranslateChildEventValue( const css::uno::Any& _rInValue, css::uno::Any& _rOutValue );
 
     protected:
-        virtual ~OWrappedAccessibleChildrenManager( );
+        virtual ~OWrappedAccessibleChildrenManager( ) override;
 
     private:
         OWrappedAccessibleChildrenManager( const OWrappedAccessibleChildrenManager& ) = delete;
diff --git a/include/comphelper/asyncnotification.hxx b/include/comphelper/asyncnotification.hxx
index a8439f8d36e7..f512b42f31b0 100644
--- a/include/comphelper/asyncnotification.hxx
+++ b/include/comphelper/asyncnotification.hxx
@@ -41,7 +41,7 @@ namespace comphelper
         AnyEvent();
 
     protected:
-        virtual ~AnyEvent();
+        virtual ~AnyEvent() override;
 
     private:
         AnyEvent( AnyEvent& ) = delete;
@@ -147,7 +147,7 @@ namespace comphelper
     {
 
     private:
-        SAL_DLLPRIVATE virtual ~AsyncEventNotifier();
+        SAL_DLLPRIVATE virtual ~AsyncEventNotifier() override;
 
         SAL_DLLPRIVATE virtual void execute() override;
 
@@ -178,7 +178,7 @@ namespace comphelper
 
     public:
         // only public so shared_ptr finds it
-        SAL_DLLPRIVATE virtual ~AsyncEventNotifierAutoJoin();
+        SAL_DLLPRIVATE virtual ~AsyncEventNotifierAutoJoin() override;
 
         static std::shared_ptr<AsyncEventNotifierAutoJoin>
             newAsyncEventNotifierAutoJoin(char const* name);
diff --git a/include/comphelper/attributelist.hxx b/include/comphelper/attributelist.hxx
index 0836e9c0e37d..49216967c02c 100644
--- a/include/comphelper/attributelist.hxx
+++ b/include/comphelper/attributelist.hxx
@@ -42,7 +42,7 @@ public:
     AttributeList();
     AttributeList(const AttributeList &r);
 
-    virtual ~AttributeList();
+    virtual ~AttributeList() override;
 
     // methods that are not contained in any interface
     void AddAttribute(const OUString &sName , const OUString &sType , const OUString &sValue);
diff --git a/include/comphelper/configurationlistener.hxx b/include/comphelper/configurationlistener.hxx
index 6d3091d1e7e4..d8cc06971ea3 100644
--- a/include/comphelper/configurationlistener.hxx
+++ b/include/comphelper/configurationlistener.hxx
@@ -55,7 +55,7 @@ public:
     inline ConfigurationListenerProperty(const rtl::Reference< ConfigurationListener > &xListener,
                                              const OUString &rProp );
 
-    virtual inline ~ConfigurationListenerProperty();
+    virtual inline ~ConfigurationListenerProperty() override;
 
     uno_type get() const { return maValue; }
 };
@@ -74,7 +74,7 @@ public:
                     css::uno::UNO_QUERY_THROW )
     { }
 
-    virtual ~ConfigurationListener()
+    virtual ~ConfigurationListener() override
     {
         dispose();
     }
diff --git a/include/comphelper/containermultiplexer.hxx b/include/comphelper/containermultiplexer.hxx
index 39d0c7895ae3..8b3b545c68ca 100644
--- a/include/comphelper/containermultiplexer.hxx
+++ b/include/comphelper/containermultiplexer.hxx
@@ -77,7 +77,7 @@ namespace comphelper
                                 m_xContainer;
         OContainerListener*     m_pListener;
 
-        virtual ~OContainerListenerAdapter();
+        virtual ~OContainerListenerAdapter() override;
 
     public:
         OContainerListenerAdapter(OContainerListener* _pListener,
diff --git a/include/comphelper/docpasswordrequest.hxx b/include/comphelper/docpasswordrequest.hxx
index 3dce6c94d18f..f8b19b180218 100644
--- a/include/comphelper/docpasswordrequest.hxx
+++ b/include/comphelper/docpasswordrequest.hxx
@@ -44,7 +44,7 @@ class COMPHELPER_DLLPUBLIC SimplePasswordRequest :
 {
 public:
     explicit    SimplePasswordRequest( css::task::PasswordRequestMode eMode );
-    virtual     ~SimplePasswordRequest();
+    virtual     ~SimplePasswordRequest() override;
 
     bool         isPassword() const;
 
@@ -74,7 +74,7 @@ public:
                             css::task::PasswordRequestMode eMode,
                             const OUString& rDocumentUrl,
                             bool bPasswordToModify = false );
-    virtual             ~DocPasswordRequest();
+    virtual             ~DocPasswordRequest() override;
 
     bool            isPassword() const;
 
diff --git a/include/comphelper/enumhelper.hxx b/include/comphelper/enumhelper.hxx
index e6d115eac9a5..6e116af61cb5 100644
--- a/include/comphelper/enumhelper.hxx
+++ b/include/comphelper/enumhelper.hxx
@@ -54,7 +54,7 @@ public:
     OEnumerationByName(const css::uno::Reference< css::container::XNameAccess >& _rxAccess);
     OEnumerationByName(const css::uno::Reference< css::container::XNameAccess >& _rxAccess,
                        const css::uno::Sequence< OUString >&             _aNames  );
-    virtual ~OEnumerationByName();
+    virtual ~OEnumerationByName() override;
 
     virtual sal_Bool SAL_CALL hasMoreElements(  ) throw(css::uno::RuntimeException, std::exception) override;
     virtual css::uno::Any SAL_CALL nextElement(  )
@@ -80,7 +80,7 @@ class COMPHELPER_DLLPUBLIC OEnumerationByIndex : private OEnumerationLock
 
 public:
     OEnumerationByIndex(const css::uno::Reference< css::container::XIndexAccess >& _rxAccess);
-    virtual ~OEnumerationByIndex();
+    virtual ~OEnumerationByIndex() override;
 
     virtual sal_Bool SAL_CALL hasMoreElements(  ) throw(css::uno::RuntimeException, std::exception) override;
     virtual css::uno::Any SAL_CALL nextElement(  )
@@ -109,7 +109,7 @@ class COMPHELPER_DLLPUBLIC OAnyEnumeration : private OEnumerationLock
 
 public:
     OAnyEnumeration(const css::uno::Sequence< css::uno::Any >& lItems);
-    virtual ~OAnyEnumeration();
+    virtual ~OAnyEnumeration() override;
 
     virtual sal_Bool SAL_CALL hasMoreElements(  ) throw(css::uno::RuntimeException, std::exception) override;
     virtual css::uno::Any SAL_CALL nextElement(  )
diff --git a/include/comphelper/numberedcollection.hxx b/include/comphelper/numberedcollection.hxx
index 48379eaf4435..7af2f9e68fda 100644
--- a/include/comphelper/numberedcollection.hxx
+++ b/include/comphelper/numberedcollection.hxx
@@ -77,7 +77,7 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex
 
         /** @short  free all internally used resources.
          */
-        virtual ~NumberedCollection();
+        virtual ~NumberedCollection() override;
 
 
         /** set an outside component which uses this container and must be set
diff --git a/include/comphelper/oslfile2streamwrap.hxx b/include/comphelper/oslfile2streamwrap.hxx
index 6bce31371fc1..842da52ea174 100644
--- a/include/comphelper/oslfile2streamwrap.hxx
+++ b/include/comphelper/oslfile2streamwrap.hxx
@@ -39,7 +39,7 @@ class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public ::cppu::WeakImplHelper
 
 public:
     OSLInputStreamWrapper(::osl::File& _rStream);
-    virtual ~OSLInputStreamWrapper();
+    virtual ~OSLInputStreamWrapper() override;
 
 // css::io::XInputStream
     virtual sal_Int32   SAL_CALL    readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override;
@@ -59,7 +59,7 @@ public:
     COMPHELPER_DLLPUBLIC OSLOutputStreamWrapper(::osl::File& _rFile);
 
 private:
-    virtual ~OSLOutputStreamWrapper();
+    virtual ~OSLOutputStreamWrapper() override;
 
 // css::io::XOutputStream
     virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override;
diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx
index 2ecc05b5156b..7797782f325b 100644
--- a/include/comphelper/propagg.hxx
+++ b/include/comphelper/propagg.hxx
@@ -255,7 +255,7 @@ public:
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw ( css::uno::Exception, std::exception ) override;
 
 protected:
-    virtual ~OPropertySetAggregationHelper();
+    virtual ~OPropertySetAggregationHelper() override;
 
     virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override;
     void disposing();
diff --git a/include/comphelper/propertysetinfo.hxx b/include/comphelper/propertysetinfo.hxx
index e30018f2ecca..48f257009cad 100644
--- a/include/comphelper/propertysetinfo.hxx
+++ b/include/comphelper/propertysetinfo.hxx
@@ -62,7 +62,7 @@ public:
     PropertySetInfo() throw();
     PropertySetInfo( PropertyMapEntry const * pMap ) throw();
     PropertySetInfo(css::uno::Sequence<css::beans::Property> const &) throw();
-    virtual ~PropertySetInfo() throw();
+    virtual ~PropertySetInfo() throw() override;
 
     /** returns a stl map with all PropertyMapEntry pointer.<p>
         The key is the property name.
diff --git a/include/comphelper/propmultiplex.hxx b/include/comphelper/propmultiplex.hxx
index 2bafa2411114..a65ce86865d6 100644
--- a/include/comphelper/propmultiplex.hxx
+++ b/include/comphelper/propmultiplex.hxx
@@ -80,7 +80,7 @@ namespace comphelper
         bool                                            m_bAutoSetRelease   : 1;
 
 
-        virtual ~OPropertyChangeMultiplexer();
+        virtual ~OPropertyChangeMultiplexer() override;
     public:
         OPropertyChangeMultiplexer(OPropertyChangeListener* _pListener, const  css::uno::Reference< css::beans::XPropertySet>& _rxSet, bool _bAutoReleaseSet = true);
 
diff --git a/include/comphelper/propstate.hxx b/include/comphelper/propstate.hxx
index a06296f9568a..fbce94e7951a 100644
--- a/include/comphelper/propstate.hxx
+++ b/include/comphelper/propstate.hxx
@@ -68,7 +68,7 @@ namespace comphelper
         virtual css::uno::Any              getPropertyDefaultByHandle(sal_Int32 nHandle) const;
 
     protected:
-        virtual ~OPropertyStateHelper();
+        virtual ~OPropertyStateHelper() override;
 
         void firePropertyChange(sal_Int32 nHandle, const css::uno::Any& aNewValue, const css::uno::Any& aOldValue);
 
@@ -85,7 +85,7 @@ namespace comphelper
     {
     protected:
         OStatefulPropertySet();
-        virtual ~OStatefulPropertySet();
+        virtual ~OStatefulPropertySet() override;
 
     protected:
         DECLARE_XINTERFACE()
diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx
index eadafbf9aefb..756004234be7 100644
--- a/include/comphelper/proxyaggregation.hxx
+++ b/include/comphelper/proxyaggregation.hxx
@@ -186,7 +186,7 @@ namespace comphelper
             const css::uno::Reference< css::lang::XComponent >& _rxComponent
         );
 
-        virtual ~OComponentProxyAggregation();
+        virtual ~OComponentProxyAggregation() override;
 
         // XInterface
         DECLARE_XINTERFACE()
diff --git a/include/comphelper/seekableinput.hxx b/include/comphelper/seekableinput.hxx
index 326db1a702e9..bbb566ade6f4 100644
--- a/include/comphelper/seekableinput.hxx
+++ b/include/comphelper/seekableinput.hxx
@@ -55,7 +55,7 @@ public:
                 const css::uno::Reference< css::io::XInputStream >& xInStream,
                 const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
-    virtual ~OSeekableInputWrapper();
+    virtual ~OSeekableInputWrapper() override;
 
     static css::uno::Reference< css::io::XInputStream > CheckSeekableCanWrap(
                         const css::uno::Reference< css::io::XInputStream >& xInStream,
diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx
index 49e4911f79bb..ab1f344c717b 100644
--- a/include/comphelper/seqstream.hxx
+++ b/include/comphelper/seqstream.hxx
@@ -93,7 +93,7 @@ protected:
     ::osl::Mutex                                    m_aMutex;
 
 protected:
-    virtual ~OSequenceOutputStream() { if (m_bConnected) closeOutput(); }
+    virtual ~OSequenceOutputStream() override { if (m_bConnected) closeOutput(); }
 
 public:
     /** constructs the object. Everything written into the stream through the XOutputStream methods will be forwarded
diff --git a/include/comphelper/simplefileaccessinteraction.hxx b/include/comphelper/simplefileaccessinteraction.hxx
index fd05bb77fe1e..69cec86d1712 100644
--- a/include/comphelper/simplefileaccessinteraction.hxx
+++ b/include/comphelper/simplefileaccessinteraction.hxx
@@ -36,7 +36,7 @@ class COMPHELPER_DLLPUBLIC SimpleFileAccessInteraction : public ::ucbhelper::Int
 
 public:
     SimpleFileAccessInteraction(const css::uno::Reference< css::task::XInteractionHandler >& xHandler);
-    virtual ~SimpleFileAccessInteraction();
+    virtual ~SimpleFileAccessInteraction() override;
 
 private:
 
diff --git a/include/comphelper/unique_disposing_ptr.hxx b/include/comphelper/unique_disposing_ptr.hxx
index 0f120b179392..75be7d6dabec 100644
--- a/include/comphelper/unique_disposing_ptr.hxx
+++ b/include/comphelper/unique_disposing_ptr.hxx
@@ -85,7 +85,7 @@ private:
             }
         }
 
-        virtual ~TerminateListener()
+        virtual ~TerminateListener() override
         {
             if ( m_xComponent.is() )
             {
diff --git a/include/comphelper/weak.hxx b/include/comphelper/weak.hxx
index 635337c3462b..0d8d9d5b2965 100644
--- a/include/comphelper/weak.hxx
+++ b/include/comphelper/weak.hxx
@@ -38,7 +38,7 @@ class COMPHELPER_DLLPUBLIC OWeakTypeObject : public ::cppu::OWeakObject, public
 {
 public:
     OWeakTypeObject();
-    virtual ~OWeakTypeObject();
+    virtual ~OWeakTypeObject() override;
 
     virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type & rType )  throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL acquire() throw () override;