loplugin:finalclasses sfx2

Change-Id: I77330d53adb5c6ec66750e57fdc539353b4c9725
Reviewed-on: https://gerrit.libreoffice.org/81657
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

62 files changed, 85 insertions, 104 deletions

diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx
index ddbc0a5c1e2f..7484a2491725 100644
--- a/include/sax/fastattribs.hxx
+++ b/include/sax/fastattribs.hxx
@@ -70,7 +70,7 @@ class SAX_DLLPUBLIC FastTokenHandlerBase
                          const char *pStr, size_t nLength );
 };
 
-class SAX_DLLPUBLIC FastAttributeList : public cppu::WeakImplHelper< css::xml::sax::XFastAttributeList >
+class SAX_DLLPUBLIC FastAttributeList final : public cppu::WeakImplHelper< css::xml::sax::XFastAttributeList >
 {
 public:
     FastAttributeList( const css::uno::Reference< css::xml::sax::XFastTokenHandler >& xTokenHandler,
diff --git a/include/sax/fastparser.hxx b/include/sax/fastparser.hxx
index ace7956382fb..f9776c595831 100644
--- a/include/sax/fastparser.hxx
+++ b/include/sax/fastparser.hxx
@@ -41,7 +41,7 @@ namespace sax_fastparser {
 class FastSaxParserImpl;
 
 // This class implements the external Parser interface
-class FASTSAX_DLLPUBLIC FastSaxParser
+class FASTSAX_DLLPUBLIC FastSaxParser final
     : public ::cppu::WeakImplHelper<
                 css::lang::XInitialization,
                 css::xml::sax::XFastParser,
diff --git a/include/sfx2/DocumentMetadataAccess.hxx b/include/sfx2/DocumentMetadataAccess.hxx
index dd0881ad0a91..5a8820875845 100644
--- a/include/sfx2/DocumentMetadataAccess.hxx
+++ b/include/sfx2/DocumentMetadataAccess.hxx
@@ -72,7 +72,7 @@ createBaseURI(
 
 struct DocumentMetadataAccess_Impl;
 
-class SFX2_DLLPUBLIC DocumentMetadataAccess :
+class SFX2_DLLPUBLIC DocumentMetadataAccess final :
     public cppu::WeakImplHelper<css::rdf::XDocumentMetadataAccess>
 {
     DocumentMetadataAccess(const DocumentMetadataAccess&) = delete;
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index e3517d3d64db..925709b759e4 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -80,7 +80,7 @@ enum class SfxToolsModule
     LAST = Basic
 };
 
-class SFX2_DLLPUBLIC SfxLinkItem : public SfxPoolItem
+class SFX2_DLLPUBLIC SfxLinkItem final : public SfxPoolItem
 {
     Link<SfxPoolItem const *, void> aLink;
 public:
@@ -97,7 +97,7 @@ public:
 
 // This is a singleton class. Sad that there apparently is no other
 // way than a comment like this to indicate that to the code reader.
-class SFX2_DLLPUBLIC SfxApplication: public SfxShell
+class SFX2_DLLPUBLIC SfxApplication final : public SfxShell
 {
     std::unique_ptr<SfxAppData_Impl>            pImpl;
 
diff --git a/include/sfx2/asyncfunc.hxx b/include/sfx2/asyncfunc.hxx
index f9d3d92917ad..7d4f409b86b3 100644
--- a/include/sfx2/asyncfunc.hxx
+++ b/include/sfx2/asyncfunc.hxx
@@ -16,7 +16,7 @@
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/implbase.hxx>
 
-class AsyncFunc : public cppu::WeakImplHelper<css::lang::XUnoTunnel>
+class AsyncFunc final : public cppu::WeakImplHelper<css::lang::XUnoTunnel>
 {
 private:
     std::function<void()> const m_pAsyncFunc;
diff --git a/include/sfx2/charmapcontrol.hxx b/include/sfx2/charmapcontrol.hxx
index 3562a5c94d87..4984fca53b31 100644
--- a/include/sfx2/charmapcontrol.hxx
+++ b/include/sfx2/charmapcontrol.hxx
@@ -29,7 +29,7 @@
 
 namespace com::sun::star::frame { class XFrame; }
 
-class SFX2_DLLPUBLIC SfxCharmapCtrl : public SfxPopupWindow
+class SFX2_DLLPUBLIC SfxCharmapCtrl final : public SfxPopupWindow
 {
 public:
     explicit SfxCharmapCtrl(sal_uInt16 nId, vcl::Window* pParent,
diff --git a/include/sfx2/charmappopup.hxx b/include/sfx2/charmappopup.hxx
index 98c178534fa5..d896acd45e45 100644
--- a/include/sfx2/charmappopup.hxx
+++ b/include/sfx2/charmappopup.hxx
@@ -23,7 +23,7 @@
 #include <sfx2/tbxctrl.hxx>
 #include <sfx2/dllapi.h>
 
-class SFX2_DLLPUBLIC CharmapPopup : public SfxToolBoxControl
+class SFX2_DLLPUBLIC CharmapPopup final : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
diff --git a/include/sfx2/charwin.hxx b/include/sfx2/charwin.hxx
index 9b5c070942b9..220a264a931d 100644
--- a/include/sfx2/charwin.hxx
+++ b/include/sfx2/charwin.hxx
@@ -26,7 +26,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/weld.hxx>
 
-class SFX2_DLLPUBLIC SvxCharView : public weld::CustomWidgetController
+class SFX2_DLLPUBLIC SvxCharView final : public weld::CustomWidgetController
 {
 private:
     VclPtr<VirtualDevice> mxVirDev;
@@ -71,7 +71,7 @@ public:
     void ContextMenuSelect(const OString& rIdent);
 };
 
-class SFX2_DLLPUBLIC SvxCharViewControl : public Control
+class SFX2_DLLPUBLIC SvxCharViewControl final : public Control
 {
 public:
     SvxCharViewControl(vcl::Window* pParent);
@@ -88,14 +88,13 @@ public:
 
     void setMouseClickHdl(const Link<SvxCharViewControl*,void> &rLink);
 
-protected:
+private:
     virtual void    Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle&) override;
 
     virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
 
     virtual void KeyInput( const KeyEvent& rKEvt ) override;
 
-private:
     long            mnY;
     Point           maPosition;
     vcl::Font       maFont;
diff --git a/include/sfx2/checkin.hxx b/include/sfx2/checkin.hxx
index 15840ade2550..680160cedd97 100644
--- a/include/sfx2/checkin.hxx
+++ b/include/sfx2/checkin.hxx
@@ -11,7 +11,7 @@
 
 #include <vcl/weld.hxx>
 
-class SfxCheckinDialog : public weld::GenericDialogController
+class SfxCheckinDialog final : public weld::GenericDialogController
 {
 private:
     std::unique_ptr<weld::TextView> m_xCommentED;
diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx
index 7788baa952d4..fc93c62beff2 100644
--- a/include/sfx2/ctrlitem.hxx
+++ b/include/sfx2/ctrlitem.hxx
@@ -72,11 +72,10 @@ public:
 };
 
 
-class SFX2_DLLPUBLIC SfxStatusForwarder: public SfxControllerItem
+class SFX2_DLLPUBLIC SfxStatusForwarder final : public SfxControllerItem
 {
     SfxControllerItem*      pMaster;
 
-protected:
     virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                       const SfxPoolItem* pState ) override;
 
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index c006763a18e2..08be8bb5ea19 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -51,7 +51,7 @@ struct CustomProperty;
 
 // class SfxDocumentInfoItem ---------------------------------------------
 
-class SFX2_DLLPUBLIC SfxDocumentInfoItem : public SfxStringItem
+class SFX2_DLLPUBLIC SfxDocumentInfoItem final : public SfxStringItem
 {
 private:
     sal_Int32                    m_AutoloadDelay;
@@ -161,7 +161,7 @@ public:
 
 // class SfxDocumentPage -------------------------------------------------
 
-class SfxDocumentPage : public SfxTabPage
+class SfxDocumentPage final : public SfxTabPage
 {
 private:
     OUString                    m_aUnknownSize;
@@ -199,7 +199,6 @@ private:
     void                ImplUpdateSignatures();
     void                ImplCheckPasswordState();
 
-protected:
     virtual bool        FillItemSet( SfxItemSet* ) override;
     virtual void        Reset( const SfxItemSet* ) override;
 
@@ -213,7 +212,7 @@ public:
 
 // class SfxDocumentDescPage ---------------------------------------------
 
-class SfxDocumentDescPage : public SfxTabPage
+class SfxDocumentDescPage final : public SfxTabPage
 {
 private:
     SfxDocumentInfoItem* m_pInfoItem;
@@ -222,7 +221,6 @@ private:
     std::unique_ptr<weld::Entry> m_xKeywordsEd;
     std::unique_ptr<weld::TextView> m_xCommentEd;
 
-protected:
     virtual bool            FillItemSet( SfxItemSet* ) override;
     virtual void            Reset( const SfxItemSet* ) override;
 
@@ -234,9 +232,8 @@ public:
 
 // class SfxDocumentInfoDialog -------------------------------------------
 
-class SFX2_DLLPUBLIC SfxDocumentInfoDialog : public SfxTabDialogController
+class SFX2_DLLPUBLIC SfxDocumentInfoDialog final : public SfxTabDialogController
 {
-protected:
     virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override;
 
 public:
@@ -440,7 +437,7 @@ public:
 
 // class SfxCustomPropertiesPage -----------------------------------------
 
-class SfxCustomPropertiesPage : public SfxTabPage
+class SfxCustomPropertiesPage final : public SfxTabPage
 {
 private:
     DECL_LINK(AddHdl, weld::Button&, void);
@@ -448,7 +445,6 @@ private:
     std::unique_ptr<CustomPropertiesControl> m_xPropertiesCtrl;
     std::unique_ptr<weld::Button> m_xAdd;
 
-protected:
     virtual bool        FillItemSet( SfxItemSet* ) override;
     virtual void        Reset( const SfxItemSet* ) override;
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
@@ -559,12 +555,11 @@ public:
 
 // class SfxCmisPropertiesPage -------------------------------------------------
 
-class SfxCmisPropertiesPage : public SfxTabPage
+class SfxCmisPropertiesPage final : public SfxTabPage
 {
 private:
     std::unique_ptr<CmisPropertiesControl> m_xPropertiesCtrl;
 
-protected:
     virtual bool        FillItemSet( SfxItemSet* ) override;
     virtual void        Reset( const SfxItemSet* ) override;
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index bff1a8b3b74b..ab2ea96aba28 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -55,7 +55,7 @@ namespace weld
     class Window;
 }
 
-class SFX2_DLLPUBLIC SfxMedium : public SvRefBase
+class SFX2_DLLPUBLIC SfxMedium final : public SvRefBase
 {
     std::unique_ptr< SfxMedium_Impl > pImpl;
 
diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index c57d171e7e03..eae1ec09a0f0 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
@@ -110,7 +110,7 @@ public:
     SAL_DLLPRIVATE void ReleaseChildWindow_Impl();
 };
 
-class SfxDockingWrapper : public SfxChildWindow
+class SfxDockingWrapper final : public SfxChildWindow
 {
     public:
         SfxDockingWrapper( vcl::Window* pParent ,
diff --git a/include/sfx2/docstoragemodifylistener.hxx b/include/sfx2/docstoragemodifylistener.hxx
index 5d8c6f9fb5a2..8530711cad1e 100644
--- a/include/sfx2/docstoragemodifylistener.hxx
+++ b/include/sfx2/docstoragemodifylistener.hxx
@@ -50,7 +50,7 @@ namespace sfx2
 
     //= DocumentStorageModifyListener
 
-    class SFX2_DLLPUBLIC DocumentStorageModifyListener : public cppu::WeakImplHelper<css::util::XModifyListener>
+    class SFX2_DLLPUBLIC DocumentStorageModifyListener final : public cppu::WeakImplHelper<css::util::XModifyListener>
     {
         IModifiableDocument*    m_pDocument;
         comphelper::SolarMutex& m_rMutex;
@@ -66,10 +66,9 @@ namespace sfx2
         // XEventListener
         virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
-    protected:
+    private:
         virtual ~DocumentStorageModifyListener() override;
 
-    private:
         DocumentStorageModifyListener( const DocumentStorageModifyListener& ) = delete;
         DocumentStorageModifyListener& operator=( const DocumentStorageModifyListener& ) = delete;
     };
diff --git a/include/sfx2/emojicontrol.hxx b/include/sfx2/emojicontrol.hxx
index 1b5c956735d9..0af0510fde2e 100644
--- a/include/sfx2/emojicontrol.hxx
+++ b/include/sfx2/emojicontrol.hxx
@@ -23,7 +23,7 @@ class EmojiView;
 class ThumbnailViewItem;
 enum class FILTER_CATEGORY;
 
-class SFX2_DLLPUBLIC SfxEmojiControl : public SfxPopupWindow
+class SFX2_DLLPUBLIC SfxEmojiControl final : public SfxPopupWindow
 {
 public:
     explicit SfxEmojiControl(sal_uInt16 nId, vcl::Window* pParent,
diff --git a/include/sfx2/emojipopup.hxx b/include/sfx2/emojipopup.hxx
index 40d25ef57934..ee98e12e93b8 100644
--- a/include/sfx2/emojipopup.hxx
+++ b/include/sfx2/emojipopup.hxx
@@ -23,7 +23,7 @@
 #include <sfx2/tbxctrl.hxx>
 #include <sfx2/dllapi.h>
 
-class SFX2_DLLPUBLIC EmojiPopup : public SfxToolBoxControl
+class SFX2_DLLPUBLIC EmojiPopup final : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
diff --git a/include/sfx2/emojiviewitem.hxx b/include/sfx2/emojiviewitem.hxx
index 0e995664e768..65fd8005a7f7 100644
--- a/include/sfx2/emojiviewitem.hxx
+++ b/include/sfx2/emojiviewitem.hxx
@@ -12,7 +12,7 @@
 
 #include <sfx2/thumbnailviewitem.hxx>
 
-class EmojiViewItem : public ThumbnailViewItem
+class EmojiViewItem final : public ThumbnailViewItem
 {
 public:
     EmojiViewItem (ThumbnailViewBase &rView, sal_uInt16 nId);
diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx
index 46208943b210..5afbf306419e 100644
--- a/include/sfx2/event.hxx
+++ b/include/sfx2/event.hxx
@@ -231,7 +231,7 @@ public:
                         { return xViewController; }
 };
 
-class SfxPrintingHint : public SfxViewEventHint
+class SfxPrintingHint final : public SfxViewEventHint
 {
     css::view::PrintableState const mnPrintableState;
     css::uno::Sequence < css::beans::PropertyValue > const aOpts;
diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx
index 7dad7c8f8053..8226b711e133 100644
--- a/include/sfx2/evntconf.hxx
+++ b/include/sfx2/evntconf.hxx
@@ -63,7 +63,7 @@ public:
     void push_back( SfxEventName Item ) { aEventNamesList.push_back( std::move(Item) ); }
 };
 
-class SFX2_DLLPUBLIC SfxEventNamesItem : public SfxPoolItem
+class SFX2_DLLPUBLIC SfxEventNamesItem final : public SfxPoolItem
 {
     SfxEventNamesList aEventsList;
 
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 4878bcd460d7..ed25e05d97d5 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -72,7 +72,7 @@ typedef ::std::vector<OUString> TargetList;
 // from their parent frames.
 
 
-class SFX2_DLLPUBLIC SfxFrame : public SvCompatWeakBase<SfxFrame>
+class SFX2_DLLPUBLIC SfxFrame final : public SvCompatWeakBase<SfxFrame>
 {
     friend class SfxFrameIterator;
     friend class SfxFrameWindow_Impl;
@@ -81,7 +81,6 @@ private:
     std::unique_ptr< SfxFrame_Impl >     pImpl;
     VclPtr<vcl::Window> pWindow;
 
-protected:
     void                Close();
     virtual             ~SfxFrame();
 
@@ -157,7 +156,7 @@ private:
 
 typedef SvCompatWeakRef<SfxFrame> SfxFrameWeakRef;
 
-class SFX2_DLLPUBLIC SfxFrameItem: public SfxPoolItem
+class SFX2_DLLPUBLIC SfxFrameItem final : public SfxPoolItem
 {
     SfxFrame*               pFrame;
     SfxFrameWeakRef         wFrame;
@@ -177,7 +176,7 @@ public:
     SfxFrame*               GetFrame() const { return wFrame; }
 };
 
-class SFX2_DLLPUBLIC SfxUnoAnyItem : public SfxPoolItem
+class SFX2_DLLPUBLIC SfxUnoAnyItem final : public SfxPoolItem
 {
     css::uno::Any  aValue;
 public:
@@ -192,7 +191,7 @@ public:
     virtual bool                PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 };
 
-class SFX2_DLLPUBLIC SfxUnoFrameItem : public SfxPoolItem
+class SFX2_DLLPUBLIC SfxUnoFrameItem final : public SfxPoolItem
 {
     css::uno::Reference< css::frame::XFrame >
                                 m_xFrame;
diff --git a/include/sfx2/hintpost.hxx b/include/sfx2/hintpost.hxx
index ce5f5ac8f0e2..0a72aa661446 100644
--- a/include/sfx2/hintpost.hxx
+++ b/include/sfx2/hintpost.hxx
@@ -38,14 +38,13 @@ class SfxRequest;
     event has arrived.  If the target dies before delivery,
     the connection must be severed with SetEventHdl(Link()).
 */
-class SfxHintPoster : public SvRefBase
+class SfxHintPoster final : public SvRefBase
 {
 private:
     std::function<void (std::unique_ptr<SfxRequest>)> m_Link;
 
                     DECL_LINK( DoEvent_Impl, void*, void );
 
-protected:
     virtual         ~SfxHintPoster() override;
 
 public:
diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx
index caf8b5b82518..4543189c0373 100644
--- a/include/sfx2/infobar.hxx
+++ b/include/sfx2/infobar.hxx
@@ -27,7 +27,7 @@ enum class InfoBarType {
 
 /** SfxChildWindow for positioning the InfoBar in the view.
   */
-class SFX2_DLLPUBLIC SfxInfoBarContainerChild : public SfxChildWindow
+class SFX2_DLLPUBLIC SfxInfoBarContainerChild final : public SfxChildWindow
 {
     private:
         SfxBindings* const m_pBindings;
@@ -46,7 +46,7 @@ class SFX2_DLLPUBLIC SfxInfoBarContainerChild : public SfxChildWindow
 
 /** Class representing a single InfoBar to be added in a SfxInfoBarContainerWindow.
   */
-class SFX2_DLLPUBLIC SfxInfoBarWindow : public vcl::Window
+class SFX2_DLLPUBLIC SfxInfoBarWindow final : public vcl::Window
 {
     private:
         OUString const            m_sId;
@@ -83,7 +83,7 @@ class SFX2_DLLPUBLIC SfxInfoBarWindow : public vcl::Window
         DECL_LINK( CloseHandler, Button*, void );
 };
 
-class SfxInfoBarContainerWindow : public vcl::Window
+class SfxInfoBarContainerWindow final : public vcl::Window
 {
     private:
         SfxInfoBarContainerChild*               m_pChildWin;
diff --git a/include/sfx2/inputdlg.hxx b/include/sfx2/inputdlg.hxx
index bd54b6a5de02..d578407ad2e0 100644
--- a/include/sfx2/inputdlg.hxx
+++ b/include/sfx2/inputdlg.hxx
@@ -13,7 +13,7 @@
 #include <sfx2/dllapi.h>
 #include <vcl/weld.hxx>
 
-class SFX2_DLLPUBLIC InputDialog : public weld::GenericDialogController
+class SFX2_DLLPUBLIC InputDialog final : public weld::GenericDialogController
 {
 private:
     std::unique_ptr<weld::Entry> m_xEntry;
diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx
index 0a92857c261a..8132db6aad3b 100644
--- a/include/sfx2/minfitem.hxx
+++ b/include/sfx2/minfitem.hxx
@@ -26,7 +26,7 @@
 
 class BasicManager;
 
-class SFX2_DLLPUBLIC SfxMacroInfoItem: public SfxPoolItem
+class SFX2_DLLPUBLIC SfxMacroInfoItem final : public SfxPoolItem
 {
     const BasicManager*     pBasicManager;
     OUString                aLibName;
diff --git a/include/sfx2/navigat.hxx b/include/sfx2/navigat.hxx
index 8ba2193e88a2..29b7c84f41c6 100644
--- a/include/sfx2/navigat.hxx
+++ b/include/sfx2/navigat.hxx
@@ -23,7 +23,7 @@
 #include <sfx2/childwin.hxx>
 #include <sfx2/dockwin.hxx>
 
-class SfxNavigatorWrapper : public SfxChildWindow
+class SfxNavigatorWrapper final : public SfxChildWindow
 {
 
 public:
@@ -35,7 +35,7 @@ public:
                         SFX_DECL_CHILDWINDOW(SfxNavigatorWrapper);
 };
 
-class SFX2_DLLPUBLIC SfxNavigator : public SfxDockingWindow
+class SFX2_DLLPUBLIC SfxNavigator final : public SfxDockingWindow
 {
     SfxChildWindow*     pWrapper;
 
diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx
index 54e66528e470..e8e974cf366e 100644
--- a/include/sfx2/new.hxx
+++ b/include/sfx2/new.hxx
@@ -59,7 +59,7 @@ namespace o3tl
 
 #define RET_TEMPLATE_LOAD       100
 
-class SFX2_DLLPUBLIC SfxNewFileDialog : public SfxDialogController
+class SFX2_DLLPUBLIC SfxNewFileDialog final : public SfxDialogController
 {
 private:
     Idle m_aPrevIdle;
diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx
index 72569f4b45fd..e7016b55386e 100644
--- a/include/sfx2/newstyle.hxx
+++ b/include/sfx2/newstyle.hxx
@@ -26,7 +26,7 @@
 
 class SfxStyleSheetBasePool;
 
-class SFX2_DLLPUBLIC SfxNewStyleDlg : public weld::GenericDialogController
+class SFX2_DLLPUBLIC SfxNewStyleDlg final : public weld::GenericDialogController
 {
 private:
     SfxStyleSheetBasePool&  m_rPool;
diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx
index 5aa6b989b611..4285166b9398 100644
--- a/include/sfx2/objitem.hxx
+++ b/include/sfx2/objitem.hxx
@@ -25,7 +25,7 @@
 
 class SfxShell;
 
-class SFX2_DLLPUBLIC SfxObjectItem: public SfxPoolItem
+class SFX2_DLLPUBLIC SfxObjectItem final : public SfxPoolItem
 {
     SfxShell* const          _pSh;
 
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index a653b2955056..d9d184383430 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -843,7 +843,7 @@ inline SfxObjectShellLock & SfxObjectShellLock::operator=( SfxObjectShell * pObj
     return *this = SfxObjectShellLock( pObjP );
 }
 
-class SFX2_DLLPUBLIC SfxObjectShellItem: public SfxPoolItem
+class SFX2_DLLPUBLIC SfxObjectShellItem final : public SfxPoolItem
 {
     SfxObjectShell*         pObjSh;
 
diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx
index 6b6248962879..dd2712889517 100644
--- a/include/sfx2/passwd.hxx
+++ b/include/sfx2/passwd.hxx
@@ -42,7 +42,7 @@ namespace o3tl
 
 // class SfxPasswordDialog -----------------------------------------------
 
-class SFX2_DLLPUBLIC SfxPasswordDialog : public weld::GenericDialogController
+class SFX2_DLLPUBLIC SfxPasswordDialog final : public weld::GenericDialogController
 {
 private:
     std::unique_ptr<weld::Frame> m_xPassword1Box;
diff --git a/include/sfx2/printer.hxx b/include/sfx2/printer.hxx
index 89056caae2a7..8d10b2cc7762 100644
--- a/include/sfx2/printer.hxx
+++ b/include/sfx2/printer.hxx
@@ -28,7 +28,7 @@ class SfxItemSet;
 
 // class SfxPrinter ------------------------------------------------------
 
-class SFX2_DLLPUBLIC SfxPrinter : public Printer
+class SFX2_DLLPUBLIC SfxPrinter final : public Printer
 {
 private:
     std::unique_ptr<SfxItemSet> pOptions;
diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx
index 9b072a9e597e..d93284f345a5 100644
--- a/include/sfx2/printopt.hxx
+++ b/include/sfx2/printopt.hxx
@@ -27,7 +27,7 @@
 #include <vcl/print.hxx>
 
 
-class SFX2_DLLPUBLIC SfxCommonPrintOptionsTabPage : public SfxTabPage
+class SFX2_DLLPUBLIC SfxCommonPrintOptionsTabPage final : public SfxTabPage
 {
 private:
 
@@ -70,8 +70,6 @@ private:
     SAL_DLLPRIVATE void ImplUpdateControls( const PrinterOptions* pCurrentOptions );
     SAL_DLLPRIVATE void ImplSaveControls( PrinterOptions* pCurrentOptions );
 
-protected:
-
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
 
 public:
diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx
index 298aeac049ac..9a13a0199911 100644
--- a/include/sfx2/prnmon.hxx
+++ b/include/sfx2/prnmon.hxx
@@ -31,7 +31,7 @@ class SfxItemSet;
 
 
 struct SfxPrintOptDlg_Impl;
-class SfxPrintOptionsDialog : public weld::GenericDialogController
+class SfxPrintOptionsDialog final : public weld::GenericDialogController
 {
 private:
     std::unique_ptr<SfxPrintOptDlg_Impl>   pDlgImpl;
diff --git a/include/sfx2/request.hxx b/include/sfx2/request.hxx
index 7987bdb25323..90058a5b1f7f 100644
--- a/include/sfx2/request.hxx
+++ b/include/sfx2/request.hxx
@@ -41,7 +41,7 @@ namespace com::sun::star::uno { template <class E> class Sequence; }
 namespace vcl { class Window; }
 namespace weld { class Window; }
 
-class SFX2_DLLPUBLIC SfxRequest: public SfxHint
+class SFX2_DLLPUBLIC SfxRequest final : public SfxHint
 {
 friend struct SfxRequest_Impl;
 
diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx
index ed9686176fb4..b4ca1ddac5c5 100644
--- a/include/sfx2/securitypage.hxx
+++ b/include/sfx2/securitypage.hxx
@@ -24,11 +24,10 @@
 
 struct SfxSecurityPage_Impl;
 
-class SfxSecurityPage : public SfxTabPage
+class SfxSecurityPage final : public SfxTabPage
 {
     std::unique_ptr< SfxSecurityPage_Impl > m_pImpl;
 
-protected:
     virtual bool            FillItemSet( SfxItemSet* ) override;
     virtual void            Reset( const SfxItemSet* ) override;
 
diff --git a/include/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx
index 7af26fab0708..06cd21c6eec3 100644
--- a/include/sfx2/sfxhelp.hxx
+++ b/include/sfx2/sfxhelp.hxx
@@ -25,7 +25,7 @@
 #include <sal/types.h>
 #include <vcl/help.hxx>
 
-class SFX2_DLLPUBLIC SfxHelp : public Help
+class SFX2_DLLPUBLIC SfxHelp final : public Help
 {
     bool            bIsDebug;
 
diff --git a/include/sfx2/sidebar/Accessible.hxx b/include/sfx2/sidebar/Accessible.hxx
index a32955812fec..8ba5f03d9daf 100644
--- a/include/sfx2/sidebar/Accessible.hxx
+++ b/include/sfx2/sidebar/Accessible.hxx
@@ -37,7 +37,7 @@ namespace sfx2 { namespace sidebar {
     Its getAccessibleContext() method returns a context object given
     to its constructor.
 */
-class Accessible
+class Accessible final
     : private ::cppu::BaseMutex,
       public AccessibleInterfaceBase
 {
diff --git a/include/sfx2/sidebar/AccessibleTitleBar.hxx b/include/sfx2/sidebar/AccessibleTitleBar.hxx
index 6172bb4fd666..5ce9ae311e10 100644
--- a/include/sfx2/sidebar/AccessibleTitleBar.hxx
+++ b/include/sfx2/sidebar/AccessibleTitleBar.hxx
@@ -27,16 +27,15 @@ namespace sfx2 { namespace sidebar {
 
 class TitleBar;
 
-class AccessibleTitleBar
+class AccessibleTitleBar final
     : public VCLXAccessibleComponent
 {
 public:
     static css::uno::Reference<css::accessibility::XAccessible> Create (TitleBar& rTitleBar);
 
-protected:
+private:
     virtual void FillAccessibleStateSet (utl::AccessibleStateSetHelper& rStateSet) override;
 
-private:
     explicit AccessibleTitleBar (VCLXWindow* pWindow);
     virtual ~AccessibleTitleBar() override;
 };
diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx
index ddec5c8fc6af..6b55fc173dfa 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.hxx
@@ -34,7 +34,7 @@ namespace sfx2 { namespace sidebar {
 
     It also gives access to the label and icon of a slot/command.
 */
-class SFX2_DLLPUBLIC ControllerItem
+class SFX2_DLLPUBLIC ControllerItem final
     : public SfxControllerItem
 {
 public:
@@ -67,11 +67,10 @@ public:
     */
     void RequestUpdate();
 
-protected:
+private:
 
     virtual void StateChanged (sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState) override;
 
-private:
     ItemUpdateReceiverInterface& mrItemUpdateReceiver;
     css::uno::Reference<css::lang::XComponent> mxFrameActionListener;
 };
diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx
index 7d8efa1f914e..278bb4f49a01 100644
--- a/include/sfx2/sidebar/Deck.hxx
+++ b/include/sfx2/sidebar/Deck.hxx
@@ -34,7 +34,7 @@ class DeckNotifyIdle;
 /** This is the parent window of the panels.
     It displays the deck title.
 */
-class Deck : public vcl::Window
+class Deck final : public vcl::Window
 {
 public:
     Deck(const DeckDescriptor& rDeckDescriptor,
@@ -71,7 +71,7 @@ public:
 
     sal_Int32 GetMinimalWidth() const { return mnMinimalWidth; }
 
-    class ScrollContainerWindow : public vcl::Window
+    class ScrollContainerWindow final : public vcl::Window
     {
     public:
         ScrollContainerWindow(vcl::Window* pParentWindow);
diff --git a/include/sfx2/sidebar/DeckTitleBar.hxx b/include/sfx2/sidebar/DeckTitleBar.hxx
index 555ff0abd641..bb49467c8431 100644
--- a/include/sfx2/sidebar/DeckTitleBar.hxx
+++ b/include/sfx2/sidebar/DeckTitleBar.hxx
@@ -23,7 +23,7 @@
 
 namespace sfx2 { namespace sidebar {
 
-class DeckTitleBar : public TitleBar
+class DeckTitleBar final : public TitleBar
 {
 public:
     DeckTitleBar(const OUString& rsTitle,
@@ -36,14 +36,13 @@ public:
     virtual void DataChanged(const DataChangedEvent& rEvent) override;
     virtual void MouseMove(const MouseEvent& rMouseEvent) override;
 
-protected:
+private:
     virtual tools::Rectangle GetTitleArea(const tools::Rectangle& rTitleBarBox) override;
     virtual void PaintDecoration(vcl::RenderContext& rRenderContext) override;
     virtual sidebar::Paint GetBackgroundPaint() override;
     virtual void HandleToolBoxItemClick(const sal_uInt16 nItemIndex) override;
     virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override;
 
-private:
     static const sal_uInt16 mnCloserItemIndex = 1;
     const std::function<void()> maCloserAction;
     bool mbIsCloserVisible;
diff --git a/include/sfx2/sidebar/MenuButton.hxx b/include/sfx2/sidebar/MenuButton.hxx
index e5be89ffd075..cccebd7e577a 100644
--- a/include/sfx2/sidebar/MenuButton.hxx
+++ b/include/sfx2/sidebar/MenuButton.hxx
@@ -23,7 +23,7 @@
 
 namespace sfx2 { namespace sidebar {
 
-class MenuButton
+class MenuButton final
     : public CheckBox
 {
 public:
diff --git a/include/sfx2/sidebar/Panel.hxx b/include/sfx2/sidebar/Panel.hxx
index 7ecf38b24b68..823ed6e90a3a 100644
--- a/include/sfx2/sidebar/Panel.hxx
+++ b/include/sfx2/sidebar/Panel.hxx
@@ -36,7 +36,7 @@ class PanelDescriptor;
 class PanelTitleBar;
 class Context;
 
-class SFX2_DLLPUBLIC Panel : public vcl::Window
+class SFX2_DLLPUBLIC Panel final : public vcl::Window
 {
 public:
     Panel(const PanelDescriptor& rPanelDescriptor, vcl::Window* pParentWindow,
diff --git a/include/sfx2/sidebar/PanelTitleBar.hxx b/include/sfx2/sidebar/PanelTitleBar.hxx
index 6c3216303e3c..4a8799975fb8 100644
--- a/include/sfx2/sidebar/PanelTitleBar.hxx
+++ b/include/sfx2/sidebar/PanelTitleBar.hxx
@@ -28,7 +28,7 @@ namespace sfx2 { namespace sidebar {
 
 class Panel;
 
-class PanelTitleBar
+class PanelTitleBar final
     : public TitleBar
 {
 public:
@@ -44,14 +44,13 @@ public:
     virtual void MouseButtonDown(const MouseEvent& rMouseEvent) override;
     virtual void MouseButtonUp(const MouseEvent& rMouseEvent) override;
 
-protected:
+private:
     virtual tools::Rectangle GetTitleArea(const tools::Rectangle& rTitleBarBox) override;
     virtual void PaintDecoration(vcl::RenderContext& rRenderContext) override;
     virtual sidebar::Paint GetBackgroundPaint() override;
     virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex) override;
     virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override;
 
-private:
     bool mbIsLeftButtonDown;
     VclPtr<Panel> mpPanel;
     static const sal_uInt16 mnMenuItemIndex = 1;
diff --git a/include/sfx2/sidebar/SidebarChildWindow.hxx b/include/sfx2/sidebar/SidebarChildWindow.hxx
index e37cf443ec86..0351c3859d9b 100644
--- a/include/sfx2/sidebar/SidebarChildWindow.hxx
+++ b/include/sfx2/sidebar/SidebarChildWindow.hxx
@@ -30,7 +30,7 @@ namespace sfx2 { namespace sidebar {
     RegisterChildWindow() method from the RegisterControllers() method
     of the applications DLL.
 */
-class SFX2_DLLPUBLIC SidebarChildWindow : public SfxChildWindow
+class SFX2_DLLPUBLIC SidebarChildWindow final : public SfxChildWindow
 {
 public:
     SidebarChildWindow(vcl::Window* pParent, sal_uInt16 nId,
diff --git a/include/sfx2/sidebar/SidebarDockingWindow.hxx b/include/sfx2/sidebar/SidebarDockingWindow.hxx
index bde746e32d72..0a02de481216 100644
--- a/include/sfx2/sidebar/SidebarDockingWindow.hxx
+++ b/include/sfx2/sidebar/SidebarDockingWindow.hxx
@@ -33,7 +33,7 @@ class SidebarChildWindow;
 
 class SidebarController;
 
-class SidebarDockingWindow : public SfxDockingWindow
+class SidebarDockingWindow final : public SfxDockingWindow
 {
 public:
     SidebarDockingWindow(SfxBindings* pBindings, SidebarChildWindow& rChildWindow,
@@ -50,7 +50,7 @@ public:
 
     using SfxDockingWindow::Close;
 
-protected:
+private:
     // Window overridables
     virtual void GetFocus() override;
     virtual void Resize() override;
@@ -59,7 +59,6 @@ protected:
         SfxChildAlignment eCurrentAlignment,
         SfxChildAlignment eRequestedAlignment) override;
 
-private:
     ::rtl::Reference<sfx2::sidebar::SidebarController> mpSidebarController;
     bool mbIsReadyToDrag;
     std::unique_ptr<svt::AcceleratorExecute> mpAccel;
diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx
index 1796094c3660..66188b6b5ccf 100644
--- a/include/sfx2/sidebar/TabBar.hxx
+++ b/include/sfx2/sidebar/TabBar.hxx
@@ -38,7 +38,7 @@ class SidebarController;
 
 /** The tab bar is the container for the individual tabs.
 */
-class SFX2_DLLPUBLIC TabBar
+class SFX2_DLLPUBLIC TabBar final
     : public vcl::Window
 {
 public:
diff --git a/include/sfx2/sidebar/TabItem.hxx b/include/sfx2/sidebar/TabItem.hxx
index 2f4a3c979538..43dd79acbede 100644
--- a/include/sfx2/sidebar/TabItem.hxx
+++ b/include/sfx2/sidebar/TabItem.hxx
@@ -27,7 +27,7 @@ namespace sfx2 { namespace sidebar {
 
 /** A single button in the tab bar.
 */
-class TabItem
+class TabItem final
     : public ImageRadioButton
 {
 public:
diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx
index c0b8697d7732..e018e029db16 100644
--- a/include/sfx2/sidebar/Theme.hxx
+++ b/include/sfx2/sidebar/Theme.hxx
@@ -46,7 +46,7 @@ class Paint;
 /** Simple collection of colors, gradients, fonts that define the
     look of the sidebar and its controls.
 */
-class SFX2_DLLPUBLIC Theme
+class SFX2_DLLPUBLIC Theme final
     : private ::cppu::BaseMutex,
       public ThemeInterfaceBase
 {
diff --git a/include/sfx2/sidebar/UnoDeck.hxx b/include/sfx2/sidebar/UnoDeck.hxx
index bf1865c9e06e..fc719dee49d2 100644
--- a/include/sfx2/sidebar/UnoDeck.hxx
+++ b/include/sfx2/sidebar/UnoDeck.hxx
@@ -24,7 +24,7 @@ namespace sfx2 { namespace sidebar { class SidebarController; } }
 
 /** get the decks
 */
-class SfxUnoDeck : public cppu::WeakImplHelper<css::ui::XDeck>
+class SfxUnoDeck final : public cppu::WeakImplHelper<css::ui::XDeck>
 {
 
 public:
diff --git a/include/sfx2/sidebar/UnoDecks.hxx b/include/sfx2/sidebar/UnoDecks.hxx
index 1e93d8d1e07c..5ee4a5244fb2 100644
--- a/include/sfx2/sidebar/UnoDecks.hxx
+++ b/include/sfx2/sidebar/UnoDecks.hxx
@@ -21,7 +21,7 @@ namespace sfx2 { namespace sidebar { class SidebarController; } }
 
 /** get the decks
 */
-class SfxUnoDecks : public cppu::WeakImplHelper<css::ui::XDecks>
+class SfxUnoDecks final : public cppu::WeakImplHelper<css::ui::XDecks>
 {
 
 public:
diff --git a/include/sfx2/sidebar/UnoPanel.hxx b/include/sfx2/sidebar/UnoPanel.hxx
index 17c25b10e6ef..7d82662eaaf2 100644
--- a/include/sfx2/sidebar/UnoPanel.hxx
+++ b/include/sfx2/sidebar/UnoPanel.hxx
@@ -27,7 +27,7 @@ namespace sfx2 { namespace sidebar { class SidebarController; } }
 
 /** get the Panel
 */
-class SfxUnoPanel : public cppu::WeakImplHelper<css::ui::XPanel>
+class SfxUnoPanel final : public cppu::WeakImplHelper<css::ui::XPanel>
 {
 
 public:
diff --git a/include/sfx2/sidebar/UnoPanels.hxx b/include/sfx2/sidebar/UnoPanels.hxx
index aa2ecaeade10..247f0ceb4814 100644
--- a/include/sfx2/sidebar/UnoPanels.hxx
+++ b/include/sfx2/sidebar/UnoPanels.hxx
@@ -20,7 +20,7 @@ namespace sfx2 { namespace sidebar { class SidebarController; } }
 
 /** get the decks
 */
-class SfxUnoPanels : public cppu::WeakImplHelper<css::ui::XPanels>
+class SfxUnoPanels final : public cppu::WeakImplHelper<css::ui::XPanels>
 {
 
 public:
diff --git a/include/sfx2/sidebar/UnoSidebar.hxx b/include/sfx2/sidebar/UnoSidebar.hxx
index 5b67554cbf21..86280d2e6bc9 100644
--- a/include/sfx2/sidebar/UnoSidebar.hxx
+++ b/include/sfx2/sidebar/UnoSidebar.hxx
@@ -22,7 +22,7 @@ namespace sfx2 { namespace sidebar { class SidebarController; } }
 
 /** get the sidebar for a given frame
 */
-class SfxUnoSidebar : public cppu::WeakImplHelper<css::ui::XSidebarProvider>
+class SfxUnoSidebar final : public cppu::WeakImplHelper<css::ui::XSidebarProvider>
 {
 
 private:
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 5ece422136c9..325bfb8b4b4b 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -40,7 +40,7 @@ struct TabDlg_Impl;
 #define RET_USER        100
 #define RET_USER_CANCEL 101
 
-class SFX2_DLLPUBLIC SfxTabDialogItem: public SfxSetItem
+class SFX2_DLLPUBLIC SfxTabDialogItem final : public SfxSetItem
 {
 public:
                             SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet );
diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx
index 0e0e78f12dd3..85e56da5fdca 100644
--- a/include/sfx2/templatedlg.hxx
+++ b/include/sfx2/templatedlg.hxx
@@ -142,7 +142,7 @@ protected:
 
 //  class SfxTemplateCategoryDialog -------------------------------------------------------------------
 
-class SFX2_DLLPUBLIC SfxTemplateCategoryDialog : public weld::GenericDialogController
+class SFX2_DLLPUBLIC SfxTemplateCategoryDialog final : public weld::GenericDialogController
 {
 private:
     OUString   msSelectedCategory;
@@ -184,7 +184,7 @@ public:
 
 //  class SfxTemplateSelectionDialog -------------------------------------------------------------------
 
-class SFX2_DLLPUBLIC SfxTemplateSelectionDlg : public SfxTemplateManagerDlg
+class SFX2_DLLPUBLIC SfxTemplateSelectionDlg final : public SfxTemplateManagerDlg
 {
 public:
     SfxTemplateSelectionDlg(weld::Window *parent);
diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx
index 51ef5032a7da..07b3fd0cf052 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -136,7 +136,7 @@ protected:
     std::vector<TemplateItemProperties > maAllTemplates;
 };
 
-class SFX2_DLLPUBLIC SfxTemplateLocalView : public SfxThumbnailView
+class SFX2_DLLPUBLIC SfxTemplateLocalView final : public SfxThumbnailView
 {
     typedef bool (*selection_cmp_fn)(const ThumbnailViewItem*,const ThumbnailViewItem*);
 
@@ -229,10 +229,9 @@ public:
 
     static bool IsDefaultTemplate(const OUString& rPath);
 
-protected:
+private:
     virtual void OnItemDblClicked(ThumbnailViewItem *pItem) override;
 
-protected:
     sal_uInt16 mnCurRegionId;
 
     TemplateViewItem *maSelectedItem;
diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx
index b25e09661739..0e96cffe6fd1 100644
--- a/include/sfx2/templdlg.hxx
+++ b/include/sfx2/templdlg.hxx
@@ -27,7 +27,7 @@
 class SfxBindings;
 class SfxTemplateDialog_Impl;
 
-class SFX2_DLLPUBLIC SfxTemplatePanelControl : public vcl::Window
+class SFX2_DLLPUBLIC SfxTemplatePanelControl final : public vcl::Window
 {
 public:
     SfxTemplatePanelControl(SfxBindings* pBindings, vcl::Window* pParentWindow);
diff --git a/include/sfx2/tplpitem.hxx b/include/sfx2/tplpitem.hxx
index 728e087135d7..9276ab5524ad 100644
--- a/include/sfx2/tplpitem.hxx
+++ b/include/sfx2/tplpitem.hxx
@@ -25,7 +25,7 @@
 #include <svl/flagitem.hxx>
 #include <svl/style.hxx>
 
-class SFX2_DLLPUBLIC SfxTemplateItem: public SfxFlagItem
+class SFX2_DLLPUBLIC SfxTemplateItem final : public SfxFlagItem
 {
     OUString aStyle;
 public:
diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx
index 014f61f0f35a..3460d941571a 100644
--- a/include/sfx2/unoctitm.hxx
+++ b/include/sfx2/unoctitm.hxx
@@ -66,7 +66,7 @@ public:
 
 class SfxSlotServer;
 class SfxDispatchController_Impl;
-class SfxOfficeDispatch : public cppu::ImplInheritanceHelper<SfxStatusDispatcher, css::lang::XUnoTunnel>
+class SfxOfficeDispatch final : public cppu::ImplInheritanceHelper<SfxStatusDispatcher, css::lang::XUnoTunnel>
 {
 friend class SfxDispatchController_Impl;
     std::unique_ptr<SfxDispatchController_Impl>  pImpl;
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 502f1fe4480d..0b65d90857fd 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -244,7 +244,7 @@ private:
 };
 
 
-class SFX2_DLLPUBLIC SfxViewFrameItem: public SfxPoolItem
+class SFX2_DLLPUBLIC SfxViewFrameItem final : public SfxPoolItem
 {
     SfxViewFrame* const     pFrame;
 
diff --git a/include/sfx2/watermarkitem.hxx b/include/sfx2/watermarkitem.hxx
index 448eb47990f8..4af89357d214 100644
--- a/include/sfx2/watermarkitem.hxx
+++ b/include/sfx2/watermarkitem.hxx
@@ -13,7 +13,7 @@
 #include <svl/poolitem.hxx>
 #include <tools/color.hxx>
 
-class SFX2_DLLPUBLIC SfxWatermarkItem: public SfxPoolItem
+class SFX2_DLLPUBLIC SfxWatermarkItem final : public SfxPoolItem
 {
 public:
     static SfxPoolItem* CreateDefault();