loplugin:finalclasses in svx

Change-Id: I7dd8d1a900694687fbed3f3f29b0ea4bb11b7d72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117790
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

26 files changed, 112 insertions, 131 deletions

diff --git a/svx/source/inc/DefaultShapesPanel.hxx b/svx/source/inc/DefaultShapesPanel.hxx
index 6c2781b4ef6d..71396c5ce40a 100644
--- a/svx/source/inc/DefaultShapesPanel.hxx
+++ b/svx/source/inc/DefaultShapesPanel.hxx
@@ -33,7 +33,7 @@ namespace svx::sidebar {
 
 /** This panel provides buttons for inserting shapes into a document.
 */
-class DefaultShapesPanel
+class DefaultShapesPanel final
     : public PanelLayout, public SvxShapeCommandsMap
 {
 public:
diff --git a/svx/source/inc/StylesPreviewWindow.hxx b/svx/source/inc/StylesPreviewWindow.hxx
index 5d46a9482726..c638f29d87e5 100644
--- a/svx/source/inc/StylesPreviewWindow.hxx
+++ b/svx/source/inc/StylesPreviewWindow.hxx
@@ -29,7 +29,7 @@
 class StylesPreviewWindow_Base;
 
 /// Listener for style selection
-class StyleStatusListener : public SfxStatusListener
+class StyleStatusListener final : public SfxStatusListener
 {
     StylesPreviewWindow_Base* m_pPreviewControl;
 
@@ -42,7 +42,7 @@ public:
 };
 
 /// Listener for styles creation or modification
-class StylePoolChangeListener : public SfxListener
+class StylePoolChangeListener final : public SfxListener
 {
     StylesPreviewWindow_Base* m_pPreviewControl;
     SfxStyleSheetBasePool* m_pStyleSheetPool;
@@ -109,7 +109,7 @@ private:
     bool Command(const CommandEvent& rEvent);
 };
 
-class StylesPreviewWindow_Impl : public InterimItemWindow, public StylesPreviewWindow_Base
+class StylesPreviewWindow_Impl final : public InterimItemWindow, public StylesPreviewWindow_Base
 {
 public:
     StylesPreviewWindow_Impl(
diff --git a/svx/source/inc/cell.hxx b/svx/source/inc/cell.hxx
index 6e56dbe6f893..e612e40818a4 100644
--- a/svx/source/inc/cell.hxx
+++ b/svx/source/inc/cell.hxx
@@ -42,7 +42,7 @@ namespace sdr::properties { class TextProperties; }
 namespace sdr::table {
 
 
-class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Cell :  public SdrText,
+class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Cell final : public SdrText,
                 public SvxUnoTextBase,
                 public css::table::XMergeableCell,
                 public css::awt::XLayoutConstrains,
@@ -99,8 +99,8 @@ public:
 
     // XInterface
     SVX_DLLPRIVATE virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& Type ) override;
-    SVX_DLLPRIVATE virtual void SAL_CALL acquire() noexcept override;
-    SVX_DLLPRIVATE virtual void SAL_CALL release() noexcept override;
+    virtual void SAL_CALL acquire() noexcept override;
+    virtual void SAL_CALL release() noexcept override;
 
     // XTypeProvider
     SVX_DLLPRIVATE virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
@@ -114,7 +114,7 @@ public:
     // XMergeableCell
     SVX_DLLPRIVATE virtual ::sal_Int32 SAL_CALL getRowSpan() override;
     SVX_DLLPRIVATE virtual ::sal_Int32 SAL_CALL getColumnSpan() override;
-    SVX_DLLPRIVATE virtual sal_Bool SAL_CALL isMerged() override;
+    virtual sal_Bool SAL_CALL isMerged() override;
 
     // XCell
     SVX_DLLPRIVATE virtual OUString SAL_CALL getFormula() override;
@@ -181,13 +181,12 @@ public:
 
     void dumpAsXml(xmlTextWriterPtr pWriter, sal_Int32 nRow, sal_Int32 nCol) const;
 
-protected:
+private:
     SVX_DLLPRIVATE virtual const SfxItemSet& GetObjectItemSet() override;
     SVX_DLLPRIVATE void SetObjectItem(const SfxPoolItem& rItem);
 
     SVX_DLLPRIVATE static css::uno::Any GetAnyForItem( SfxItemSet const & aSet, const SfxItemPropertyMapEntry* pMap );
 
-private:
     /// @throws css::uno::RuntimeException
     SVX_DLLPRIVATE Cell( SdrTableObj& rTableObj );
     SVX_DLLPRIVATE virtual ~Cell() noexcept override;
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index 71bcc63a4e88..193314ba4661 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -67,12 +67,11 @@ namespace svx
     /** The table implementation of the vcl control.
     */
 
-    class SvxShowCharSetAcc : public ::comphelper::OAccessibleSelectionHelper,
+    class SvxShowCharSetAcc final : public ::comphelper::OAccessibleSelectionHelper,
                               public OAccessibleHelper_Base
     {
         ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > m_aChildren;
         SvxShowCharSet*             m_pParent; // the vcl control
-    protected:
         virtual void SAL_CALL disposing() override;
     public:
         SvxShowCharSetAcc(SvxShowCharSet* pParent);
@@ -131,7 +130,7 @@ namespace svx
         }
 
         void clearCharSetControl() { m_pParent = nullptr; }
-    protected:
+    private:
 
         virtual ~SvxShowCharSetAcc() override;
 
@@ -158,12 +157,12 @@ namespace svx
 
     /** The child implementation of the table.
     */
-    class SvxShowCharSetItemAcc : public ::comphelper::OAccessibleComponentHelper,
+    class SvxShowCharSetItemAcc final : public ::comphelper::OAccessibleComponentHelper,
                                   public OAccessibleHelper_Base_3
     {
     private:
         SvxShowCharSetItem* mpParent;
-    protected:
+
         virtual ~SvxShowCharSetItemAcc() override;
 
         // OCommonAccessibleComponent
diff --git a/svx/source/inc/datalistener.hxx b/svx/source/inc/datalistener.hxx
index 5d6621c97eea..88f0a9f5a9ea 100644
--- a/svx/source/inc/datalistener.hxx
+++ b/svx/source/inc/datalistener.hxx
@@ -36,7 +36,7 @@ namespace svxform
         css::frame::XFrameActionListener,
         css::xml::dom::events::XEventListener > DataListener_t;
 
-    class DataListener : public DataListener_t
+    class DataListener final : public DataListener_t
     {
     private:
         DataNavigatorWindow* m_pNaviWin;
@@ -44,7 +44,7 @@ namespace svxform
     public:
         DataListener( DataNavigatorWindow* pNaviWin );
 
-    protected:
+    private:
         virtual ~DataListener() override;
 
     public:
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index a1e23dd05cb6..fbdd4667de4f 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -166,7 +166,7 @@ namespace svxform
         }
     };
 
-    class DataTreeDropTarget : public DropTargetHelper
+    class DataTreeDropTarget final : public DropTargetHelper
     {
     private:
         virtual sal_Int8 AcceptDrop(const AcceptDropEvent& rEvt) override;
@@ -176,7 +176,7 @@ namespace svxform
         DataTreeDropTarget(weld::TreeView& rWidget);
     };
 
-    class XFormsPage : public BuilderPage
+    class XFormsPage final : public BuilderPage
     {
     private:
         MethodString                m_aMethodString;
@@ -313,12 +313,11 @@ namespace svxform
         void                        DisableNotify( bool _bDisable ) { m_bIsNotifyDisabled = _bDisable; }
     };
 
-    class DataNavigator : public SfxDockingWindow, public SfxControllerItem
+    class DataNavigator final : public SfxDockingWindow, public SfxControllerItem
     {
     private:
         std::unique_ptr<DataNavigatorWindow> m_xDataWin;
 
-    protected:
         virtual Size                CalcDockingSize( SfxChildAlignment ) override;
         virtual SfxChildAlignment   CheckAlignment( SfxChildAlignment, SfxChildAlignment ) override;
 
@@ -333,7 +332,7 @@ namespace svxform
                                                   const SfxPoolItem* pState ) override;
     };
 
-    class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) DataNavigatorManager : public SfxChildWindow
+    class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) DataNavigatorManager final : public SfxChildWindow
     {
     public:
         SVX_DLLPRIVATE DataNavigatorManager( vcl::Window* pParent, sal_uInt16 nId,
@@ -341,7 +340,7 @@ namespace svxform
         SFX_DECL_CHILDWINDOW( DataNavigatorManager );
     };
 
-    class AddDataItemDialog : public weld::GenericDialogController
+    class AddDataItemDialog final : public weld::GenericDialogController
     {
     private:
         css::uno::Reference< css::xforms::XFormsUIHelper1 >
@@ -397,7 +396,7 @@ namespace svxform
         void                InitText( DataItemType _eType );
     };
 
-    class AddConditionDialog : public weld::GenericDialogController
+    class AddConditionDialog final : public weld::GenericDialogController
     {
     private:
         Idle                           m_aResultIdle;
@@ -432,7 +431,7 @@ namespace svxform
         }
     };
 
-    class NamespaceItemDialog : public weld::GenericDialogController
+    class NamespaceItemDialog final : public weld::GenericDialogController
     {
     private:
         AddConditionDialog* m_pConditionDlg;
@@ -458,7 +457,7 @@ namespace svxform
         virtual ~NamespaceItemDialog() override;
     };
 
-    class ManageNamespaceDialog : public weld::GenericDialogController
+    class ManageNamespaceDialog final : public weld::GenericDialogController
     {
     private:
         AddConditionDialog* m_pConditionDlg;
@@ -483,7 +482,7 @@ namespace svxform
         OUString GetURL() const { return m_xUrlED->get_text(); }
     };
 
-    class AddSubmissionDialog : public weld::GenericDialogController
+    class AddSubmissionDialog final : public weld::GenericDialogController
     {
     private:
         MethodString         m_aMethodString;
@@ -524,7 +523,7 @@ namespace svxform
         const css::uno::Reference< css::xforms::XSubmission >& GetNewSubmission() const { return m_xNewSubmission; }
     };
 
-    class AddModelDialog : public weld::GenericDialogController
+    class AddModelDialog final : public weld::GenericDialogController
     {
     private:
         std::unique_ptr<weld::Entry> m_xNameED;
@@ -542,7 +541,7 @@ namespace svxform
         void             SetModifyDoc( const bool bModify ) { m_xModifyCB->set_active(bModify); }
     };
 
-    class AddInstanceDialog : public weld::GenericDialogController
+    class AddInstanceDialog final : public weld::GenericDialogController
     {
     private:
         OUString                m_sAllFilterName;
@@ -568,7 +567,7 @@ namespace svxform
         void             SetLinkInstance( bool bLink ) { m_xLinkInstanceCB->set_active(bLink); }
     };
 
-    class LinkedInstanceWarningBox : public weld::MessageDialogController
+    class LinkedInstanceWarningBox final : public weld::MessageDialogController
     {
     public:
         LinkedInstanceWarningBox(weld::Widget* pParent);
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 4a954f57b7fa..93d6dd8ff562 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -170,7 +170,7 @@ class IRecoveryUpdateListener
 };
 
 
-class RecoveryCore : public ::cppu::WeakImplHelper< css::frame::XStatusListener >
+class RecoveryCore final : public ::cppu::WeakImplHelper< css::frame::XStatusListener >
 {
 
     // types, const
@@ -281,7 +281,7 @@ class RecoveryCore : public ::cppu::WeakImplHelper< css::frame::XStatusListener
         css::util::URL impl_getParsedURL(const OUString& sURL);
 };
 
-class PluginProgress : public ::cppu::WeakImplHelper<css::task::XStatusIndicator, css::lang::XComponent>
+class PluginProgress final : public ::cppu::WeakImplHelper<css::task::XStatusIndicator, css::lang::XComponent>
 {
 // member
 private:
@@ -308,7 +308,7 @@ public:
     virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener) override;
 };
 
