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

42 files changed, 79 insertions, 79 deletions

diff --git a/sdext/source/minimizer/pppoptimizer.hxx b/sdext/source/minimizer/pppoptimizer.hxx
index 17e1222b2cd9..91ef44cbd147 100644
--- a/sdext/source/minimizer/pppoptimizer.hxx
+++ b/sdext/source/minimizer/pppoptimizer.hxx
@@ -40,7 +40,7 @@ public:
     PPPOptimizer(
         css::uno::Reference<css::uno::XComponentContext> const & xContext,
         css::uno::Reference< css::frame::XFrame > const & xFrame);
-    virtual     ~PPPOptimizer();
+    virtual     ~PPPOptimizer() override;
 
     // XDispatchProvider
     virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(
diff --git a/sdext/source/minimizer/pppoptimizerdialog.hxx b/sdext/source/minimizer/pppoptimizerdialog.hxx
index 774885501cd4..1ff64ea583f7 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.hxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.hxx
@@ -51,7 +51,7 @@ class PPPOptimizerDialog : public   ::cppu::WeakImplHelper<
 public:
 
     explicit PPPOptimizerDialog( const css::uno::Reference< css::uno::XComponentContext >& xContext );
-    virtual ~PPPOptimizerDialog();
+    virtual ~PPPOptimizerDialog() override;
 
     // XInitialization
     void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx
index 8889679f9d12..747fab155576 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -57,7 +57,7 @@ public:
     FileEmitContext( const OUString&                            rOrigFile,
                      const uno::Reference< uno::XComponentContext >& xContext,
                      const pdfparse::PDFContainer*                   pTop );
-    virtual ~FileEmitContext();
+    virtual ~FileEmitContext() override;
 
     virtual bool         write( const void* pBuf, unsigned int nLen ) override;
     virtual unsigned int getCurPos() override;
diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx b/sdext/source/pdfimport/inc/pdfparse.hxx
index 09a4e171dc2c..f11c833161b1 100644
--- a/sdext/source/pdfimport/inc/pdfparse.hxx
+++ b/sdext/source/pdfimport/inc/pdfparse.hxx
@@ -72,7 +72,7 @@ struct PDFComment : public PDFEntry
 
     explicit PDFComment( const OString& rComment )
     : PDFEntry(), m_aComment( rComment ) {}
-    virtual ~PDFComment();
+    virtual ~PDFComment() override;
     virtual bool emit( EmitContext& rWriteContext ) const override;
     virtual PDFEntry* clone() const override;
 };
@@ -81,7 +81,7 @@ struct PDFValue : public PDFEntry
 {
     // abstract base class for simple values
     PDFValue() : PDFEntry() {}
-    virtual ~PDFValue();
+    virtual ~PDFValue() override;
 };
 
 struct PDFName : public PDFValue
@@ -90,7 +90,7 @@ struct PDFName : public PDFValue
 
     explicit PDFName( const OString& rName )
     : PDFValue(), m_aName( rName ) {}
-    virtual ~PDFName();
+    virtual ~PDFName() override;
     virtual bool emit( EmitContext& rWriteContext ) const override;
     virtual PDFEntry* clone() const override;
 
@@ -103,7 +103,7 @@ struct PDFString : public PDFValue
 
     explicit PDFString( const OString& rString )
     : PDFValue(), m_aString( rString ) {}
-    virtual ~PDFString();
+    virtual ~PDFString() override;
     virtual bool emit( EmitContext& rWriteContext ) const override;
     virtual PDFEntry* clone() const override;
 
@@ -116,7 +116,7 @@ struct PDFNumber : public PDFValue
 
     explicit PDFNumber( double fVal )
     : PDFValue(), m_fValue( fVal ) {}
-    virtual ~PDFNumber();
+    virtual ~PDFNumber() override;
     virtual bool emit( EmitContext& rWriteContext ) const override;
     virtual PDFEntry* clone() const override;
 };
@@ -127,7 +127,7 @@ struct PDFBool : public PDFValue
 
     explicit PDFBool( bool bVal )
     : PDFValue(), m_bValue( bVal ) {}
-    virtual ~PDFBool();
+    virtual ~PDFBool() override;
     virtual bool emit( EmitContext& rWriteContext ) const override;
     virtual PDFEntry* clone() const override;
 };
@@ -139,7 +139,7 @@ struct PDFObjectRef : public PDFValue
 
     PDFObjectRef( unsigned int nNr, unsigned int nGen )
     : PDFValue(), m_nNumber( nNr ), m_nGeneration( nGen ) {}
-    virtual ~PDFObjectRef();
+    virtual ~PDFObjectRef() override;
     virtual bool emit( EmitContext& rWriteContext ) const override;
     virtual PDFEntry* clone() const override;
 };
