loplugin:finalclasses in framework

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

11 files changed, 22 insertions, 45 deletions

diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index 2255391c23a9..f5a561660df8 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -60,7 +60,7 @@ typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
 
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
-class PopupMenuDispatcher :     public  ::cppu::WeakImplHelper<
+class PopupMenuDispatcher final : public  ::cppu::WeakImplHelper<
                                            css::lang::XServiceInfo,
                                            css::frame::XDispatchProvider,
                                            css::frame::XDispatch,
@@ -109,15 +109,11 @@ class PopupMenuDispatcher :     public  ::cppu::WeakImplHelper<
         //   XEventListener
         void SAL_CALL disposing( const css::lang::EventObject& aEvent ) override;
 
-    //  protected methods
-    protected:
+    private:
         virtual ~PopupMenuDispatcher() override;
 
         void impl_RetrievePopupControllerQuery();
 
-
-    //  variables
-    private:
         css::uno::WeakReference< css::frame::XFrame >           m_xWeakFrame;   /// css::uno::WeakReference to frame (Don't use a hard css::uno::Reference. Owner can't delete us then!)
         css::uno::Reference< css::container::XNameAccess >      m_xPopupCtrlQuery;   /// reference to query for popup controller
         css::uno::Reference< css::uri::XUriReferenceFactory >   m_xUriRefFactory;   /// reference to the uri reference factory
diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx
index d0e801270fdb..3f30a2ef2b75 100644
--- a/framework/inc/helper/ocomponentenumeration.hxx
+++ b/framework/inc/helper/ocomponentenumeration.hxx
@@ -48,7 +48,7 @@ namespace framework{
     @threadsafe     yes
 *//*-*************************************************************************************************************/
 
-class OComponentEnumeration :   public ::cppu::WeakImplHelper< css::container::XEnumeration,css::lang::XEventListener >
+class OComponentEnumeration final : public ::cppu::WeakImplHelper< css::container::XEnumeration,css::lang::XEventListener >
 {
 
     //  public methods
@@ -112,7 +112,7 @@ class OComponentEnumeration :   public ::cppu::WeakImplHelper< css::container::X
 
     //  protected methods
 
-    protected:
+    private:
 
         /*-****************************************************************************************************
             @short      standard destructor
@@ -138,8 +138,6 @@ class OComponentEnumeration :   public ::cppu::WeakImplHelper< css::container::X
         void impl_resetObject();
 
 
-    private:
-
     //  debug methods
     //  (should be private everyway!)
 
@@ -155,8 +153,6 @@ class OComponentEnumeration :   public ::cppu::WeakImplHelper< css::container::X
                         sal_True  otherway
         *//*-*****************************************************************************************************/
 
-    private:
-
         sal_uInt32                                                       m_nPosition;   /// current position in enumeration
         std::vector< css::uno::Reference< css::lang::XComponent > >      m_seqComponents;   /// list of current components
 
diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx
index a018f00a5fa5..091b757b7e22 100644
--- a/framework/inc/helper/oframes.hxx
+++ b/framework/inc/helper/oframes.hxx
@@ -44,7 +44,7 @@ namespace framework{
     @ATTENTION      Don't use this class as direct member - use it dynamically. Do not derive from this class.
                     We hold a weakreference to our owner not to our superclass.
 */
-class OFrames   :   public ::cppu::WeakImplHelper< css::frame::XFrames >
+class OFrames final : public ::cppu::WeakImplHelper< css::frame::XFrames >
 {
     public:
 
@@ -146,7 +146,7 @@ class OFrames   :   public ::cppu::WeakImplHelper< css::frame::XFrames >
         */
         virtual sal_Bool SAL_CALL hasElements() override;
 
-    protected:
+    private:
 
         /**
             @short      standard destructor
@@ -168,8 +168,6 @@ class OFrames   :   public ::cppu::WeakImplHelper< css::frame::XFrames >
         */
         void impl_resetObject();
 
-    private:
-
         /**
             @short      append one sequence to another
             @descr      There is no operation to add to sequences! Use this helper-method to do this.
@@ -183,13 +181,11 @@ class OFrames   :   public ::cppu::WeakImplHelper< css::frame::XFrames >
         void impl_appendSequence(           css::uno::Sequence< css::uno::Reference< css::frame::XFrame > >&    seqDestination  ,
                                      const  css::uno::Sequence< css::uno::Reference< css::frame::XFrame > >&    seqSource       );
 
-    private:
         static bool impldbg_checkParameter_queryFrames  (           sal_Int32                                               nSearchFlags    );
 
         css::uno::WeakReference< css::frame::XFrame >               m_xOwner;   /// reference to owner of this instance (Hold no hard reference!)
         FrameContainer*                                             m_pFrameContainer;   /// with owner shared list to hold all direct children of an XFramesSupplier
         bool                                                        m_bRecursiveSearchProtection;   /// flag to protect against recursive searches of frames at parents
-
 };
 
 }
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index d5fb6425adfa..8ef46a21de72 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -68,7 +68,7 @@ namespace framework
                                     ,   css::awt::XWindowListener
                                     >   LayoutManager_Base;
     typedef ::comphelper::OPropertyContainer    LayoutManager_PBase;
-    class LayoutManager : public  LayoutManager_Base                    ,
+    class LayoutManager final : public  LayoutManager_Base                    ,
                           private cppu::BaseMutex,
                           public  ::cppu::OBroadcastHelper              ,
                           public  LayoutManager_PBase
@@ -168,12 +168,8 @@ namespace framework
                     GlobalSettings* &rGlobalSettings, bool &bInGlobalSettings,
                     const css::uno::Reference< css::uno::XComponentContext > &rComponentContext );
 
-        protected:
-            DECL_LINK(AsyncLayoutHdl, Timer *, void);
-
         private:
-
-            //  helper
+            DECL_LINK(AsyncLayoutHdl, Timer *, void);
 
             //  menu bar
 
diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx
index 481106b42332..8589de71dbfb 100644
--- a/framework/inc/tabwin/tabwindow.hxx
+++ b/framework/inc/tabwin/tabwindow.hxx
@@ -47,7 +47,7 @@
 namespace framework
 {
 
-class TabWindow :  public css::lang::XTypeProvider             ,
+class TabWindow final : public css::lang::XTypeProvider             ,
                    public css::lang::XServiceInfo              ,
                    public css::lang::XInitialization           ,
                    public css::lang::XComponent                ,
@@ -107,12 +107,10 @@ class TabWindow :  public css::lang::XTypeProvider             ,
         virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) override;
         virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) override;
 
-    protected:
+    private:
         DECL_LINK( Activate, TabControl*, void );
         DECL_LINK( Deactivate, TabControl*, bool );
 
-    private:
-
         //  OPropertySetHelper
 
         virtual sal_Bool                                            SAL_CALL convertFastPropertyValue( css::uno::Any&        aConvertedValue ,
@@ -128,7 +126,6 @@ class TabWindow :  public css::lang::XTypeProvider             ,
 
         static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor();
 
-    private:
         enum Notification
         {
             NOTIFY_INSERTED,
diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx
index cd3f61e45d3d..8842ad608c79 100644
--- a/framework/inc/uielement/addonstoolbarmanager.hxx
+++ b/framework/inc/uielement/addonstoolbarmanager.hxx
@@ -36,7 +36,7 @@ class ToolBox;
 namespace framework
 {
 
-class AddonsToolBarManager : public ToolBarManager
+class AddonsToolBarManager final : public ToolBarManager
 {
     public:
         AddonsToolBarManager( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
@@ -52,7 +52,7 @@ class AddonsToolBarManager : public ToolBarManager
         using ToolBarManager::FillToolbar;
         void FillToolbar( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rAddonToolbar );
 
-    protected:
+    private:
         DECL_LINK(Click, ToolBox *, void);
         DECL_LINK(DoubleClick, ToolBox *, void);
         DECL_LINK(Select, ToolBox *, void);
diff --git a/framework/inc/uielement/genericstatusbarcontroller.hxx b/framework/inc/uielement/genericstatusbarcontroller.hxx
index 87c71a24a624..95521d2a29e2 100644
--- a/framework/inc/uielement/genericstatusbarcontroller.hxx
+++ b/framework/inc/uielement/genericstatusbarcontroller.hxx
@@ -28,7 +28,7 @@ namespace framework
 
 struct AddonStatusbarItemData;
 
-class GenericStatusbarController : public svt::StatusbarController
+class GenericStatusbarController final : public svt::StatusbarController
 {
     public:
         GenericStatusbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
@@ -46,7 +46,7 @@ class GenericStatusbarController : public svt::StatusbarController
                                      const css::awt::Rectangle& rOutputRectangle,
                                      ::sal_Int32 nStyle ) override;
 
-    protected:
+    private:
         bool                                              m_bEnabled;
         bool                                              m_bOwnerDraw;
         AddonStatusbarItemData*                           m_pItemData;
diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx
index c2711f1efc8c..13e32d48f250 100644
--- a/framework/inc/uielement/generictoolbarcontroller.hxx
+++ b/framework/inc/uielement/generictoolbarcontroller.hxx
@@ -31,7 +31,7 @@ class ToolBox;
 namespace framework
 {
 
-class GenericToolbarController : public svt::ToolboxController
+class GenericToolbarController final : public svt::ToolboxController
 {
     public:
         GenericToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
@@ -59,7 +59,7 @@ class GenericToolbarController : public svt::ToolboxController
             css::uno::Sequence< css::beans::PropertyValue >  aArgs;
         };
 
-    protected:
+    private:
         VclPtr<ToolBox>     m_pToolbar;
         sal_uInt16          m_nID;
         bool                m_bEnumCommand : 1,
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index 68d445ff7881..ba77df9457ab 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -65,7 +65,7 @@ struct PopupControllerEntry
 
 typedef std::unordered_map< OUString, PopupControllerEntry > PopupControllerCache;
 
-class MenuBarManager:
+class MenuBarManager final :
     protected cppu::BaseMutex,
     public cppu::WeakComponentImplHelper<
         css::frame::XStatusListener,
@@ -73,7 +73,6 @@ class MenuBarManager:
         css::ui::XUIConfigurationListener,
         css::awt::XSystemDependentMenuPeer>
 {
-    protected:
         MenuBarManager(
             const css::uno::Reference< css::uno::XComponentContext >& xContext,
             const css::uno::Reference< css::frame::XFrame >& rFrame,
@@ -134,7 +133,7 @@ class MenuBarManager:
         void SetItemContainer( const css::uno::Reference< css::container::XIndexAccess >& rItemContainer );
         void GetPopupController( PopupControllerCache& rPopupController );
 
-    protected:
+    private:
         DECL_LINK( Activate, Menu *, bool );
         DECL_LINK( Deactivate, Menu *, bool );
         DECL_LINK( AsyncSettingsHdl, Timer *, void );
@@ -146,8 +145,6 @@ class MenuBarManager:
         static bool MustBeHidden( PopupMenu* pPopupMenu, const css::uno::Reference< css::util::XURLTransformer >& rTransformer );
         OUString RetrieveLabelFromCommand(const OUString& rCmdURL);
 
-    private:
-
         void Destroy();
 
         struct MenuItemHandler
diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx
index ce077301abef..b72591c2321c 100644
--- a/framework/inc/uielement/rootitemcontainer.hxx
+++ b/framework/inc/uielement/rootitemcontainer.hxx
@@ -46,7 +46,7 @@ typedef ::cppu::WeakImplHelper<
             css::lang::XSingleComponentFactory,
             css::lang::XUnoTunnel > RootItemContainer_BASE;
 
-class RootItemContainer :   private cppu::BaseMutex,
+class RootItemContainer final : private cppu::BaseMutex,
                             public ::cppu::OBroadcastHelper                         ,
                             public ::cppu::OPropertySetHelper                       ,
                             public RootItemContainer_BASE
@@ -98,7 +98,7 @@ class RootItemContainer :   private cppu::BaseMutex,
         virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( const css::uno::Reference< css::uno::XComponentContext >& Context ) override;
         virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const css::uno::Sequence< css::uno::Any >& Arguments, const css::uno::Reference< css::uno::XComponentContext >& Context ) override;
 
-    protected:
+    private:
         //  OPropertySetHelper
         virtual sal_Bool                                            SAL_CALL convertFastPropertyValue        ( css::uno::Any&        aConvertedValue ,
                                                                                                                css::uno::Any&        aOldValue       ,
@@ -114,7 +114,6 @@ class RootItemContainer :   private cppu::BaseMutex,
 
         static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor();
 
-    private:
         RootItemContainer& operator=( const RootItemContainer& ) = delete;
         RootItemContainer( const RootItemContainer& ) = delete;
 
diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx
index c7a5041af7e2..68fce7d4834c 100644
--- a/framework/inc/xml/saxnamespacefilter.hxx
+++ b/framework/inc/xml/saxnamespacefilter.hxx
@@ -32,7 +32,7 @@
 namespace framework
 {
 
-class FWE_DLLPUBLIC SaxNamespaceFilter :
+class FWE_DLLPUBLIC SaxNamespaceFilter final :
                            public ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler >
 {
     public:
@@ -60,7 +60,7 @@ class FWE_DLLPUBLIC SaxNamespaceFilter :
         virtual void SAL_CALL setDocumentLocator(
             const css::uno::Reference< css::xml::sax::XLocator > &xLocator) override;
 
-    protected:
+    private:
         typedef ::std::stack< XMLNamespaces > NamespaceStack;
 
         OUString getErrorLineString();