-class SaveDialog : public weld::GenericDialogController
+class SaveDialog final : public weld::GenericDialogController
 {
 // member
 private:
@@ -339,7 +339,7 @@ public:
     DECL_LINK(OKButtonHdl, weld::Button&, void);
 };
 
-class SaveProgressDialog : public weld::GenericDialogController
+class SaveProgressDialog final : public weld::GenericDialogController
                          , public IRecoveryUpdateListener
 {
     // member
@@ -379,7 +379,7 @@ class SaveProgressDialog : public weld::GenericDialogController
         virtual void end() override;
 };
 
-class RecoveryDialog : public weld::GenericDialogController
+class RecoveryDialog final : public weld::GenericDialogController
                      , public IRecoveryUpdateListener
 {
     // member
@@ -442,7 +442,7 @@ class RecoveryDialog : public weld::GenericDialogController
 };
 
 
-class BrokenRecoveryDialog : public weld::GenericDialogController
+class BrokenRecoveryDialog final : public weld::GenericDialogController
 {
 // member
 private:
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index adc9cda6593d..59af45acbd86 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -80,7 +80,7 @@ public:
 };
 
 // Item representing the forms and subforms
-class FmFormItem : public FmParentData
+class FmFormItem final : public FmParentData
 {
     css::uno::Reference< css::form::runtime::XFormController >    m_xController;
     css::uno::Reference< css::form::runtime::XFilterController >  m_xFilterController;
@@ -105,7 +105,7 @@ public:
     virtual OUString GetImage() const override;
 };
 