@@ -147,7 +147,7 @@ struct PDFObjectRef : public PDFValue
 struct PDFNull : public PDFValue
 {
     PDFNull() {}
-    virtual ~PDFNull();
+    virtual ~PDFNull() override;
     virtual bool emit( EmitContext& rWriteContext ) const override;
     virtual PDFEntry* clone() const override;
 };
@@ -161,7 +161,7 @@ struct PDFContainer : public PDFEntry
     // this is an abstract base class for identifying
     // entries that can contain sub elements besides comments
     PDFContainer() : PDFEntry(), m_nOffset( 0 ) {}
-    virtual ~PDFContainer();
+    virtual ~PDFContainer() override;
     bool emitSubElements( EmitContext& rWriteContext ) const;
     void cloneSubElements( std::vector<PDFEntry*>& rNewSubElements ) const;
 
@@ -173,7 +173,7 @@ struct PDFContainer : public PDFEntry
 struct PDFArray : public PDFContainer
 {
     PDFArray() {}
-    virtual ~PDFArray();
+    virtual ~PDFArray() override;
     virtual bool emit( EmitContext& rWriteContext ) const override;
     virtual PDFEntry* clone() const override;
 };
@@ -184,7 +184,7 @@ struct PDFDict : public PDFContainer
     Map m_aMap;
 
     PDFDict() {}
-    virtual ~PDFDict();
+    virtual ~PDFDict() override;
     virtual bool emit( EmitContext& rWriteContext ) const override;
     virtual PDFEntry* clone() const override;
 
@@ -206,7 +206,7 @@ struct PDFStream : public PDFEntry
 
     PDFStream( unsigned int nBegin, unsigned int nEnd, PDFDict* pStreamDict )
     : PDFEntry(), m_nBeginOffset( nBegin ), m_nEndOffset( nEnd ), m_pDict( pStreamDict ) {}
-    virtual ~PDFStream();
+    virtual ~PDFStream() override;
     virtual bool emit( EmitContext& rWriteContext ) const override;
     virtual PDFEntry* clone() const override;
 
@@ -218,7 +218,7 @@ struct PDFTrailer : public PDFContainer
     PDFDict*        m_pDict;
 
     PDFTrailer() : PDFContainer(), m_pDict( nullptr ) {}
-    virtual ~PDFTrailer();
+    virtual ~PDFTrailer() override;
     virtual bool emit( EmitContext& rWriteContext ) const override;
     virtual PDFEntry* clone() const override;
 };
@@ -238,7 +238,7 @@ public:
       m_pData( nullptr ),
       m_nMajor( 0 ), m_nMinor( 0 )
     {}
-    virtual ~PDFFile();
+    virtual ~PDFFile() override;
 
     virtual bool emit( EmitContext& rWriteContext ) const override;
     virtual PDFEntry* clone() const override;
@@ -268,7 +268,7 @@ struct PDFObject : public PDFContainer
 
     PDFObject( unsigned int nNr, unsigned int nGen )
     : m_pObject( nullptr ), m_pStream( nullptr ), m_nNumber( nNr ), m_nGeneration( nGen ) {}
-    virtual ~PDFObject();
+    virtual ~PDFObject() override;
     virtual bool emit( EmitContext& rWriteContext ) const override;
     virtual PDFEntry* clone() const override;
 
@@ -286,7 +286,7 @@ private:
 struct PDFPart : public PDFContainer
 {
     PDFPart() : PDFContainer() {}
-    virtual ~PDFPart();
+    virtual ~PDFPart() override;
     virtual bool emit( EmitContext& rWriteContext ) const override;
     virtual PDFEntry* clone() const override;
 };
diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx
index ee189ade5bc0..ef25e919ee1c 100644
--- a/sdext/source/pdfimport/misc/pwdinteract.cxx
+++ b/sdext/source/pdfimport/misc/pwdinteract.cxx
@@ -70,7 +70,7 @@ public:
     bool isSelected() const { osl::MutexGuard const guard( m_aMutex ); return m_bSelected; }
 
 private:
-    virtual ~PDFPasswordRequest() {}
+    virtual ~PDFPasswordRequest() override {}
 };
 
 PDFPasswordRequest::PDFPasswordRequest( bool bFirstTry, const OUString& rName ) :
@@ -128,7 +128,7 @@ public:
     UnsupportedEncryptionFormatRequest& operator=(const UnsupportedEncryptionFormatRequest&) = delete;
 
 private:
