loplugin:finalclasses in svtools

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

5 files changed, 38 insertions, 53 deletions

diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx
index 193ceac94060..bfaf39befc25 100644
--- a/svtools/inc/roadmap.hxx
+++ b/svtools/inc/roadmap.hxx
@@ -41,14 +41,8 @@ public:
 class RoadmapImpl;
 class RoadmapItem;
 
-class SVT_DLLPUBLIC ORoadmap : public Control, public RoadmapTypes
+class SVT_DLLPUBLIC ORoadmap final : public Control, public RoadmapTypes
 {
-protected:
-    std::unique_ptr<RoadmapImpl>    m_pImpl;
-    // Window overridables
-    void            Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& _rRect) override;
-    void            implInit(vcl::RenderContext& rRenderContext);
-
 public:
     ORoadmap( vcl::Window* _pParent, WinBits _nWinStyle );
     virtual ~ORoadmap( ) override;
@@ -83,14 +77,12 @@ public:
     virtual void    GetFocus() override;
     virtual void    ApplySettings( vcl::RenderContext& rRenderContext ) override;
 
-protected:
+private:
     bool            PreNotify( NotifyEvent& rNEvt ) override;
 
-protected:
     /// called when an item has been selected by any means
-    void    Select();
+    void            Select();
 
-private:
     DECL_LINK(ImplClickHdl, HyperLabel*, void);
 
     RoadmapItem*         GetByIndex( ItemIndex _nItemIndex );
@@ -107,6 +99,12 @@ private:
     RoadmapItem*         GetByPointer(vcl::Window const * pWindow);
     RoadmapItem*         InsertHyperLabel( ItemIndex Index, const OUString& _aStr, ItemId RMID, bool _bEnabled, bool _bIncomplete  );
     void                 UpdatefollowingHyperLabels( ItemIndex Index );
+
+    // Window overridables
+    void            Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& _rRect) override;
+    void            implInit(vcl::RenderContext& rRenderContext);
+
+    std::unique_ptr<RoadmapImpl>    m_pImpl;
 };
 
 }   // namespace svt
diff --git a/svtools/inc/vclxaccessibleheaderbaritem.hxx b/svtools/inc/vclxaccessibleheaderbaritem.hxx
index 03701de59c8e..3e6ef4823dab 100644
--- a/svtools/inc/vclxaccessibleheaderbaritem.hxx
+++ b/svtools/inc/vclxaccessibleheaderbaritem.hxx
@@ -47,15 +47,13 @@ typedef ::cppu::ImplHelper2<
     css::accessibility::XAccessible,
     css::lang::XServiceInfo > VCLXAccessibleHeaderBarItem_BASE;
 