-class FmFilterItems : public FmParentData
+class FmFilterItems final : public FmParentData
 {
 public:
     FmFilterItems(FmFormItem* pParent, const OUString& rText ) : FmParentData(pParent, rText) {}
@@ -114,7 +114,7 @@ public:
     virtual OUString GetImage() const override;
 };
 
-class FmFilterItem : public FmFilterData
+class FmFilterItem final : public FmFilterData
 {
     OUString      m_aFieldName;
     sal_Int32     m_nComponentIndex;
@@ -174,7 +174,7 @@ private:
 };
 
 
-class OFilterItemExchange : public OLocalExchange
+class OFilterItemExchange final : public OLocalExchange
 {
     ::std::vector<FmFilterItem*>    m_aDraggedEntries;
     FmFormItem*             m_pFormItem;        // ensure that we drop on the same form
@@ -191,7 +191,7 @@ public:
 
     void setFormItem( FmFormItem* _pItem ) { m_pFormItem = _pItem; }
 
-protected:
+private:
     virtual void AddSupportedFormats() override;
 };
 
@@ -200,7 +200,7 @@ inline bool OFilterItemExchange::hasFormat( const DataFlavorExVector& _rFormats
     return OLocalExchange::hasFormat( _rFormats, getFormatId() );
 }
 
-class OFilterExchangeHelper : public OLocalExchangeHelper
+class OFilterExchangeHelper final : public OLocalExchangeHelper
 {
 public:
     OFilterExchangeHelper() : OLocalExchangeHelper() { }
@@ -208,13 +208,13 @@ public:
     OFilterItemExchange* operator->() const { return static_cast<OFilterItemExchange*>(m_xTransferable.get()); }
     OFilterItemExchange& operator*() const { return *static_cast<OFilterItemExchange*>(m_xTransferable.get()); }
 
-protected:
+private:
     virtual rtl::Reference<OLocalExchange> createExchange() const override;
 };
 
 class FmFilterNavigator;
 
-class FmFilterNavigatorDropTarget : public DropTargetHelper
+class FmFilterNavigatorDropTarget final : public DropTargetHelper
 {
 private:
     FmFilterNavigator& m_rTreeView;
@@ -301,12 +301,11 @@ private:
     bool getNextEntry(weld::TreeIter& rEntry);
 };
 
-class FmFilterNavigatorWin : public SfxDockingWindow, public SfxControllerItem
+class FmFilterNavigatorWin final : public SfxDockingWindow, public SfxControllerItem
 {
 private:
     std::unique_ptr<FmFilterNavigator> m_xNavigatorTree;
 
-protected:
     virtual bool Close() override;
     virtual void GetFocus() override;
     virtual Size CalcDockingSize( SfxChildAlignment ) override;
@@ -325,7 +324,7 @@ public:
     void FillInfo( SfxChildWinInfo& rInfo ) const override;
 };
 