-    virtual ~UnsupportedEncryptionFormatRequest() {}
+    virtual ~UnsupportedEncryptionFormatRequest() override {}
 
     virtual uno::Any SAL_CALL getRequest() throw (uno::RuntimeException, std::exception) override {
         return uno::makeAny(
diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index 2d73ffdc724f..6b9b0f869720 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -49,7 +49,7 @@ class StringEmitContext : public EmitContext
     OStringBuffer m_aBuf;
     public:
     StringEmitContext() : EmitContext(), m_aBuf(256) {}
-    virtual ~StringEmitContext() {}
+    virtual ~StringEmitContext() override {}
     virtual bool write( const void* pBuf, unsigned int nLen ) throw() override
     {
         m_aBuf.append( static_cast<const sal_Char*>(pBuf), nLen );
diff --git a/sdext/source/pdfimport/sax/emitcontext.hxx b/sdext/source/pdfimport/sax/emitcontext.hxx
index b0e198f1248a..d5a113734131 100644
--- a/sdext/source/pdfimport/sax/emitcontext.hxx
+++ b/sdext/source/pdfimport/sax/emitcontext.hxx
@@ -38,7 +38,7 @@ namespace pdfi
     public:
         explicit SaxEmitter( const css::uno::Reference<
                                     css::xml::sax::XDocumentHandler >& xDocHdl );
-        virtual ~SaxEmitter();
+        virtual ~SaxEmitter() override;
 
         virtual void beginTag( const char* pTag, const PropertyMap& rProperties ) override;
         virtual void write( const OUString& rString ) override;
diff --git a/sdext/source/pdfimport/sax/saxattrlist.hxx b/sdext/source/pdfimport/sax/saxattrlist.hxx
index 04b766460177..c57cd5ac69f4 100644
--- a/sdext/source/pdfimport/sax/saxattrlist.hxx
+++ b/sdext/source/pdfimport/sax/saxattrlist.hxx
@@ -49,7 +49,7 @@ namespace pdfi
     public:
         explicit SaxAttrList( const std::unordered_map< OUString, OUString, OUStringHash >& );
         SaxAttrList( const SaxAttrList& );
-        virtual ~SaxAttrList();
+        virtual ~SaxAttrList() override;
 
         // css::xml::sax::XAttributeList
         virtual sal_Int16 SAL_CALL getLength() throw(std::exception) override;
diff --git a/sdext/source/pdfimport/test/pdfunzip.cxx b/sdext/source/pdfimport/test/pdfunzip.cxx
index 27e659e18e12..cb03ad75268f 100644
--- a/sdext/source/pdfimport/test/pdfunzip.cxx
+++ b/sdext/source/pdfimport/test/pdfunzip.cxx
@@ -62,7 +62,7 @@ class FileEmitContext : public EmitContext
 
     public:
     FileEmitContext( const char* pFileName, const char* pOrigName, const PDFContainer* pTop );
-    virtual ~FileEmitContext();
+    virtual ~FileEmitContext() override;
 
     virtual bool write( const void* pBuf, unsigned int nLen ) throw() override;
     virtual unsigned int getCurPos() throw() override;
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx
index d544eb51c9be..f24a8b4cef73 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -82,7 +82,7 @@ namespace
             m_bImageSeen(false)
         {}
 
-        virtual ~TestSink() {}
+        virtual ~TestSink() override {}
 
         void check()
         {
diff --git a/sdext/source/pdfimport/tree/genericelements.hxx b/sdext/source/pdfimport/tree/genericelements.hxx
index 21b2c884823f..63fa7845cf5e 100644
--- a/sdext/source/pdfimport/tree/genericelements.hxx
+++ b/sdext/source/pdfimport/tree/genericelements.hxx
@@ -251,7 +251,7 @@ namespace pdfi
         // helper method for resolveHyperlinks
         bool resolveHyperlink( const std::list<Element*>::iterator& link_it, std::list<Element*>& rElements );
     public:
-        virtual ~PageElement();
+        virtual ~PageElement() override;
 
         virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& rParentIt ) override;
 
@@ -276,7 +276,7 @@ namespace pdfi
     protected:
         DocumentElement() : Element( nullptr ) {}
     public:
-        virtual ~DocumentElement();
+        virtual ~DocumentElement() override;
 
         virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ) override;
     };
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.hxx b/sdext/source/pdfimport/tree/writertreevisiting.hxx
index ea6fca23ec8b..dcd9942924f2 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.hxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.hxx
@@ -37,7 +37,7 @@ namespace pdfi
         explicit WriterXmlOptimizer(PDFIProcessor& rProcessor) :
             m_rProcessor(rProcessor)
         {}
-        virtual ~WriterXmlOptimizer()
+        virtual ~WriterXmlOptimizer() override
         {}
 
         virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) override;
@@ -66,7 +66,7 @@ namespace pdfi
             m_rStyleContainer(rStyleContainer),
             m_rProcessor(rProcessor)
         {}
-        virtual ~WriterXmlFinalizer()
+        virtual ~WriterXmlFinalizer() override
         {}
 
         virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) override;
@@ -91,7 +91,7 @@ namespace pdfi
         explicit WriterXmlEmitter(EmitContext& rEmitContext) :
             m_rEmitContext(rEmitContext)
         {}