-class VCLXAccessibleHeaderBarItem : public comphelper::OAccessibleExtendedComponentHelper,
+class VCLXAccessibleHeaderBarItem final : public comphelper::OAccessibleExtendedComponentHelper,
                                     public VCLXAccessibleHeaderBarItem_BASE
 {
 private:
     VclPtr<HeaderBar>        m_pHeadBar;
     sal_Int32                m_nIndexInParent;
 
-protected:
-
     void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
     // OCommonAccessibleComponent
diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx
index ed22a03a884d..7e9a110ff9c9 100644
--- a/svtools/source/inc/unoiface.hxx
+++ b/svtools/source/inc/unoiface.hxx
@@ -112,9 +112,8 @@ public:
 
 //  class VCLXFileControl
 
-class VCLXFileControl : public css::awt::XTextComponent, public css::awt::XTextLayoutConstrains, public VCLXWindow
+class VCLXFileControl final : public css::awt::XTextComponent, public css::awt::XTextLayoutConstrains, public VCLXWindow
 {
-protected:
     DECL_LINK(ModifyHdl, Edit&, void);
     void ModifyHdl();
     TextListenerMultiplexer maTextListeners;
@@ -233,20 +232,8 @@ typedef ::cppu::ImplInheritanceHelper  <   VCLXGraphicControl
                                         ,   css::beans::XPropertyChangeListener
                                         ,   css::awt::XItemEventBroadcaster
                                         >   SVTXRoadmap_Base;
-class SVTXRoadmap : public SVTXRoadmap_Base
-
-
+class SVTXRoadmap final : public SVTXRoadmap_Base
 {
-private:
-    ItemListenerMultiplexer     maItemListeners;
-
-    static RMItemData GetRMItemData( const css::container::ContainerEvent& _rEvent );
-
-protected:
-    virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
-
-    virtual ~SVTXRoadmap() override;
-
 public:
     SVTXRoadmap();
 
@@ -269,13 +256,21 @@ public:
     // XPropertyChangeListener
     virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override;
 
-protected:
+private:
 
     // VCLXGraphicControl overridables
     virtual void    ImplSetNewImage() override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+
+    static RMItemData GetRMItemData( const css::container::ContainerEvent& _rEvent );
+
+    virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
+
+    virtual ~SVTXRoadmap() override;
+
+    ItemListenerMultiplexer     maItemListeners;
 };
 
 
@@ -364,7 +359,7 @@ public:
 
 //  class VCLXProgressBar
 
-class VCLXProgressBar : public css::awt::XProgressBar,
+class VCLXProgressBar final : public css::awt::XProgressBar,
                         public VCLXWindow
 {
 private:
@@ -372,7 +367,6 @@ private:
     sal_Int32   m_nValueMin;
     sal_Int32   m_nValueMax;
 
-protected:
     void            ImplUpdateValue();
 
 public:
diff --git a/svtools/source/table/tablegeometry.hxx b/svtools/source/table/tablegeometry.hxx
index f4ac0ca0e6a6..8ba81c03d644 100644
--- a/svtools/source/table/tablegeometry.hxx
+++ b/svtools/source/table/tablegeometry.hxx
@@ -64,12 +64,8 @@ namespace svt { namespace table
 
     //= TableRowGeometry
 
-    class TableRowGeometry : public TableGeometry
+    class TableRowGeometry final : public TableGeometry
     {
-    protected:
-        RowPos  m_nRowPos;
-        bool    m_bAllowVirtualRows;
-
     public:
         TableRowGeometry(
             TableControl_Impl const & _rControl,
@@ -87,16 +83,16 @@ namespace svt { namespace table
     private:
         void    impl_initRect();
         bool    impl_isValidRow( RowPos const i_row ) const;
+
+        RowPos  m_nRowPos;
+        bool    m_bAllowVirtualRows;
     };
 
 
     //= TableColumnGeometry
 
-    class TableColumnGeometry : public TableGeometry
+    class TableColumnGeometry final : public TableGeometry
     {
-    protected:
-        ColPos  m_nColPos;
-
     public:
         TableColumnGeometry(
             TableControl_Impl const & _rControl,
@@ -112,6 +108,8 @@ namespace svt { namespace table
     private:
         void    impl_initRect();
         bool    impl_isValidColumn( ColPos const i_column ) const;
+
+        ColPos  m_nColPos;
     };
 
 
diff --git a/svtools/source/uno/svtxgridcontrol.hxx b/svtools/source/uno/svtxgridcontrol.hxx
index a8e074d1074d..471d3753add3 100644
--- a/svtools/source/uno/svtxgridcontrol.hxx
+++ b/svtools/source/uno/svtxgridcontrol.hxx
@@ -48,17 +48,8 @@ typedef ::cppu::ImplInheritanceHelper  <   VCLXWindow
                                         ,   css::awt::grid::XGridDataListener
                                         ,   css::container::XContainerListener
                                         >   SVTXGridControl_Base;
-class SVTXGridControl : public SVTXGridControl_Base
+class SVTXGridControl final : public SVTXGridControl_Base
 {
-private:
-    std::shared_ptr< ::svt::table::UnoControlTableModel >   m_xTableModel;
-    bool                                                        m_bTableModelInitCompleted;
-    SelectionListenerMultiplexer                                m_aSelectionListeners;
-
-protected:
-    virtual void    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
-    void            ImplCallItemListeners();
-
 public:
     SVTXGridControl();
     virtual ~SVTXGridControl() override;
@@ -104,16 +95,22 @@ public:
     // XWindow
     void SAL_CALL setEnable( sal_Bool bEnable ) override;
 
-protected:
+private:
     // VCLXWindow
     virtual void    SetWindow( const VclPtr< vcl::Window > &pWindow ) override;
 
-private:
     void    impl_updateColumnsFromModel_nothrow();
     void    impl_checkTableModelInit();
 
     void    impl_checkColumnIndex_throw( ::svt::table::TableControl const & i_table, sal_Int32 const i_columnIndex ) const;
     void    impl_checkRowIndex_throw( ::svt::table::TableControl const & i_table, sal_Int32 const i_rowIndex ) const;
+
+    virtual void    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
+    void            ImplCallItemListeners();
+
+    std::shared_ptr< ::svt::table::UnoControlTableModel >   m_xTableModel;
+    bool                                                    m_bTableModelInitCompleted;
+    SelectionListenerMultiplexer                            m_aSelectionListeners;
 };
 #endif // INCLUDED_SVTOOLS_SOURCE_UNO_SVTXGRIDCONTROL_HXX