-class FmFilterNavigatorWinMgr : public SfxChildWindow
+class FmFilterNavigatorWinMgr final : public SfxChildWindow
 {
 public:
     FmFilterNavigatorWinMgr( vcl::Window *pParent, sal_uInt16 nId, SfxBindings *pBindings,
diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx
index 8fa9f0951e6a..b33597b24d6c 100644
--- a/svx/source/inc/fmPropBrw.hxx
+++ b/svx/source/inc/fmPropBrw.hxx
@@ -29,7 +29,7 @@
 #include <svx/fmtools.hxx>
 
 
-class FmPropBrwMgr : public SfxChildWindow
+class FmPropBrwMgr final : public SfxChildWindow
 {
 public:
     FmPropBrwMgr(vcl::Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, const SfxChildWinInfo *pInfo);
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index ffc61af79685..5399ac89c0e5 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@@ -187,7 +187,7 @@ namespace svxform
         return m_aCurrentFormats;
     }
 
-    class OControlExchange : public OLocalExchange, public OControlTransferData
+    class OControlExchange final : public OLocalExchange, public OControlTransferData
     {
     public:
         OControlExchange( );
@@ -201,12 +201,12 @@ namespace svxform
         inline static bool  hasControlPathFormat( const DataFlavorExVector& _rFormats );
         inline static bool  hasHiddenControlModelsFormat( const DataFlavorExVector& _rFormats );
 
-    protected:
+    private:
         virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override;
         virtual void        AddSupportedFormats() override;
     };
 
-    class OControlExchangeHelper : public OLocalExchangeHelper
+    class OControlExchangeHelper final : public OLocalExchangeHelper
     {
     public:
         OControlExchangeHelper() : OLocalExchangeHelper() { }
@@ -214,7 +214,7 @@ namespace svxform
         OControlExchange* operator->() const { return static_cast< OControlExchange* >( m_xTransferable.get() ); }
         OControlExchange& operator*() const { return *static_cast< OControlExchange* >( m_xTransferable.get() ); }
 
-    protected:
+    private:
         virtual rtl::Reference<OLocalExchange> createExchange() const override;
     };
 
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 9dc28709a71a..572b563b7cd9 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -52,7 +52,7 @@ class SdrMarkList;
 
 
 class FmEntryData;
-class FmNavInsertedHint : public SfxHint
+class FmNavInsertedHint final : public SfxHint
 {
     FmEntryData* pEntryData;
     sal_uInt32 nPos;
@@ -66,7 +66,7 @@ public:
 };
 
 
-class FmNavModelReplacedHint : public SfxHint
+class FmNavModelReplacedHint final : public SfxHint
 {
     FmEntryData* pEntryData;    // the data of the entry that has got a new model
 
@@ -78,7 +78,7 @@ public:
 };
 
 
-class FmNavRemovedHint : public SfxHint
+class FmNavRemovedHint final : public SfxHint
 {
     FmEntryData* pEntryData;
 
@@ -90,7 +90,7 @@ public:
 };
 
 
-class FmNavNameChangedHint : public SfxHint
+class FmNavNameChangedHint final : public SfxHint
 {
     FmEntryData*    pEntryData;
     OUString          aNewName;
@@ -104,7 +104,7 @@ public:
 };
 
 
-class FmNavClearedHint : public SfxHint
+class FmNavClearedHint final : public SfxHint
 {
 public:
     FmNavClearedHint();
@@ -112,7 +112,7 @@ public:
 };
 
 
-class FmNavViewMarksChanged : public SfxHint
+class FmNavViewMarksChanged final : public SfxHint
 {
     FmFormView* pView;
 public:
@@ -201,7 +201,7 @@ public:
 
 typedef std::set<FmEntryData*> FmEntryDataArray;
 
-class FmNavRequestSelectHint : public SfxHint
+class FmNavRequestSelectHint final : public SfxHint
 {
     FmEntryDataArray    m_arredToSelect;
     bool                m_bMixedSelection;
@@ -219,7 +219,7 @@ public:
 };
 
 
-class FmFormData : public FmEntryData
+class FmFormData final : public FmEntryData
 {
     css::uno::Reference< css::form::XForm >           m_xForm;
 
@@ -235,7 +235,7 @@ public:
 };
 
 
-class FmControlData : public FmEntryData
+class FmControlData final : public FmEntryData
 {
     css::uno::Reference< css::form::XFormComponent >  m_xFormComponent;
 
@@ -298,7 +298,7 @@ namespace svxform
         void Remove( const css::uno::Reference< css::uno::XInterface >& _rxElement );
     };
 
-    class NavigatorTreeModel : public SfxBroadcaster
+    class NavigatorTreeModel final : public SfxBroadcaster
                            ,public SfxListener
     {
         friend class NavigatorTree;
@@ -358,7 +358,7 @@ namespace svxform
 
     class NavigatorTree;
 
-    class NavigatorTreeDropTarget : public DropTargetHelper
+    class NavigatorTreeDropTarget final : public DropTargetHelper
     {
     private:
         NavigatorTree& m_rTreeView;
@@ -514,12 +514,11 @@ namespace svxform
         bool    doingKeyboardCut( ) const { return m_bKeyboardCut; }
     };
 
-    class NavigatorFrame : public SfxDockingWindow, public SfxControllerItem
+    class NavigatorFrame final : public SfxDockingWindow, public SfxControllerItem
     {
     private:
         std::unique_ptr<NavigatorTree> m_xNavigatorTree;
 
-    protected:
         virtual bool Close() override;
         virtual void GetFocus() override;
         virtual Size CalcDockingSize( SfxChildAlignment ) override;
@@ -538,7 +537,7 @@ namespace svxform
         void FillInfo( SfxChildWinInfo& rInfo ) const override;
     };
 
-    class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) NavigatorFrameManager : public SfxChildWindow
+    class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) NavigatorFrameManager final : public SfxChildWindow
     {
     public:
         SVX_DLLPRIVATE NavigatorFrameManager( vcl::Window *pParent, sal_uInt16 nId, SfxBindings *pBindings,
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx
index 6e6b2d0edb4f..d604cfd207ac 100644
--- a/svx/source/inc/fmobj.hxx
+++ b/svx/source/inc/fmobj.hxx
@@ -28,7 +28,7 @@
 
 // FmFormObj
 
-class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) FmFormObj : public SdrUnoObj
+class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) FmFormObj final : public SdrUnoObj
 {
     FmFormObj( const FmFormObj& ) = delete;
 
@@ -47,7 +47,6 @@ class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) FmFormObj : public SdrUnoObj
                             // the last ref device we know, as set at the model
                             // only to be used for comparison with the current ref device!
 
-protected:
     // protected destructor
     SAL_DLLPRIVATE virtual ~FmFormObj() override;
 
@@ -97,11 +96,10 @@ public:
 
     SAL_DLLPRIVATE virtual void SetUnoControlModel( const css::uno::Reference< css::awt::XControlModel >& _rxModel ) override;
 
-protected:
+private:
     SAL_DLLPRIVATE virtual bool        EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd ) override;
     SAL_DLLPRIVATE virtual void        BrkCreate( SdrDragStat& rStat ) override;
 
-private:
     /** isolates the control model from its form component hierarchy, i.e. removes it from
         its parent.
     */
diff --git a/svx/source/inc/fmscriptingenv.hxx b/svx/source/inc/fmscriptingenv.hxx
index ef4f29f80418..18d8a5e44ad5 100644
--- a/svx/source/inc/fmscriptingenv.hxx
+++ b/svx/source/inc/fmscriptingenv.hxx
@@ -35,7 +35,7 @@ namespace svxform
     /** describes the interface implemented by a component which handles scripting requirements
         in a form/control environment.
     */
-    class FormScriptingEnvironment : public ::salhelper::SimpleReferenceObject
+    class FormScriptingEnvironment final : public ::salhelper::SimpleReferenceObject
     {
     friend class FormScriptListener;
     public:
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 4c296ed820b7..f347e6cd2e7b 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -94,12 +94,12 @@ namespace weld {
 
 // a class iterating through all fields of a form which are bound to a field
 // sub forms are ignored, grid columns (where the grid is a direct child of the form) are included
-class FmXBoundFormFieldIterator : public ::comphelper::IndexAccessIterator
+class FmXBoundFormFieldIterator final : public ::comphelper::IndexAccessIterator
 {
 public:
     FmXBoundFormFieldIterator(const css::uno::Reference< css::uno::XInterface>& _rStartingPoint) : ::comphelper::IndexAccessIterator(_rStartingPoint) { }
 
-protected:
+private:
     virtual bool ShouldHandleElement(const css::uno::Reference< css::uno::XInterface>& _rElement) override;
     virtual bool ShouldStepInto(const css::uno::Reference< css::uno::XInterface>& _rContainer) const override;
 };
@@ -541,7 +541,7 @@ inline bool FmXFormShell::IsSelectionUpdatePending_Lock() const
 // = for that object is omitted.
 // =
 
-class SearchableControlIterator : public ::comphelper::IndexAccessIterator
+class SearchableControlIterator final : public ::comphelper::IndexAccessIterator
 {
     OUString         m_sCurrentValue;
         // the current value of the ControlSource css::beans::Property
@@ -549,7 +549,6 @@ class SearchableControlIterator : public ::comphelper::IndexAccessIterator
 public:
     const OUString& getCurrentValue() const { return m_sCurrentValue; }
 
-public:
     SearchableControlIterator(css::uno::Reference< css::uno::XInterface> const & xStartingPoint);
 
     virtual bool ShouldHandleElement(const css::uno::Reference< css::uno::XInterface>& rElement) override;
diff --git a/svx/source/inc/fmtextcontroldialogs.hxx b/svx/source/inc/fmtextcontroldialogs.hxx
index 613f17bf5c4a..e915b06f1a53 100644
--- a/svx/source/inc/fmtextcontroldialogs.hxx
+++ b/svx/source/inc/fmtextcontroldialogs.hxx
@@ -26,7 +26,7 @@
 namespace svx
 {
 
-    class TextControlCharAttribDialog : public SfxTabDialogController
+    class TextControlCharAttribDialog final : public SfxTabDialogController
     {
     private:
         SvxFontListItem m_aFontList;
@@ -34,11 +34,11 @@ namespace svx
     public:
         TextControlCharAttribDialog(weld::Window* pParent, const SfxItemSet& rCoreSet, const SvxFontListItem& rFontList);
 
-    protected:
+    private:
         virtual void PageCreated(const OString& rId, SfxTabPage& _rPage) override;
     };
 
-    class TextControlParaAttribDialog : public SfxTabDialogController
+    class TextControlParaAttribDialog final : public SfxTabDialogController
     {
     public:
         TextControlParaAttribDialog(weld::Window* pParent, const SfxItemSet& rCoreSet);
diff --git a/svx/source/inc/fmtextcontrolfeature.hxx b/svx/source/inc/fmtextcontrolfeature.hxx
index 0acc884bcd1d..2414f2bbdfff 100644
--- a/svx/source/inc/fmtextcontrolfeature.hxx
+++ b/svx/source/inc/fmtextcontrolfeature.hxx
@@ -35,7 +35,7 @@ namespace svx
     typedef ::cppu::WeakImplHelper <   css::frame::XStatusListener
                                     >   FmTextControlFeature_Base;
 
-    class FmTextControlFeature : public FmTextControlFeature_Base
+    class FmTextControlFeature final : public FmTextControlFeature_Base
     {
     private:
         css::uno::Reference< css::frame::XDispatch >
@@ -75,10 +75,9 @@ namespace svx
         /// releases any resources associated with this instance
         void    dispose();
 
-    protected:
+    private:
         virtual ~FmTextControlFeature() override;
 
-    protected:
         // XStatusListener
         virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& State ) override;
         virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx
index 4f6714de4d76..77ea5c5d2f94 100644
--- a/svx/source/inc/fmtextcontrolshell.hxx
+++ b/svx/source/inc/fmtextcontrolshell.hxx
@@ -71,7 +71,7 @@ namespace svx
         ~IContextRequestObserver() {}
     };
 
-    class FmTextControlShell :public IFocusObserver
+    class FmTextControlShell final : public IFocusObserver
                              ,public IContextRequestObserver
     {
     private:
@@ -135,7 +135,7 @@ namespace svx
 
         void    Invalidate( SfxSlotId _nSlot );
 
-    protected:
+    private:
         // IFocusObserver
         virtual void    focusGained( const css::awt::FocusEvent& _rEvent ) override;
         virtual void    focusLost( const css::awt::FocusEvent& _rEvent ) override;
@@ -148,7 +148,6 @@ namespace svx
         void    executeSelectAll( );
         void    executeClipboardSlot( SfxSlotId _nSlot );
 
-    private:
         bool    isControllerListening() const { return !m_aControlObservers.empty(); }
 
         rtl::Reference<FmTextControlFeature>
diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx
index 02b8f4998766..61792e1afa3f 100644
--- a/svx/source/inc/fmundo.hxx
+++ b/svx/source/inc/fmundo.hxx
@@ -43,7 +43,7 @@ class FmFormModel;
 class FmFormObj;
 class SdrObject;
 
-class FmUndoPropertyAction: public SdrUndoAction
+class FmUndoPropertyAction final : public SdrUndoAction
 {
     css::uno::Reference< css::beans::XPropertySet> xObj;
     OUString               aPropertyName;
@@ -97,7 +97,7 @@ private:
     Action          m_eAction;
 };
 
-class FmUndoModelReplaceAction : public SdrUndoAction
+class FmUndoModelReplaceAction final : public SdrUndoAction
 {
     css::uno::Reference< css::awt::XControlModel> m_xReplaced;
     SdrUnoObj*          m_pObject;
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index ee85e565e4c0..c7cb3681b418 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -129,7 +129,7 @@ private:
 
 class SdrModel;
 
-class FmXFormView : public ::cppu::WeakImplHelper<
+class FmXFormView final : public ::cppu::WeakImplHelper<
                             css::form::XFormControllerListener,
                             css::awt::XFocusListener,
                             css::container::XContainerListener>
@@ -172,7 +172,6 @@ class FmXFormView : public ::cppu::WeakImplHelper<
 
     css::uno::Reference<css::awt::XWindow> GetParentWindow() const;
 
-protected:
     FmXFormView( FmFormView* _pView );
     virtual ~FmXFormView() override;
 
diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx
index dc93489c343c..c9bd8f23f8a6 100644
--- a/svx/source/inc/formcontrolling.hxx
+++ b/svx/source/inc/formcontrolling.hxx
@@ -128,9 +128,8 @@ namespace svx
         A <em>feature</em> is for instance moving the form associated with the controller
         to a certain position, or reloading the form, and so on.</p>
     */
-    class FormControllerHelper : public FormControllerHelper_Base
+    class FormControllerHelper final : public FormControllerHelper_Base
     {
-    protected:
         IControllerFeatureInvalidation* m_pInvalidationCallback;
         css::uno::Reference< css::form::runtime::XFormOperations >
                                         m_xFormOperations;
@@ -174,7 +173,7 @@ namespace svx
         */
         void        dispose();
 
-    protected:
+    private:
         /// dtor
         virtual ~FormControllerHelper() override;
 
@@ -188,7 +187,6 @@ namespace svx
         // XEventListener
         virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
-    private:
         enum FormOperation { EXECUTE, EXECUTE_ARGS, COMMIT_CONTROL, COMMIT_RECORD };
 
         bool    impl_operateForm_nothrow(
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 0ffeebcf84b2..8a0ecc5b52fa 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -377,13 +377,12 @@ protected:
 };
 
 
-class DbTextField : public DbLimitedLengthField
+class DbTextField final : public DbLimitedLengthField
 {
     std::unique_ptr<::svt::IEditImplementation> m_pEdit;
     std::unique_ptr<::svt::IEditImplementation> m_pPainterImplementation;
     bool                    m_bIsSimpleEdit;
 
-protected:
     virtual ~DbTextField( ) override;
 
 public:
@@ -400,7 +399,7 @@ public:
                         const css::uno::Reference< css::sdb::XColumn >& _rxField,
                         const css::uno::Reference< css::util::XNumberFormatter >& _rxFormatter ) override;
 
-protected:
+private:
     // DbCellControl
     virtual bool        commitControl( ) override;
     virtual void        updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override;
@@ -432,7 +431,7 @@ private:
 };
 
 
-class DbCheckBox : public DbCellControl
+class DbCheckBox final : public DbCellControl
 {
 public:
     DbCheckBox(DbGridColumn& _rColumn);
@@ -445,14 +444,14 @@ public:
                           const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
     virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, const Color** ppColor = nullptr) override;
 
-protected:
+private:
     // DbCellControl
     virtual bool        commitControl( ) override;
     virtual void        updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override;
 };
 
 
-class DbComboBox : public DbCellControl
+class DbComboBox final : public DbCellControl
 {
 
 public:
@@ -465,7 +464,7 @@ public:
 
     void SetList(const css::uno::Any& rItems);
 
-protected:
+private:
     // DbCellControl
     virtual bool        commitControl( ) override;
     virtual void        updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override;
@@ -477,7 +476,7 @@ protected:
 };
 
 
-class DbListBox     :public DbCellControl
+class DbListBox final : public DbCellControl
 {
     bool              m_bBound  : 1;
     css::uno::Sequence< OUString > m_aValueList;
@@ -492,7 +491,7 @@ public:
 
     void SetList(const css::uno::Any& rItems);
 
-protected:
+private:
     // DbCellControl
     virtual bool        commitControl( ) override;
     virtual void        updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override;
@@ -504,7 +503,7 @@ protected:
 };
 
 
-class DbPatternField : public DbCellControl
+class DbPatternField final : public DbCellControl
 {
 public:
     DbPatternField( DbGridColumn& _rColumn, const css::uno::Reference<css::uno::XComponentContext>& _rContext );
@@ -513,17 +512,15 @@ public:
     virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
     virtual ::svt::CellControllerRef CreateController() const override;
 
-protected:
+private:
     /// DbCellControl
     virtual bool        commitControl( ) override;
     virtual void        updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override;
 
     virtual void        implAdjustGenericFieldSetting( const css::uno::Reference< css::beans::XPropertySet >& _rxModel ) override;
 
-private:
     OUString  impl_formatText(const OUString& _rText);
 
-private:
     ::std::unique_ptr< ::dbtools::FormattedColumnValue >  m_pValueFormatter;
     ::std::unique_ptr< ::dbtools::FormattedColumnValue >  m_pPaintFormatter;
     css::uno::Reference<css::uno::XComponentContext>    m_xContext;
@@ -552,14 +549,14 @@ protected:
                         ) = 0;
 };
 
-class DbDateField : public DbSpinField
+class DbDateField final : public DbSpinField
 {
 public:
     DbDateField(DbGridColumn& _rColumn);
     virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, const Color** ppColor = nullptr) override;
     virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
 
-protected:
+private:
     // DbCellControl
     virtual bool        commitControl( ) override;
     virtual void        updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override;
@@ -575,14 +572,14 @@ protected:
     virtual void    implAdjustGenericFieldSetting( const css::uno::Reference< css::beans::XPropertySet >& _rxModel ) override;
 };
 
-class DbTimeField : public DbSpinField
+class DbTimeField final : public DbSpinField
 {
 public:
     DbTimeField(DbGridColumn& _rColumn);
     virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, const Color** ppColor = nullptr) override;
     virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
 
-protected:
+private:
     // DbCellControl
     virtual bool        commitControl( ) override;
     virtual void        updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override;
@@ -598,14 +595,14 @@ protected:
     virtual void    implAdjustGenericFieldSetting( const css::uno::Reference< css::beans::XPropertySet >& _rxModel ) override;
 };
 
-class DbCurrencyField : public DbSpinField
+class DbCurrencyField final : public DbSpinField
 {
 public:
     DbCurrencyField(DbGridColumn& _rColumn);
     virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, const Color** ppColor = nullptr) override;
     virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
 
-protected:
+private:
     // DbCellControl
     virtual bool        commitControl( ) override;
     virtual void        updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override;
@@ -621,7 +618,7 @@ protected:
     virtual void    implAdjustGenericFieldSetting( const css::uno::Reference< css::beans::XPropertySet >& _rxModel ) override;
 };
 
-class DbNumericField : public DbSpinField
+class DbNumericField final : public DbSpinField
 {
 public:
     DbNumericField(DbGridColumn& _rColumn);
@@ -629,7 +626,7 @@ public:
     virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, const Color** ppColor = nullptr) override;
     virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
 
-protected:
+private:
     // DbCellControl
     virtual bool        commitControl( ) override;
     virtual void        updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override;
@@ -900,7 +897,7 @@ private:
 typedef ::cppu::ImplHelper2 <   css::awt::XCheckBox
                             ,   css::awt::XButton
                             >   FmXCheckBoxCell_Base;
-class FmXCheckBoxCell : public FmXDataCell,
+class FmXCheckBoxCell final : public FmXDataCell,
                         public FmXCheckBoxCell_Base
 {
     ::comphelper::OInterfaceContainerHelper2   m_aItemListeners;
@@ -910,7 +907,6 @@ class FmXCheckBoxCell : public FmXDataCell,
 
     DECL_LINK(ModifyHdl, LinkParamNone*, void);
 
-protected:
     virtual ~FmXCheckBoxCell() override;
 
 public:
diff --git a/svx/source/inc/tablemodel.hxx b/svx/source/inc/tablemodel.hxx
index c97b15be3e6c..63c08a9b8891 100644
--- a/svx/source/inc/tablemodel.hxx
+++ b/svx/source/inc/tablemodel.hxx
@@ -50,7 +50,7 @@ protected:
 
 typedef ::cppu::WeakComponentImplHelper< css::table::XTable, css::util::XBroadcaster > TableModelBase;
 
-class TableModel : public ::cppu::BaseMutex,
+class TableModel final : public ::cppu::BaseMutex,
                    public TableModelBase,
                    public ICellRange
 {
@@ -135,7 +135,7 @@ public:
     virtual void SAL_CALL lockBroadcasts() override;
     virtual void SAL_CALL unlockBroadcasts() override;
 
-protected:
+private:
     void notifyModification();
 
     void insertColumns( sal_Int32 nIndex, sal_Int32 nCount );
diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx
index 5de4bc33357b..c1cf70664bcc 100644
--- a/svx/source/inc/tabwin.hxx
+++ b/svx/source/inc/tabwin.hxx
@@ -31,7 +31,7 @@
 class FmFormShell;
 struct ColumnInfo;
 
-class FmFieldWin : public SfxModelessDialogController
+class FmFieldWin final : public SfxModelessDialogController
                  , public SfxControllerItem
                  , public ::comphelper::OPropertyChangeListener
 {
@@ -70,16 +70,15 @@ public:
 
     bool    createSelectionControls( );
 
-protected:
+private:
     // FmXChangeListener
     virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) override;
 
-protected:
     using SfxControllerItem::GetBindings;
 };
 
 
-class FmFieldWinMgr : public SfxChildWindow
+class FmFieldWinMgr final : public SfxChildWindow
 {
 public:
     FmFieldWinMgr(vcl::Window *pParent, sal_uInt16 nId,
diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx
index 4afc994c20fb..20c22a0b5863 100644
--- a/svx/source/inc/tbxform.hxx
+++ b/svx/source/inc/tbxform.hxx
@@ -33,7 +33,7 @@ private:
     SfxToolBoxControl* m_pController;
 };
 
-class SvxFmTbxCtlAbsRec : public SfxToolBoxControl
+class SvxFmTbxCtlAbsRec final : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
@@ -47,7 +47,7 @@ public:
                                               const SfxPoolItem* pState) override;
 };
 
-class SvxFmTbxCtlRecText : public SfxToolBoxControl
+class SvxFmTbxCtlRecText final : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
@@ -58,7 +58,7 @@ public:
     virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override;
 };
 
-class SvxFmTbxCtlRecFromText : public SfxToolBoxControl
+class SvxFmTbxCtlRecFromText final : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
@@ -71,7 +71,7 @@ public:
 
 class LabelItemWindow;
 
-class SvxFmTbxCtlRecTotal : public SfxToolBoxControl
+class SvxFmTbxCtlRecTotal final : public SfxToolBoxControl
 {
     VclPtr<LabelItemWindow> m_xFixedText;
 
@@ -86,14 +86,14 @@ public:
                                               const SfxPoolItem* pState) override;
 };
 