-        virtual ~WriterXmlEmitter()
+        virtual ~WriterXmlEmitter() override
         {}
 
         virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) override;
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index 73ea8bf1062b..d060cde8ba54 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -143,7 +143,7 @@ namespace pdfi
 
     public:
         explicit PDFOutDev( PDFDoc* pDoc );
-        virtual ~PDFOutDev();
+        virtual ~PDFOutDev() override;
 
         //----- get info about output device
 
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index 521ddd727708..766a9f87f376 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -72,7 +72,7 @@ public:
         const OUString& rsName);
     void LateInitialization();
 
-    virtual ~AccessibleObject();
+    virtual ~AccessibleObject() override;
 
     virtual void SetWindow (
         const css::uno::Reference<css::awt::XWindow>& rxContentWindow,
@@ -237,7 +237,7 @@ class AccessibleStateSet
 {
 public:
     explicit AccessibleStateSet (const sal_Int32 nStateSet);
-    virtual ~AccessibleStateSet();
+    virtual ~AccessibleStateSet() override;
 
     static sal_uInt32 GetStateMask (const sal_Int16 nType);
 
@@ -273,7 +273,7 @@ class AccessibleRelationSet
 {
 public:
     AccessibleRelationSet();
-    virtual ~AccessibleRelationSet();
+    virtual ~AccessibleRelationSet() override;
 
     void AddRelation (
         const sal_Int16 nRelationType,
@@ -316,7 +316,7 @@ public:
         const SharedPresenterTextParagraph& rpParagraph,
         const sal_Int32 nParagraphIndex);
 
-    virtual ~AccessibleParagraph();
+    virtual ~AccessibleParagraph() override;
 
     //----- XAccessibleContext ------------------------------------------------
 
diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx
index cf32043e2917..30866b9b9151 100644
--- a/sdext/source/presenter/PresenterAccessibility.hxx
+++ b/sdext/source/presenter/PresenterAccessibility.hxx
@@ -62,7 +62,7 @@ public:
         const css::uno::Reference<css::uno::XComponentContext>& rxContext,
         const ::rtl::Reference<PresenterController>& rpPresenterController,
         const css::uno::Reference<css::drawing::framework::XPane>& rxMainPane);
-    virtual ~PresenterAccessible();
+    virtual ~PresenterAccessible() override;
 
     void UpdateAccessibilityHierarchy();
 
diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx
index 0f5bd77bf75b..eac955e60b4a 100644
--- a/sdext/source/presenter/PresenterButton.hxx
+++ b/sdext/source/presenter/PresenterButton.hxx
@@ -62,7 +62,7 @@ public:
         const css::uno::Reference<css::awt::XWindow>& rxParentWindow,
         const css::uno::Reference<css::rendering::XCanvas>& rxParentCanvas,
         const OUString& rsConfigurationName);
-    virtual ~PresenterButton();
+    virtual ~PresenterButton() override;
     PresenterButton(const PresenterButton&) = delete;
     PresenterButton& operator=(const PresenterButton&) = delete;
 
diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx
index 0bb013fa92ce..e54bcf0b2903 100644
--- a/sdext/source/presenter/PresenterController.hxx
+++ b/sdext/source/presenter/PresenterController.hxx
@@ -95,7 +95,7 @@ public:
         const css::uno::Reference<css::presentation::XSlideShowController>& rxSlideShowController,
         const rtl::Reference<PresenterPaneContainer>& rpPaneContainer,
         const css::uno::Reference<css::drawing::framework::XResourceId>& rxMainPaneId);
-    virtual ~PresenterController();
+    virtual ~PresenterController() override;
 
     virtual void SAL_CALL disposing() override;
 
diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
index 55b11c781796..545031343cc5 100644
--- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
+++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
@@ -52,7 +52,7 @@ public:
     PresenterCurrentSlideObserver (
         const ::rtl::Reference<PresenterController>& rxPresenterController,
         const css::uno::Reference<css::presentation::XSlideShowController>& rxSlideShowController);
-    virtual ~PresenterCurrentSlideObserver();
+    virtual ~PresenterCurrentSlideObserver() override;
 
     virtual void SAL_CALL disposing() override;
 
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx
index 35258e7e00cc..4406e6836119 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.hxx
+++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx
@@ -79,7 +79,7 @@ private:
         const OUString& rsEventName,
         const Predicate& rPredicate,
         const Action& rAction);
-    virtual ~PresenterFrameworkObserver();
+    virtual ~PresenterFrameworkObserver() override;
 
     void Shutdown();
 
diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sdext/source/presenter/PresenterHelpView.hxx
index 4d9700726c1d..ee50c4c6fea5 100644
--- a/sdext/source/presenter/PresenterHelpView.hxx
+++ b/sdext/source/presenter/PresenterHelpView.hxx
@@ -55,7 +55,7 @@ public:
         const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId,
         const css::uno::Reference<css::frame::XController>& rxController,
         const ::rtl::Reference<PresenterController>& rpPresenterController);
