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

19 files changed, 33 insertions, 33 deletions

diff --git a/basic/inc/sbobjmod.hxx b/basic/inc/sbobjmod.hxx
index 8d79bddcd842..58504c621dd9 100644
--- a/basic/inc/sbobjmod.hxx
+++ b/basic/inc/sbobjmod.hxx
@@ -34,7 +34,7 @@
 class BASIC_DLLPUBLIC SbObjModule : public SbModule
 {
 protected:
-    virtual ~SbObjModule();
+    virtual ~SbObjModule() override;
 
 public:
     SbObjModule( const OUString& rName, const css::script::ModuleInfo& mInfo, bool bIsVbaCompatible );
@@ -61,7 +61,7 @@ class BASIC_DLLPUBLIC SbUserFormModule : public SbObjModule
     void InitObject();
 public:
     SbUserFormModule( const OUString& rName, const css::script::ModuleInfo& mInfo, bool bIsVBACompat );
-    virtual ~SbUserFormModule();
+    virtual ~SbUserFormModule() override;
     virtual SbxVariable* Find( const OUString& rName, SbxClassType t ) override;
     void ResetApiObj( bool bTriggerTerminateEvent = true );
     void Unload();
diff --git a/basic/inc/sbprop.hxx b/basic/inc/sbprop.hxx
index 2d4418068fd5..236a34e671f9 100644
--- a/basic/inc/sbprop.hxx
+++ b/basic/inc/sbprop.hxx
@@ -33,7 +33,7 @@ class BASIC_DLLPUBLIC SbProperty : public SbxProperty
     friend class SbProcedureProperty;
     SbModule* pMod;
     BASIC_DLLPRIVATE SbProperty( const OUString&, SbxDataType, SbModule* );
-    virtual ~SbProperty();
+    virtual ~SbProperty() override;
 public:
     SBX_DECL_PERSIST_NODATA(SBXID_BASICPROP,1);
     SbModule* GetModule() { return pMod; }
@@ -45,7 +45,7 @@ class BASIC_DLLPUBLIC SbProcedureProperty : public SbxProperty
 {
     bool mbSet;     // Flag for set command
 
-    virtual ~SbProcedureProperty();
+    virtual ~SbProcedureProperty() override;
 
 public:
     SbProcedureProperty( const OUString& r, SbxDataType t )
diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx
index cd420ac32e29..b0840a84a3a6 100644
--- a/basic/inc/sbstdobj.hxx
+++ b/basic/inc/sbstdobj.hxx
@@ -40,7 +40,7 @@ class BASIC_DLLPUBLIC SbStdPicture : public SbxObject
 protected:
     Graphic     aGraphic;
 
-    virtual ~SbStdPicture();
+    virtual ~SbStdPicture() override;
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
     void    PropType( SbxVariable* pVar, SbxArray* pPar, bool bWrite );
@@ -66,7 +66,7 @@ protected:
     sal_uInt16  nSize;
     OUString  aName;
 
-    virtual ~SbStdFont();
+    virtual ~SbStdFont() override;
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
     void    PropBold( SbxVariable* pVar, SbxArray* pPar, bool bWrite );
@@ -99,7 +99,7 @@ class BASIC_DLLPUBLIC SbStdClipboard : public SbxObject
 {
 protected:
 
-    virtual ~SbStdClipboard();
+    virtual ~SbStdClipboard() override;
     virtual void   Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
     static void    MethClear( SbxVariable* pVar, SbxArray* pPar_, bool bWrite );
diff --git a/basic/qa/cppunit/basic_coverage.cxx b/basic/qa/cppunit/basic_coverage.cxx
index 39a8ebc5ba2b..34f6ae3e729b 100644
--- a/basic/qa/cppunit/basic_coverage.cxx
+++ b/basic/qa/cppunit/basic_coverage.cxx
@@ -30,7 +30,7 @@ private:
 
 public:
     Coverage();
-    virtual ~Coverage();
+    virtual ~Coverage() override;
 
     void Coverage_Iterator();
 
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index ee0d6dc1ec3b..7673f85e1e29 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -25,7 +25,7 @@ namespace
     {
         public:
         VBATest() : BootstrapFixture(true, false) {}
-        virtual ~VBATest(){}
+        virtual ~VBATest() override {}
         void testMiscVBAFunctions();
         void testMiscOLEStuff();
         // Adds code needed to register the test suite
diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx
index 45421d50600c..23914649a187 100644
--- a/basic/source/classes/errobject.cxx
+++ b/basic/source/classes/errobject.cxx
@@ -38,7 +38,7 @@ class ErrObject : public ::cppu::WeakImplHelper< vba::XErrObject,
 
 public:
     ErrObject();
-    virtual ~ErrObject();
+    virtual ~ErrObject() override;
     // Attributes
     virtual ::sal_Int32 SAL_CALL getNumber() throw (uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException, std::exception) override;
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 676fc80d408b..1696e66eebf4 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -67,7 +67,7 @@ class DocBasicItem : public ::cppu::WeakImplHelper< util::XCloseListener >
 {
 public:
     explicit DocBasicItem( StarBASIC& rDocBasic );
-    virtual ~DocBasicItem();
+    virtual ~DocBasicItem() override;
 
     inline const SbxObjectRef& getClassModules() const { return mxClassModules; }
     inline bool isDocClosed() const { return mbDocClosed; }
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 313756153e94..198f14eb9420 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -3834,7 +3834,7 @@ public:
     OUString        aPrefixName;
 
     explicit BasicAllListener_Impl( const OUString& aPrefixName );
-    virtual ~BasicAllListener_Impl();
+    virtual ~BasicAllListener_Impl() override;
 
     // Methods of XAllListener
     virtual void SAL_CALL firing(const AllEventObject& Event) throw ( RuntimeException, std::exception ) override;
@@ -4259,7 +4259,7 @@ class ModuleInvocationProxy : public WeakImplHelper< XInvocation, XComponent >
 
 public:
     ModuleInvocationProxy( const OUString& aPrefix, SbxObjectRef xScopeObj );
-    virtual ~ModuleInvocationProxy()
+    virtual ~ModuleInvocationProxy() override
     {}
 
     // XInvocation
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 76ab1aa44761..0082d9f15d1b 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -99,7 +99,7 @@ class DocObjectWrapper : public DocObjectWrapper_BASE
 
 public:
     explicit DocObjectWrapper( SbModule* pMod );
-    virtual ~DocObjectWrapper();
+    virtual ~DocObjectWrapper() override;
 
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
@@ -2284,7 +2284,7 @@ public:
         }
     }
 
-    virtual ~FormObjEventListenerImpl()
+    virtual ~FormObjEventListenerImpl() override
     {
         removeListener();
     }
diff --git a/basic/source/inc/errobject.hxx b/basic/source/inc/errobject.hxx
index 796b83102269..427f2f1b8715 100644
--- a/basic/source/inc/errobject.hxx
+++ b/basic/source/inc/errobject.hxx
@@ -29,7 +29,7 @@ class SbxErrObject : public SbUnoObject
     css::uno::Reference< ooo::vba::XErrObject > m_xErr;
 
     SbxErrObject( const OUString& aName_, const css::uno::Any& aUnoObj_ );
-    virtual ~SbxErrObject();
+    virtual ~SbxErrObject() override;
 
 public:
     static SbxVariableRef const & getErrObject();
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 0a342c33ab41..a09639f82179 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -371,7 +371,7 @@ private:
 
 public:
     SfxLibraryContainer();
-    virtual ~SfxLibraryContainer();
+    virtual ~SfxLibraryContainer() override;
 
 
     // Interface to set the BasicManager (Hack for password implementation)
diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx
index 10c0547f8e4b..1488625498bb 100644
--- a/basic/source/inc/propacc.hxx
+++ b/basic/source/inc/propacc.hxx
@@ -44,7 +44,7 @@ private:
 
 public:
                             SbPropertyValues();
-    virtual                 ~SbPropertyValues();
+    virtual                 ~SbPropertyValues() override;
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx
index a95a27fdbbab..55d6dd1af5ca 100644
--- a/basic/source/inc/sbintern.hxx
+++ b/basic/source/inc/sbintern.hxx
@@ -67,7 +67,7 @@ class BASIC_DLLPUBLIC SbClassFactory : public SbxFactory
 
 public:
     SbClassFactory();
-    virtual ~SbClassFactory();
+    virtual ~SbClassFactory() override;
 
     void AddClassModule( SbModule* pClassModule );
     void RemoveClassModule( SbModule* pClassModule );
diff --git a/basic/source/inc/sbjsmeth.hxx b/basic/source/inc/sbjsmeth.hxx
index c33f47dcd46b..0c7ce3432b51 100644
--- a/basic/source/inc/sbjsmeth.hxx
+++ b/basic/source/inc/sbjsmeth.hxx
@@ -31,7 +31,7 @@ class SbJScriptMethod : public SbMethod
 {
 public:
     SbJScriptMethod( const OUString&, SbxDataType, SbModule* );
-    virtual ~SbJScriptMethod();
+    virtual ~SbJScriptMethod() override;
 
     SBX_DECL_PERSIST_NODATA(SBXID_JSCRIPTMETH,2);
 };
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index 25775b4e48d4..e1d64f4b6739 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -84,7 +84,7 @@ public:
     StructRefInfo getStructMember( const OUString& rMember );
     const StructRefInfo& getStructInfo() { return maMemberInfo; }
     SbUnoStructRefObject( const OUString& aName_, const StructRefInfo& rMemberInfo );
-    virtual ~SbUnoStructRefObject();
+    virtual ~SbUnoStructRefObject() override;
 
     // override Find to support e. g. NameAccess
     virtual SbxVariable* Find( const OUString&, SbxClassType ) override;
@@ -119,7 +119,7 @@ class SbUnoObject: public SbxObject
 public:
     static bool getDefaultPropName( SbUnoObject* pUnoObj, OUString& sDfltProp );
     SbUnoObject( const OUString& aName_, const css::uno::Any& aUnoObj_ );
-    virtual ~SbUnoObject();
+    virtual ~SbUnoObject() override;
 
     // #76470 do introspection on demand
     void doIntrospection();
@@ -166,7 +166,7 @@ public:
 
     SbUnoMethod( const OUString& aName_, SbxDataType eSbxType, css::uno::Reference< css::reflection::XIdlMethod > const & xUnoMethod_,
         bool bInvocation );
-    virtual ~SbUnoMethod();
+    virtual ~SbUnoMethod() override;
     virtual SbxInfo* GetInfo() override;
 
     const css::uno::Sequence< css::reflection::ParamInfo >& getParamInfos();
@@ -186,7 +186,7 @@ class SbUnoProperty : public SbxProperty
 
     bool mbInvocation;      // Property is based on invocation
     SbxDataType mRealType;
-    virtual ~SbUnoProperty();
+    virtual ~SbUnoProperty() override;
     bool mbUnoStruct;
     SbUnoProperty( const SbUnoProperty&) = delete;
     SbUnoProperty& operator = ( const SbUnoProperty&) = delete;
@@ -273,7 +273,7 @@ class SbUnoServiceCtor : public SbxMethod
 public:
 
     SbUnoServiceCtor( const OUString& aName_, css::uno::Reference< css::reflection::XServiceConstructorDescription > const & xServiceCtorDesc );
-    virtual ~SbUnoServiceCtor();
+    virtual ~SbUnoServiceCtor() override;
     virtual SbxInfo* GetInfo() override;
 
     const css::uno::Reference< css::reflection::XServiceConstructorDescription >& getServiceCtorDesc()
@@ -353,7 +353,7 @@ class BasicCollection : public SbxObject
     static SbxInfoRef xItemInfo;
 
     void Initialize();
-    virtual ~BasicCollection();
+    virtual ~BasicCollection() override;
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
     sal_Int32 implGetIndex( SbxVariable* pIndexVar );
     sal_Int32 implGetIndexForName( const OUString& rName );
diff --git a/basic/source/inc/stdobj.hxx b/basic/source/inc/stdobj.hxx
index 0d6293f84e4c..12eb8dc31234 100644
--- a/basic/source/inc/stdobj.hxx
+++ b/basic/source/inc/stdobj.hxx
@@ -29,7 +29,7 @@ class SbiStdObject : public SbxObject
 {
     SbStdFactory* pStdFactory;
 
-    virtual ~SbiStdObject();
+    virtual ~SbiStdObject() override;
     using SbxVariable::GetInfo;
     static SbxInfo* GetInfo( short );
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index 1fff808467cb..f1ba8d0028f3 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -173,7 +173,7 @@ class SbiProcDef : public SbiSymDef {   // procedure definition (from basic):
     bool   mbProcDecl : 1;          // true: instantiated by SbiParser::ProcDecl
 public:
     SbiProcDef( SbiParser*, const OUString&, bool bProcDecl=false );
-    virtual ~SbiProcDef();
+    virtual ~SbiProcDef() override;
     virtual SbiProcDef* GetProcDef() override;
     virtual void SetType( SbxDataType ) override;
     SbiSymPool& GetParams()         { return aParams;  }
@@ -209,7 +209,7 @@ class SbiConstDef : public SbiSymDef
     OUString aVal;
 public:
     SbiConstDef( const OUString& );
-    virtual ~SbiConstDef();
+    virtual ~SbiConstDef() override;
     virtual SbiConstDef* GetConstDef() override;
     void Set( double, SbxDataType );
     void Set( const OUString& );
diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index 07084e4a798b..b0a4655e8a0e 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -46,7 +46,7 @@ class SvRTLInputBox : public ModalDialog
 public:
     SvRTLInputBox( vcl::Window* pParent, const OUString& rPrompt, const OUString& rTitle,
         const OUString& rDefault, long nXTwips = -1, long nYTwips = -1 );
-    virtual ~SvRTLInputBox() { disposeOnce(); }
+    virtual ~SvRTLInputBox() override { disposeOnce(); }
     virtual void dispose() override;
     OUString GetText() const override { return aText; }
 };
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index c6c1390ea87c..fa68d4d4f4d7 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -70,7 +70,7 @@ class SbiInputDialog : public ModalDialog {
     DECL_LINK_TYPED( Cancel, Button *, void );
 public:
     SbiInputDialog( vcl::Window*, const OUString& );
-    virtual ~SbiInputDialog() { disposeOnce(); }
+    virtual ~SbiInputDialog() override { disposeOnce(); }
     virtual void dispose() override;
     const OUString& GetInput() { return aText; }
 };
@@ -212,7 +212,7 @@ class OslStream : public SvStream
 
 public:
                         OslStream( const OUString& rName, StreamMode nStrmMode );
-                       virtual ~OslStream();
+                       virtual ~OslStream() override;
     virtual sal_Size GetData( void* pData, sal_Size nSize ) override;
     virtual sal_Size PutData( const void* pData, sal_Size nSize ) override;
     virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) override;
@@ -308,7 +308,7 @@ class UCBStream : public SvStream
 public:
     explicit UCBStream( Reference< XInputStream > & xIS );
     explicit UCBStream( Reference< XStream > & xS );
-                       virtual ~UCBStream();
+                       virtual ~UCBStream() override;
     virtual sal_Size GetData( void* pData, sal_Size nSize ) override;
     virtual sal_Size PutData( const void* pData, sal_Size nSize ) override;
     virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) override;