-class SvxFmTbxNextRec : public SfxToolBoxControl
+class SvxFmTbxNextRec final : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
     SvxFmTbxNextRec(sal_uInt16 nSlotId, ToolBoxItemId nId, ToolBox& rTbx);
 };
 
-class SvxFmTbxPrevRec : public SfxToolBoxControl
+class SvxFmTbxPrevRec final : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
diff --git a/svx/source/inc/xmlxtexp.hxx b/svx/source/inc/xmlxtexp.hxx
index 6ed07675b4f6..e47dbf1df934 100644
--- a/svx/source/inc/xmlxtexp.hxx
+++ b/svx/source/inc/xmlxtexp.hxx
@@ -31,7 +31,7 @@ namespace com::sun::star {
     namespace xml::sax { class XDocumentHandler; }
 }
 
-class SvxXMLXTableExportComponent : public SvXMLExport
+class SvxXMLXTableExportComponent final : public SvXMLExport
 {
 public:
     SvxXMLXTableExportComponent(
diff --git a/svx/source/inc/xmlxtimp.hxx b/svx/source/inc/xmlxtimp.hxx
index a5bf4b39a1f0..ee442ac40c41 100644
--- a/svx/source/inc/xmlxtimp.hxx
+++ b/svx/source/inc/xmlxtimp.hxx
@@ -29,7 +29,7 @@ namespace com::sun::star {
     namespace container { class XNameContainer; }
 }
 
-class SvxXMLXTableImport : public SvXMLImport
+class SvxXMLXTableImport final : public SvXMLImport
 {
 public:
     SvxXMLXTableImport(
@@ -43,11 +43,10 @@ public:
                       const css::uno::Reference < css::embed::XStorage > &xStorage,
                       const css::uno::Reference< css::container::XNameContainer >& xTable,
                       bool *bOptLoadedFromStorage ) noexcept;
-protected:
+private:
     virtual SvXMLImportContext *CreateFastContext( sal_Int32 Element,
         const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList >& xAttrList ) override;
 
-private:
     const css::uno::Reference< css::container::XNameContainer > & mrTable;
 };