-    virtual ~PresenterHelpView();
+    virtual ~PresenterHelpView() override;
 
     virtual void SAL_CALL disposing() override;
 
diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sdext/source/presenter/PresenterNotesView.hxx
index 653cd2d8af2f..8a0fea61d5b8 100644
--- a/sdext/source/presenter/PresenterNotesView.hxx
+++ b/sdext/source/presenter/PresenterNotesView.hxx
@@ -70,7 +70,7 @@ public:
         const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId,
         const css::uno::Reference<css::frame::XController>& rxController,
         const ::rtl::Reference<PresenterController>& rpPresenterController);
-    virtual ~PresenterNotesView();
+    virtual ~PresenterNotesView() override;
 
     virtual void SAL_CALL disposing() override;
 
diff --git a/sdext/source/presenter/PresenterPane.hxx b/sdext/source/presenter/PresenterPane.hxx
index d2706b026658..fbd61446c9c2 100644
--- a/sdext/source/presenter/PresenterPane.hxx
+++ b/sdext/source/presenter/PresenterPane.hxx
@@ -47,7 +47,7 @@ public:
     PresenterPane (
         const css::uno::Reference<css::uno::XComponentContext>& rxContext,
         const ::rtl::Reference<PresenterController>& rpPresenterController);
-    virtual ~PresenterPane();
+    virtual ~PresenterPane() override;
 
     // XPane
 
diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx
index a1301e23d1a0..1211ab708c68 100644
--- a/sdext/source/presenter/PresenterPaneBase.hxx
+++ b/sdext/source/presenter/PresenterPaneBase.hxx
@@ -65,7 +65,7 @@ public:
     PresenterPaneBase (
         const css::uno::Reference<css::uno::XComponentContext>& rxContext,
         const ::rtl::Reference<PresenterController>& rpPresenterController);
-    virtual ~PresenterPaneBase();
+    virtual ~PresenterPaneBase() override;
     PresenterPaneBase(const PresenterPaneBase&) = delete;
     PresenterPaneBase& operator=(const PresenterPaneBase&) = delete;
 
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
index eb3f4ae2eee4..22f55340f2c0 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
@@ -52,7 +52,7 @@ class PresenterPaneBorderPainter
 public:
     explicit PresenterPaneBorderPainter (
         const css::uno::Reference<css::uno::XComponentContext>& rxContext);
-    virtual ~PresenterPaneBorderPainter();
+    virtual ~PresenterPaneBorderPainter() override;
     PresenterPaneBorderPainter(const PresenterPaneBorderPainter&) = delete;
     PresenterPaneBorderPainter& operator=(const PresenterPaneBorderPainter&) = delete;
 
diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx
index 7e7bc120bbbc..ef84dce83c3f 100644
--- a/sdext/source/presenter/PresenterPaneContainer.hxx
+++ b/sdext/source/presenter/PresenterPaneContainer.hxx
@@ -60,7 +60,7 @@ class PresenterPaneContainer
 public:
     explicit PresenterPaneContainer (
         const css::uno::Reference<css::uno::XComponentContext>& rxContext);
-    virtual ~PresenterPaneContainer();
+    virtual ~PresenterPaneContainer() override;
     PresenterPaneContainer(const PresenterPaneContainer&) = delete;
     PresenterPaneContainer& operator=(const PresenterPaneContainer&) = delete;
 
diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx
index c7dda3c16a50..b3aea590eb8e 100644
--- a/sdext/source/presenter/PresenterPaneFactory.hxx
+++ b/sdext/source/presenter/PresenterPaneFactory.hxx
@@ -71,7 +71,7 @@ public:
         const css::uno::Reference<css::uno::XComponentContext>& rxContext,
         const css::uno::Reference<css::frame::XController>& rxController,
         const ::rtl::Reference<PresenterController>& rpPresenterController);
-    virtual ~PresenterPaneFactory();
+    virtual ~PresenterPaneFactory() override;
 
     virtual void SAL_CALL disposing()
         throw (css::uno::RuntimeException) override;
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index 441ecd94d085..107c18c01660 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -60,7 +60,7 @@ namespace {
     public:
         explicit GotoPreviousSlideCommand (
             const rtl::Reference<PresenterController>& rpPresenterController);
-        virtual ~GotoPreviousSlideCommand() {}
+        virtual ~GotoPreviousSlideCommand() override {}
         virtual void Execute() override;
         virtual bool IsEnabled() const override;
     private:
@@ -72,7 +72,7 @@ namespace {
     public:
         explicit GotoNextSlideCommand (
             const rtl::Reference<PresenterController>& rpPresenterController);
-        virtual ~GotoNextSlideCommand() {}
+        virtual ~GotoNextSlideCommand() override {}
         virtual void Execute() override;
         // The next slide command is always enabled, even when the current slide
         // is the last slide:  from the last slide it goes to the pause slide,
@@ -87,7 +87,7 @@ namespace {
     public:
         explicit GotoNextEffectCommand (
             const rtl::Reference<PresenterController>& rpPresenterController);
-        virtual ~GotoNextEffectCommand() {}
+        virtual ~GotoNextEffectCommand() override {}
         virtual void Execute() override;
     private:
         rtl::Reference<PresenterController> mpPresenterController;
@@ -98,7 +98,7 @@ namespace {
     public:
         explicit SwitchMonitorCommand (
             const rtl::Reference<PresenterController>& rpPresenterController);
-        virtual ~SwitchMonitorCommand() {}
+        virtual ~SwitchMonitorCommand() override {}
         virtual void Execute() override;
     private:
         rtl::Reference<PresenterController> mpPresenterController;
@@ -109,7 +109,7 @@ namespace {
     {
     public:
         explicit RestartTimerCommand(const rtl::Reference<PresenterController>& rpPresenterController);
-        virtual ~RestartTimerCommand();
+        virtual ~RestartTimerCommand() override;
         virtual void Execute() override;
     private:
         rtl::Reference<PresenterController> mpPresenterController;
@@ -121,7 +121,7 @@ namespace {
         SetNotesViewCommand (
             const bool bOn,
             const rtl::Reference<PresenterController>& rpPresenterController);
-        virtual ~SetNotesViewCommand() {}
+        virtual ~SetNotesViewCommand() override {}
         virtual void Execute() override;
         virtual Any GetState() const override;
     private:
@@ -136,7 +136,7 @@ namespace {
         SetSlideSorterCommand (
             const bool bOn,
             const rtl::Reference<PresenterController>& rpPresenterController);
-        virtual ~SetSlideSorterCommand() {}
+        virtual ~SetSlideSorterCommand() override {}
         virtual void Execute() override;
         virtual Any GetState() const override;
     private:
@@ -150,7 +150,7 @@ namespace {
         SetHelpViewCommand (
             const bool bOn,
             const rtl::Reference<PresenterController>& rpPresenterController);
-        virtual ~SetHelpViewCommand() {}
+        virtual ~SetHelpViewCommand() override {}
         virtual void Execute() override;
         virtual Any GetState() const override;
     private:
@@ -164,7 +164,7 @@ namespace {
         NotesFontSizeCommand(
             const rtl::Reference<PresenterController>& rpPresenterController,
             const sal_Int32 nSizeChange);
-        virtual ~NotesFontSizeCommand() {}
+        virtual ~NotesFontSizeCommand() override {}
         virtual void Execute() override;
         virtual Any GetState() const override;
     protected:
@@ -239,7 +239,7 @@ private:
     Dispatch (
         const OUString& rsURLPath,
         const ::rtl::Reference<PresenterController>& rpPresenterController);
-    virtual ~Dispatch();
+    virtual ~Dispatch() override;
 
     void ThrowIfDisposed() const throw (css::lang::DisposedException);
 };
diff --git a/sdext/source/presenter/PresenterProtocolHandler.hxx b/sdext/source/presenter/PresenterProtocolHandler.hxx
index b68fcfcd73f3..5f939a5e55f0 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.hxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.hxx
@@ -47,7 +47,7 @@ class PresenterProtocolHandler
 {
 public:
     explicit PresenterProtocolHandler (const css::uno::Reference<css::uno::XComponentContext>& rxContext);
-    virtual ~PresenterProtocolHandler();
+    virtual ~PresenterProtocolHandler() override;
 
     void SAL_CALL disposing() override;
 
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index 52c78316df86..0bfb4522d178 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -66,7 +66,7 @@ namespace {
         PresenterScreenListener (
             const css::uno::Reference<css::uno::XComponentContext>& rxContext,
             const css::uno::Reference<css::frame::XModel2>& rxModel);
-        virtual ~PresenterScreenListener();
+        virtual ~PresenterScreenListener() override;
         PresenterScreenListener(const PresenterScreenListener&) = delete;
         PresenterScreenListener& operator=(const PresenterScreenListener&) = delete;
 
diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx
index 6dfc71a6e1a7..e168ef9f02a3 100644
--- a/sdext/source/presenter/PresenterScreen.hxx
+++ b/sdext/source/presenter/PresenterScreen.hxx
@@ -77,7 +77,7 @@ public:
 
 private:
     explicit PresenterScreenJob (const css::uno::Reference<css::uno::XComponentContext>& rxContext);
-    virtual ~PresenterScreenJob();
+    virtual ~PresenterScreenJob() override;
 
     css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
 };
@@ -101,7 +101,7 @@ public:
     PresenterScreen (
         const css::uno::Reference<css::uno::XComponentContext>& rxContext,
         const css::uno::Reference<css::frame::XModel2>& rxModel);
-    virtual ~PresenterScreen();
+    virtual ~PresenterScreen() override;
     PresenterScreen(const PresenterScreen&) = delete;
     PresenterScreen& operator=(const PresenterScreen&) = delete;
 
diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx
index 9e0f0183a98f..00f8393738fe 100644
--- a/sdext/source/presenter/PresenterScrollBar.hxx
+++ b/sdext/source/presenter/PresenterScrollBar.hxx
@@ -54,7 +54,7 @@ class PresenterScrollBar
 {
 public:
     typedef ::std::function<void (double)> ThumbMotionListener;
-    virtual ~PresenterScrollBar();
+    virtual ~PresenterScrollBar() override;
     PresenterScrollBar(const PresenterScrollBar&) = delete;
     PresenterScrollBar& operator=(const PresenterScrollBar&) = delete;
 
@@ -244,7 +244,7 @@ public:
         const css::uno::Reference<css::awt::XWindow>& rxParentWindow,
         const std::shared_ptr<PresenterPaintManager>& rpPaintManager,
         const ::std::function<void (double)>& rThumbMotionListener);
-    virtual ~PresenterVerticalScrollBar();
+    virtual ~PresenterVerticalScrollBar() override;
     virtual sal_Int32 GetSize() const override;
 
 protected:
diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sdext/source/presenter/PresenterSlidePreview.hxx
index a0ec6d1a604e..489f27b527a3 100644
--- a/sdext/source/presenter/PresenterSlidePreview.hxx
+++ b/sdext/source/presenter/PresenterSlidePreview.hxx
@@ -64,7 +64,7 @@ public:
         const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId,
         const css::uno::Reference<css::drawing::framework::XPane>& rxAnchorPane,
         const ::rtl::Reference<PresenterController>& rpPresenterController);
-    virtual ~PresenterSlidePreview();
+    virtual ~PresenterSlidePreview() override;
     PresenterSlidePreview(const PresenterSlidePreview&) = delete;
     PresenterSlidePreview& operator=(const PresenterSlidePreview&) = delete;
     virtual void SAL_CALL disposing() override;
diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx
index bfd5473f4270..9455f13677cb 100644
--- a/sdext/source/presenter/PresenterSlideShowView.hxx
+++ b/sdext/source/presenter/PresenterSlideShowView.hxx
@@ -67,7 +67,7 @@ public:
         const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId,
         const css::uno::Reference<css::frame::XController>& rxController,
         const ::rtl::Reference<PresenterController>& rpPresenterController);
-    virtual ~PresenterSlideShowView();
+    virtual ~PresenterSlideShowView() override;
     PresenterSlideShowView(const PresenterSlideShowView&) = delete;
     PresenterSlideShowView& operator=(const PresenterSlideShowView&) = delete;
 
diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx
index b6c93ba1e0f0..997ff86bbd8a 100644
--- a/sdext/source/presenter/PresenterSlideSorter.hxx
+++ b/sdext/source/presenter/PresenterSlideSorter.hxx
@@ -70,7 +70,7 @@ public:
         const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId,
         const css::uno::Reference<css::frame::XController>& rxController,
         const ::rtl::Reference<PresenterController>& rpPresenterController);
-    virtual ~PresenterSlideSorter();
+    virtual ~PresenterSlideSorter() override;
 
     virtual void SAL_CALL disposing() override;
 
diff --git a/sdext/source/presenter/PresenterSpritePane.hxx b/sdext/source/presenter/PresenterSpritePane.hxx
index f2a110d7e23a..859f9dc9501a 100644
--- a/sdext/source/presenter/PresenterSpritePane.hxx
+++ b/sdext/source/presenter/PresenterSpritePane.hxx
@@ -51,7 +51,7 @@ public:
     PresenterSpritePane (
         const css::uno::Reference<css::uno::XComponentContext>& rxContext,
         const ::rtl::Reference<PresenterController>& rpPresenterController);
-    virtual ~PresenterSpritePane();
+    virtual ~PresenterSpritePane() override;
 
     virtual void SAL_CALL disposing() override;
 
diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx
index 329a3ffff097..9e8ec8b35f72 100644
--- a/sdext/source/presenter/PresenterTimer.cxx
+++ b/sdext/source/presenter/PresenterTimer.cxx
@@ -103,7 +103,7 @@ private:
     SharedTimerTask mpCurrentTask;
 
     TimerScheduler();
-    virtual ~TimerScheduler();
+    virtual ~TimerScheduler() override;
     class Deleter {public: void operator () (TimerScheduler* pScheduler) { delete pScheduler; } };
     friend class Deleter;
 
diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx
index 45f0c5360a33..6b6ce0eef029 100644
--- a/sdext/source/presenter/PresenterTimer.hxx
+++ b/sdext/source/presenter/PresenterTimer.hxx
@@ -111,7 +111,7 @@ private:
 
     PresenterClockTimer (
         const css::uno::Reference<css::uno::XComponentContext>& rxContext);
-    virtual ~PresenterClockTimer();
+    virtual ~PresenterClockTimer() override;
 
     void CheckCurrentTime (const TimeValue& rCurrentTime);
 };
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index b6dcff7163fd..2be0bc3ca14c 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -133,7 +133,7 @@ namespace {
     {
     public:
         explicit Element (const ::rtl::Reference<PresenterToolBar>& rpToolBar);
-        virtual ~Element();
+        virtual ~Element() override;
         Element(const Element&) = delete;
         Element& operator=(const Element&) = delete;
 
@@ -212,7 +212,7 @@ namespace {
         static ::rtl::Reference<Element> Create (
             const ::rtl::Reference<PresenterToolBar>& rpToolBar);
 
-        virtual ~Button();
+        virtual ~Button() override;
         virtual void SAL_CALL disposing() override;
 
         virtual void Paint (
@@ -302,7 +302,7 @@ namespace {
             const SharedElementMode& rpDisabledMode) override;
     private:
         CurrentTimeLabel (const ::rtl::Reference<PresenterToolBar>& rpToolBar);
-        virtual ~CurrentTimeLabel();
+        virtual ~CurrentTimeLabel() override;
         virtual void TimeHasChanged (const oslDateTime& rCurrentTime) override;
     };
 
@@ -320,7 +320,7 @@ namespace {
     private:
         TimeValue maStartTimeValue;
         PresentationTimeLabel (const ::rtl::Reference<PresenterToolBar>& rpToolBar);
-        virtual ~PresentationTimeLabel();
+        virtual ~PresentationTimeLabel() override;
         virtual void TimeHasChanged (const oslDateTime& rCurrentTime) override;
     };
 
diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx
index 7bdcc6f0ed77..76a07e6a51b4 100644
--- a/sdext/source/presenter/PresenterToolBar.hxx
+++ b/sdext/source/presenter/PresenterToolBar.hxx
@@ -84,7 +84,7 @@ public:
         const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
         const ::rtl::Reference<PresenterController>& rpPresenterController,
         const Anchor eAnchor);
-    virtual ~PresenterToolBar();
+    virtual ~PresenterToolBar() override;
     PresenterToolBar(const PresenterToolBar&) = delete;
     PresenterToolBar& operator=(const PresenterToolBar&) = delete;
 
@@ -228,7 +228,7 @@ public:
         const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId,
         const css::uno::Reference<css::frame::XController>& rxController,
         const ::rtl::Reference<PresenterController>& rpPresenterController);
-    virtual ~PresenterToolBarView();
+    virtual ~PresenterToolBarView() override;
     PresenterToolBarView(const PresenterToolBarView&) = delete;
     PresenterToolBarView& operator=(const PresenterToolBarView&) = delete;
 
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx
index 544055f49442..cd33c6f00124 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sdext/source/presenter/PresenterViewFactory.cxx
@@ -72,7 +72,7 @@ public:
         : PresenterSlidePreview(rxContext, rxViewId, rxAnchorPane, rpPresenterController)
     {
     }
-    virtual ~NextSlidePreview() {}
+    virtual ~NextSlidePreview() override {}
     virtual void SAL_CALL setCurrentPage (
         const css::uno::Reference<css::drawing::XDrawPage>& rxSlide)
         throw (css::uno::RuntimeException, std::exception) override
diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx
index a084e9ac4a6d..f0f959601f0a 100644
--- a/sdext/source/presenter/PresenterViewFactory.hxx
+++ b/sdext/source/presenter/PresenterViewFactory.hxx
@@ -96,7 +96,7 @@ public:
         const css::uno::Reference<css::uno::XComponentContext>& rxContext,
         const css::uno::Reference<css::frame::XController>& rxController,
         const ::rtl::Reference<PresenterController>& rpPresenterController);
-    virtual ~PresenterViewFactory();
+    virtual ~PresenterViewFactory() override;
 
     virtual void SAL_CALL disposing()
         throw (css::uno::RuntimeException) override;
diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx
index e8ecd9fc5819..bca8590ac60c 100644
--- a/sdext/source/presenter/PresenterWindowManager.hxx
+++ b/sdext/source/presenter/PresenterWindowManager.hxx
@@ -69,7 +69,7 @@ public:
         const css::uno::Reference<css::uno::XComponentContext>& rxContext,
         const ::rtl::Reference<PresenterPaneContainer>& rpPaneContainer,
         const ::rtl::Reference<PresenterController>& rpPresenterController);
-    virtual ~PresenterWindowManager();
+    virtual ~PresenterWindowManager() override;
     PresenterWindowManager(const PresenterWindowManager&) = delete;
     PresenterWindowManager& operator=(const PresenterWindowManager&) = delete;