loplugin:finalclasses in framework

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

72 files changed, 92 insertions, 113 deletions

diff --git a/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx
index 8bce32fa5e24..ad01f41111e1 100644
--- a/framework/inc/classes/actiontriggercontainer.hxx
+++ b/framework/inc/classes/actiontriggercontainer.hxx
@@ -32,7 +32,7 @@
 namespace framework
 {
 
-class ActionTriggerContainer :    public PropertySetContainer,
+class ActionTriggerContainer final : public PropertySetContainer,
                                 public css::lang::XMultiServiceFactory,
                                 public css::lang::XServiceInfo,
                                 public css::lang::XTypeProvider
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx
index f1f730fd799c..8dd37f068309 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -36,7 +36,7 @@
 namespace framework
 {
 
-class ActionTriggerPropertySet :  private cppu::BaseMutex,
+class ActionTriggerPropertySet final : private cppu::BaseMutex,
                                     public css::lang::XServiceInfo ,
                                     public css::lang::XTypeProvider,
                                     public ::cppu::OBroadcastHelper             ,
diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
index 8ef20621311a..ed213b8fa92f 100644
--- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
@@ -33,7 +33,7 @@
 namespace framework
 {
 
-class ActionTriggerSeparatorPropertySet :   private cppu::BaseMutex,
+class ActionTriggerSeparatorPropertySet final : private cppu::BaseMutex,
                                             public css::lang::XServiceInfo ,
                                             public css::lang::XTypeProvider,
                                             public ::cppu::OBroadcastHelper             ,
diff --git a/framework/inc/classes/imagewrapper.hxx b/framework/inc/classes/imagewrapper.hxx
index 90800837f976..9818552cb4e3 100644
--- a/framework/inc/classes/imagewrapper.hxx
+++ b/framework/inc/classes/imagewrapper.hxx
@@ -29,7 +29,7 @@
 namespace framework
 {
 
-class ImageWrapper : public ::cppu::WeakImplHelper< css::awt::XBitmap,
+class ImageWrapper final : public ::cppu::WeakImplHelper< css::awt::XBitmap,
                                                     css::lang::XUnoTunnel >
 {
     public:
diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx
index 94cf8b4c1d90..42f8766a1797 100644
--- a/framework/inc/classes/rootactiontriggercontainer.hxx
+++ b/framework/inc/classes/rootactiontriggercontainer.hxx
@@ -34,7 +34,7 @@
 namespace framework
 {
 
-class RootActionTriggerContainer :  public PropertySetContainer,
+class RootActionTriggerContainer final : public PropertySetContainer,
                                     public css::lang::XMultiServiceFactory,
                                     public css::lang::XServiceInfo,
                                     public css::lang::XUnoTunnel,
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx
index 63732507126c..cb48569b5438 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -48,7 +48,7 @@ namespace framework{
                     or some other menu entries. Or we terminate the whole application in case this backing mode should not
                     be used.
  */
-class CloseDispatcher : public  ::cppu::WeakImplHelper<
+class CloseDispatcher final : public  ::cppu::WeakImplHelper<
                                     css::frame::XNotifyingDispatch,             // => XDispatch
                                     css::frame::XDispatchInformationProvider >
 {
diff --git a/framework/inc/dispatch/dispatchinformationprovider.hxx b/framework/inc/dispatch/dispatchinformationprovider.hxx
index 12504abb2b6e..9b2106083b75 100644
--- a/framework/inc/dispatch/dispatchinformationprovider.hxx
+++ b/framework/inc/dispatch/dispatchinformationprovider.hxx
@@ -32,7 +32,7 @@ namespace framework{
 /*-************************************************************************************************************
     @short          a helper to merge dispatch information of different sources together.
 *//*-*************************************************************************************************************/
-class DispatchInformationProvider : public  ::cppu::WeakImplHelper< css::frame::XDispatchInformationProvider >
+class DispatchInformationProvider final : public  ::cppu::WeakImplHelper< css::frame::XDispatchInformationProvider >
 {
 
     // member
diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx
index fa719abfaff4..d94b53c45340 100644
--- a/framework/inc/dispatch/dispatchprovider.hxx
+++ b/framework/inc/dispatch/dispatchprovider.hxx
@@ -65,7 +65,7 @@ enum EDispatchHelper
     @devstatus      ready to use
     @threadsafe     yes
 */
-class DispatchProvider: public ::cppu::WeakImplHelper< css::frame::XDispatchProvider >
+class DispatchProvider final : public ::cppu::WeakImplHelper< css::frame::XDispatchProvider >
 {
     /* member */
     private:
@@ -88,11 +88,10 @@ class DispatchProvider: public ::cppu::WeakImplHelper< css::frame::XDispatchProv
         virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions    ) override;
 
     /* helper */
-    protected:
+    private:
         // Let him protected! So nobody can use us as base ...
         virtual ~DispatchProvider() override;
 
-    private:
         css::uno::Reference< css::frame::XDispatch > implts_getOrCreateDispatchHelper   (       EDispatchHelper                            eHelper                       ,
                                                                                           const css::uno::Reference< css::frame::XFrame >& xOwner                        ,
                                                                                           const OUString&                           sTarget = OUString()   ,
diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx
index 2409c3eefbec..73146ea92bf7 100644
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
@@ -43,7 +43,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 InterceptionHelper : public  ::cppu::WeakImplHelper<
+class InterceptionHelper final : public  ::cppu::WeakImplHelper<
                                      css::frame::XDispatchProvider,
                                      css::frame::XDispatchProviderInterception,
                                      css::lang::XEventListener >
@@ -153,7 +153,7 @@ class InterceptionHelper : public  ::cppu::WeakImplHelper<
         InterceptionHelper(const css::uno::Reference< css::frame::XFrame >&            xOwner,
                            const css::uno::Reference< css::frame::XDispatchProvider >& xSlave);
 
-    protected:
+    private:
 
         /** @short standard destructor.
 
diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx
index 18f505ec8edf..a830822cde81 100644
--- a/framework/inc/dispatch/mailtodispatcher.hxx
+++ b/framework/inc/dispatch/mailtodispatcher.hxx
@@ -43,7 +43,7 @@ namespace framework{
 
     @devstatus      ready to use
 */
-class MailToDispatcher : public  ::cppu::WeakImplHelper<
+class MailToDispatcher final : public  ::cppu::WeakImplHelper<
                                      css::lang::XServiceInfo,
                                      css::frame::XDispatchProvider,
                                      css::frame::XNotifyingDispatch> // => XDispatch
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx
index 63de4f7ab4ae..73b83d3f8dd4 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -44,7 +44,7 @@ namespace framework{
     @devstatus      ready
     @threadsafe     yes
 *//*-*************************************************************************************************************/
-class Oxt_Handler  :    public  ::cppu::WeakImplHelper<
+class Oxt_Handler final  :  public  ::cppu::WeakImplHelper<
                                     css::lang::XServiceInfo,
                                     css::frame::XNotifyingDispatch, // => XDispatch
                                     css::document::XExtendedFilterDetection >
diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx
index d73f5f1cf472..41d3343daae4 100644
--- a/framework/inc/dispatch/servicehandler.hxx
+++ b/framework/inc/dispatch/servicehandler.hxx
@@ -47,7 +47,7 @@ namespace framework{
 
     @devstatus      ready to use
 */
-class ServiceHandler : public  ::cppu::WeakImplHelper<
+class ServiceHandler final : public  ::cppu::WeakImplHelper<
                                    css::lang::XServiceInfo       ,
                                    css::frame::XDispatchProvider ,
                                    css::frame::XNotifyingDispatch > // => XDispatch
diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx
index 440c8f069a0a..3d3f53918bb5 100644
--- a/framework/inc/dispatch/startmoduledispatcher.hxx
+++ b/framework/inc/dispatch/startmoduledispatcher.hxx
@@ -34,7 +34,7 @@ namespace framework{
 /**
     @short          helper to handle all URLs related to the StartModule
  */
-class StartModuleDispatcher : public  ::cppu::WeakImplHelper<
+class StartModuleDispatcher final : public  ::cppu::WeakImplHelper<
                                          css::frame::XNotifyingDispatch,             // => XDispatch
                                          css::frame::XDispatchInformationProvider >
 {
diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx
index 7c9e10418440..e1be82672f05 100644
--- a/framework/inc/dispatch/systemexec.hxx
+++ b/framework/inc/dispatch/systemexec.hxx
@@ -45,7 +45,7 @@ namespace framework{
 
     @devstatus      ready to use
 */
-class SystemExec :     public  ::cppu::WeakImplHelper<
+class SystemExec final :  public  ::cppu::WeakImplHelper<
                                    css::lang::XServiceInfo       ,
                                    css::frame::XDispatchProvider ,
                                    css::frame::XNotifyingDispatch > // => XDispatch
diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx b/framework/inc/helper/dockingareadefaultacceptor.hxx
index 281c9811499a..16423fb6e838 100644
--- a/framework/inc/helper/dockingareadefaultacceptor.hxx
+++ b/framework/inc/helper/dockingareadefaultacceptor.hxx
@@ -28,7 +28,7 @@
 
 namespace framework{
 
-class DockingAreaDefaultAcceptor    :   public ::cppu::WeakImplHelper< css::ui::XDockingAreaAcceptor >
+class DockingAreaDefaultAcceptor final : public ::cppu::WeakImplHelper< css::ui::XDockingAreaAcceptor >
 {
     public:
 
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index 4d7b3a5a3bee..00f8689487e6 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -136,7 +136,7 @@ FWI_DLLPUBLIC void FillLangItems( std::set< OUString > &rLangItems,
 //OriginalListener owns the Broadcaster which "owns" the WeakContainerListener
 //which forwards the events to the OriginalListener without taking ownership of
 //it.
-class WeakContainerListener : public ::cppu::WeakImplHelper<css::container::XContainerListener>
+class WeakContainerListener final : public ::cppu::WeakImplHelper<css::container::XContainerListener>
 {
     private:
         css::uno::WeakReference<css::container::XContainerListener> mxOwner;
@@ -183,7 +183,7 @@ class WeakContainerListener : public ::cppu::WeakImplHelper<css::container::XCon
         }
 };
 
-class WeakChangesListener : public ::cppu::WeakImplHelper<css::util::XChangesListener>
+class WeakChangesListener final : public ::cppu::WeakImplHelper<css::util::XChangesListener>
 {
     private:
         css::uno::WeakReference<css::util::XChangesListener> mxOwner;
@@ -214,7 +214,7 @@ class WeakChangesListener : public ::cppu::WeakImplHelper<css::util::XChangesLis
         }
 };
 
-class WeakDocumentEventListener : public ::cppu::WeakImplHelper<css::document::XDocumentEventListener>
+class WeakDocumentEventListener final : public ::cppu::WeakImplHelper<css::document::XDocumentEventListener>
 {
     private:
         css::uno::WeakReference<css::document::XDocumentEventListener> mxOwner;
diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx
index 0ab674a33156..ed11756c08ef 100644
--- a/framework/inc/helper/ocomponentaccess.hxx
+++ b/framework/inc/helper/ocomponentaccess.hxx
@@ -49,7 +49,7 @@ namespace framework{
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class OComponentAccess  :   public ::cppu::WeakImplHelper< css::container::XEnumerationAccess >
+class OComponentAccess final : public ::cppu::WeakImplHelper< css::container::XEnumerationAccess >
 {
 
     //  public methods
@@ -110,7 +110,7 @@ class OComponentAccess  :   public ::cppu::WeakImplHelper< css::container::XEnum
 
     //  protected methods
 
-    protected:
+    private:
 
         /*-****************************************************************************************************
             @short      standard destructor
@@ -125,8 +125,6 @@ class OComponentAccess  :   public ::cppu::WeakImplHelper< css::container::XEnum
         virtual ~OComponentAccess() override;
 
 
-    private:
-
         /*-****************************************************************************************************
             @short      recursive method (!) to collect all components of all frames from the subtree of given node
             @descr      This is necessary to create the enumeration.
diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx
index ce6f0ed434ba..f467ef9a2286 100644
--- a/framework/inc/helper/persistentwindowstate.hxx
+++ b/framework/inc/helper/persistentwindowstate.hxx
@@ -46,7 +46,7 @@ namespace framework{
     @devstatus      ready
     @threadsafe     yes
 *//*-*************************************************************************************************************/
-class PersistentWindowState :   public  ::cppu::WeakImplHelper<
+class PersistentWindowState final : public  ::cppu::WeakImplHelper<
                                            css::lang::XInitialization,
                                            css::frame::XFrameActionListener > // => XEventListener
 {
diff --git a/framework/inc/helper/statusindicator.hxx b/framework/inc/helper/statusindicator.hxx
index a97cfe952062..66d5b1e7535a 100644
--- a/framework/inc/helper/statusindicator.hxx
+++ b/framework/inc/helper/statusindicator.hxx
@@ -48,7 +48,7 @@ namespace framework{
     @devstatus      ready to use
     @threadsafe     yes
 */
-class StatusIndicator : public  ::cppu::WeakImplHelper< css::task::XStatusIndicator >
+class StatusIndicator final : public  ::cppu::WeakImplHelper< css::task::XStatusIndicator >
 {
 
     // member
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx
index 467c1ccd84bf..8472aaec20c2 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -116,7 +116,7 @@ typedef ::std::vector< IndicatorInfo > IndicatorStack;
     @devstatus      ready to use
     @threadsafe     yes
  */
-class StatusIndicatorFactory : public  ::cppu::WeakImplHelper<
+class StatusIndicatorFactory final : public  ::cppu::WeakImplHelper<
                                              css::lang::XServiceInfo
                                            , css::lang::XInitialization
                                            , css::task::XStatusIndicatorFactory
@@ -214,12 +214,11 @@ class StatusIndicatorFactory : public  ::cppu::WeakImplHelper<
 
     // specials
 
-    protected:
+    private:
 
         virtual ~StatusIndicatorFactory() override;
 
     // helper
-    private:
 
         /** @short  show the parent window of this progress ...
                     if it's allowed to do so.
diff --git a/framework/inc/helper/tagwindowasmodified.hxx b/framework/inc/helper/tagwindowasmodified.hxx
index ef749f030cfc..f466803a0a20 100644
--- a/framework/inc/helper/tagwindowasmodified.hxx
+++ b/framework/inc/helper/tagwindowasmodified.hxx
@@ -41,7 +41,7 @@ namespace framework{
     @devstatus      draft
     @threadsafe     yes
 *//*-*************************************************************************************************************/
-class TagWindowAsModified :   public  ::cppu::WeakImplHelper<
+class TagWindowAsModified final : public  ::cppu::WeakImplHelper<
                                           css::lang::XInitialization,
                                           css::frame::XFrameActionListener, // => XEventListener
                                           css::util::XModifyListener >       // => XEventListener
diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx
index 88030f9cee88..c06d23976ed4 100644
--- a/framework/inc/helper/titlebarupdate.hxx
+++ b/framework/inc/helper/titlebarupdate.hxx
@@ -36,7 +36,7 @@ namespace framework{
     @devstatus      draft
     @threadsafe     yes
 *//*-*************************************************************************************************************/
-class TitleBarUpdate : public  ::cppu::WeakImplHelper<
+class TitleBarUpdate final : public  ::cppu::WeakImplHelper<
                                    css::lang::XInitialization
                                  , css::frame::XTitleChangeListener // => XEventListener
                                  , css::frame::XFrameActionListener > // => XEventListener
diff --git a/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx
index f3ea3d9c4944..ba0a84a0e2f4 100644
--- a/framework/inc/helper/vclstatusindicator.hxx
+++ b/framework/inc/helper/vclstatusindicator.hxx
@@ -30,7 +30,7 @@ namespace framework {
 
 // declaration
 
-class VCLStatusIndicator : public  ::cppu::WeakImplHelper< css::task::XStatusIndicator >
+class VCLStatusIndicator final : public  ::cppu::WeakImplHelper< css::task::XStatusIndicator >
 {
 
     // member
diff --git a/framework/inc/helper/wakeupthread.hxx b/framework/inc/helper/wakeupthread.hxx
index 6632d4b049f3..97c462c84e28 100644
--- a/framework/inc/helper/wakeupthread.hxx
+++ b/framework/inc/helper/wakeupthread.hxx
@@ -34,7 +34,7 @@ namespace com { namespace sun { namespace star { namespace util {
 
 namespace framework{
 
-class WakeUpThread: public salhelper::Thread {
+class WakeUpThread final : public salhelper::Thread {
     css::uno::WeakReference<css::util::XUpdatable> updatable_;
     osl::Condition condition_;
 
diff --git a/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx
index c6e6cc9cf403..008eab055726 100644
--- a/framework/inc/interaction/quietinteraction.hxx
+++ b/framework/inc/interaction/quietinteraction.hxx
@@ -38,7 +38,7 @@ namespace framework{
                     - InteractiveAugmentedIOException
                 All other requests will be aborted.
  */
-class QuietInteraction : public  ::cppu::WeakImplHelper<
+class QuietInteraction final : public  ::cppu::WeakImplHelper<
                                     css::task::XInteractionHandler >
 {
     // member
diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx
index 6dac6f9f344b..723526f92ec0 100644
--- a/framework/inc/jobs/helponstartup.hxx
+++ b/framework/inc/jobs/helponstartup.hxx
@@ -36,7 +36,7 @@ namespace framework{
             feature to show a suitable help page for every (visible!)
             loaded document.
  */
-class HelpOnStartup : public ::cppu::WeakImplHelper< css::lang::XServiceInfo,css::lang::XEventListener,css::task::XJob >
+class HelpOnStartup final : public ::cppu::WeakImplHelper< css::lang::XServiceInfo,css::lang::XEventListener,css::task::XJob >
 {
 
     // member
diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx
index f5f2ea96fe1c..a4e2e472c884 100644
--- a/framework/inc/jobs/job.hxx
+++ b/framework/inc/jobs/job.hxx
@@ -40,7 +40,7 @@ namespace framework{
             synchronously or asynchronous, control its lifetime
             and differe between jobs with and without configuration.
  */
-class Job : public  ::cppu::WeakImplHelper<
+class Job final : public  ::cppu::WeakImplHelper<
                         css::task::XJobListener
                       , css::frame::XTerminateListener
                       , css::util::XCloseListener >
diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx
index 1c2aaec0c656..387e3d142702 100644
--- a/framework/inc/jobs/shelljob.hxx
+++ b/framework/inc/jobs/shelljob.hxx
@@ -37,7 +37,7 @@ namespace framework{
             way to configure the shell command and it's list
             of arguments.
  */
-class ShellJob : public ::cppu::WeakImplHelper< css::lang::XServiceInfo,css::task::XJob >
+class ShellJob final : public ::cppu::WeakImplHelper< css::lang::XServiceInfo,css::task::XJob >
 {
 
     // member
diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx
index b4a0a5ffafe6..41475e57a198 100644
--- a/framework/inc/recording/dispatchrecorder.hxx
+++ b/framework/inc/recording/dispatchrecorder.hxx
@@ -39,7 +39,7 @@
 
 namespace framework{
 
-class DispatchRecorder
+class DispatchRecorder final
     : public  ::cppu::WeakImplHelper<
                 css::lang::XServiceInfo
               , css::frame::XDispatchRecorder
diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx b/framework/inc/recording/dispatchrecordersupplier.hxx
index 7f20f641edf9..b8eb844dbd1d 100644
--- a/framework/inc/recording/dispatchrecordersupplier.hxx
+++ b/framework/inc/recording/dispatchrecordersupplier.hxx
@@ -38,7 +38,7 @@ namespace framework{
 
     @threadsafe     yes
  */
-class DispatchRecorderSupplier  :   public  ::cppu::WeakImplHelper<
+class DispatchRecorderSupplier final : public  ::cppu::WeakImplHelper<
                                                 css::lang::XServiceInfo             ,
                                                 css::frame::XDispatchRecorderSupplier >
 {
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index 68dc24da2abd..ff578c49bb3a 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -94,7 +94,7 @@ typedef cppu::WeakComponentImplHelper<
            css::task::XInteractionHandler       ,
            css::frame::XUntitledNumbers > Desktop_BASE;
 
-class Desktop : private cppu::BaseMutex,
+class Desktop final : private cppu::BaseMutex,
                 public Desktop_BASE,
                 public cppu::OPropertySetHelper
 {
@@ -283,9 +283,7 @@ class Desktop : private cppu::BaseMutex,
         /// @throws css::uno::RuntimeException
         bool terminateQuickstarterToo();
 
-    //  protected methods
-
-    protected:
+    private:
 
         //  OPropertySetHelper
         virtual sal_Bool                                            SAL_CALL convertFastPropertyValue        (       css::uno::Any&  aConvertedValue ,
@@ -300,9 +298,6 @@ class Desktop : private cppu::BaseMutex,
         virtual ::cppu::IPropertyArrayHelper&                       SAL_CALL getInfoHelper                   (                                       ) override;
         virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo              (                                       ) override;
 
-
-    private:
-
         css::uno::Reference< css::lang::XComponent >            impl_getFrameComponent          ( const css::uno::Reference< css::frame::XFrame >&  xFrame          ) const;
 
         /** calls queryTermination() on every registered termination listener.
diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx
index 38b2f9ade4b1..8dd5653011e0 100644
--- a/framework/inc/services/mediatypedetectionhelper.hxx
+++ b/framework/inc/services/mediatypedetectionhelper.hxx
@@ -40,7 +40,7 @@ namespace framework{
     @devstatus      deprecated
 *//*-*************************************************************************************************************/
 
-class MediaTypeDetectionHelper  :   public ::cppu::WeakImplHelper< css::util::XStringMapping, css::lang::XServiceInfo>
+class MediaTypeDetectionHelper final : public ::cppu::WeakImplHelper< css::util::XStringMapping, css::lang::XServiceInfo>
 {
 
     //  public methods
diff --git a/framework/inc/services/uriabbreviation.hxx b/framework/inc/services/uriabbreviation.hxx
index ca6d32eb8344..a3794b63ac96 100644
--- a/framework/inc/services/uriabbreviation.hxx
+++ b/framework/inc/services/uriabbreviation.hxx
@@ -31,7 +31,7 @@
 namespace framework
 {
 
-class UriAbbreviation:    public ::cppu::WeakImplHelper< css::util::XStringAbbreviation, css::lang::XServiceInfo>
+class UriAbbreviation final : public ::cppu::WeakImplHelper< css::util::XStringAbbreviation, css::lang::XServiceInfo>
 {
 public:
     explicit UriAbbreviation(css::uno::Reference< css::uno::XComponentContext > const & context);
diff --git a/framework/inc/tabwin/tabwinfactory.hxx b/framework/inc/tabwin/tabwinfactory.hxx
index 83315a6c3a8f..53111e187055 100644
--- a/framework/inc/tabwin/tabwinfactory.hxx
+++ b/framework/inc/tabwin/tabwinfactory.hxx
@@ -32,7 +32,7 @@
 namespace framework
 {
 
-class TabWinFactory :  public ::cppu::WeakImplHelper< css::lang::XSingleComponentFactory, css::lang::XServiceInfo>
+class TabWinFactory final : public ::cppu::WeakImplHelper< css::lang::XSingleComponentFactory, css::lang::XServiceInfo>
 {
     public:
         TabWinFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext );
diff --git a/framework/inc/uiconfiguration/graphicnameaccess.hxx b/framework/inc/uiconfiguration/graphicnameaccess.hxx
index 469ff079368b..b25061ff69ad 100644
--- a/framework/inc/uiconfiguration/graphicnameaccess.hxx
+++ b/framework/inc/uiconfiguration/graphicnameaccess.hxx
@@ -28,7 +28,7 @@
 
 namespace framework
 {
-    class GraphicNameAccess : public ::cppu::WeakImplHelper< css::container::XNameAccess >
+    class GraphicNameAccess final : public ::cppu::WeakImplHelper< css::container::XNameAccess >
     {
         public:
             GraphicNameAccess();
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx
index f498b8607349..331b4ec09210 100644
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
@@ -33,7 +33,7 @@
 namespace framework
 {
     class ImageManagerImpl;
-    class ImageManager :    public ::cppu::WeakImplHelper< css::ui::XImageManager, css::lang::XServiceInfo>
+    class ImageManager final : public ::cppu::WeakImplHelper< css::ui::XImageManager, css::lang::XServiceInfo>
     {
         public:
             ImageManager( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index 4d7b3d6f5b30..23d5fc5b6b64 100644
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -32,7 +32,7 @@ namespace framework
 {
     class ImageManagerImpl;
 
-    class ModuleImageManager :    public ::cppu::WeakImplHelper< css::ui::XImageManager>
+    class ModuleImageManager final : public ::cppu::WeakImplHelper< css::ui::XImageManager>
     {
         public:
             ModuleImageManager( const css::uno::Reference< css::uno::XComponentContext >& xContext );
diff --git a/framework/inc/uielement/FixedImageToolbarController.hxx b/framework/inc/uielement/FixedImageToolbarController.hxx
index a408801c66e0..2f10503e5343 100644
--- a/framework/inc/uielement/FixedImageToolbarController.hxx
+++ b/framework/inc/uielement/FixedImageToolbarController.hxx
@@ -30,7 +30,7 @@ class FixedImage;
 
 namespace framework
 {
-class FixedImageToolbarController : public ComplexToolbarController
+class FixedImageToolbarController final : public ComplexToolbarController
 {
 public:
     FixedImageToolbarController(const css::uno::Reference<css::uno::XComponentContext>& rxContext,
@@ -42,13 +42,11 @@ public:
 
     void CheckAndUpdateImages();
 
-protected:
+private:
     virtual void executeControlCommand(const css::frame::ControlCommand& rControlCommand) override;
 
-protected:
     DECL_LINK(MiscOptionsChanged, LinkParamNone*, void);
 
-private:
     VclPtr<FixedImage> m_pFixedImageControl;
     sal_Int16 m_eSymbolSize;
 };
diff --git a/framework/inc/uielement/FixedTextToolbarController.hxx b/framework/inc/uielement/FixedTextToolbarController.hxx
index bc60cfbd73c9..299bb80982b3 100644
--- a/framework/inc/uielement/FixedTextToolbarController.hxx
+++ b/framework/inc/uielement/FixedTextToolbarController.hxx
@@ -31,7 +31,7 @@ class FixedText;
 
 namespace framework
 {
-class FixedTextToolbarController : public ComplexToolbarController
+class FixedTextToolbarController final : public ComplexToolbarController
 {
 public:
     FixedTextToolbarController(const css::uno::Reference<css::uno::XComponentContext>& rxContext,
@@ -41,12 +41,11 @@ public:
     // XComponent
     virtual void SAL_CALL dispose() override;
 
-protected:
+private:
     virtual void executeControlCommand(const css::frame::ControlCommand& rControlCommand) override;
     virtual css::uno::Sequence<css::beans::PropertyValue>
     getExecuteArgs(sal_Int16 KeyModifier) const override;
 
-private:
     VclPtr<FixedText> m_pFixedTextControl;
 };
 }
diff --git a/framework/inc/uielement/addonstoolbarwrapper.hxx b/framework/inc/uielement/addonstoolbarwrapper.hxx
index 9427f52165f9..6d6fee13f4c4 100644
--- a/framework/inc/uielement/addonstoolbarwrapper.hxx
+++ b/framework/inc/uielement/addonstoolbarwrapper.hxx
@@ -29,7 +29,7 @@ namespace framework
 {
 
 class AddonsToolBarManager;
-class AddonsToolBarWrapper : public UIElementWrapperBase
+class AddonsToolBarWrapper final : public UIElementWrapperBase
 {
     public:
         AddonsToolBarWrapper( const css::uno::Reference< css::uno::XComponentContext >& xContext );
diff --git a/framework/inc/uielement/buttontoolbarcontroller.hxx b/framework/inc/uielement/buttontoolbarcontroller.hxx
index 92a4e6aa8a63..989c952038a4 100644
--- a/framework/inc/uielement/buttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/buttontoolbarcontroller.hxx
@@ -37,7 +37,7 @@ class ToolBox;
 namespace framework
 {
 
-class ButtonToolbarController : public css::frame::XStatusListener,
+class ButtonToolbarController final : public css::frame::XStatusListener,
                                 public css::frame::XToolbarController,
                                 public css::lang::XInitialization,
                                 public css::util::XUpdatable,
diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
index 2c9941eca8ac..e3fc3687d836 100644
--- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
@@ -31,7 +31,7 @@ namespace framework
 
 class ComboBoxControl;
 
-class ComboboxToolbarController : public ComplexToolbarController
+class ComboboxToolbarController final : public ComplexToolbarController
 
 {
     public:
@@ -53,11 +53,10 @@ class ComboboxToolbarController : public ComplexToolbarController
         void LoseFocus();
         bool PreNotify( NotifyEvent const & rNEvt );
 
-    protected:
+    private:
         virtual void executeControlCommand( const css::frame::ControlCommand& rControlCommand ) override;
         virtual css::uno::Sequence< css::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const override;
 
-    private:
         VclPtr<ComboBoxControl>    m_pComboBox;
 };
 
diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx
index 769652a403ae..c4a384597e65 100644
--- a/framework/inc/uielement/constitemcontainer.hxx
+++ b/framework/inc/uielement/constitemcontainer.hxx
@@ -38,7 +38,7 @@ namespace framework
 
 class RootItemContainer;
 class ItemContainer;
-class FWI_DLLPUBLIC ConstItemContainer : public ::cppu::WeakImplHelper<
+class FWI_DLLPUBLIC ConstItemContainer final : public ::cppu::WeakImplHelper<
                                                     css::container::XIndexAccess,
                                                     css::lang::XUnoTunnel       ,
                                                     css::beans::XFastPropertySet,
diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
index 3303ada03172..eb95c142cef3 100644
--- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
@@ -32,7 +32,7 @@ namespace framework
 
 class ListBoxControl;
 
-class DropdownToolbarController : public ComplexToolbarController
+class DropdownToolbarController final : public ComplexToolbarController
 
 {
     public:
@@ -52,11 +52,10 @@ class DropdownToolbarController : public ComplexToolbarController
         void GetFocus();
         void LoseFocus();
 
-    protected:
+    private:
         virtual void executeControlCommand( const css::frame::ControlCommand& rControlCommand ) override;
         virtual css::uno::Sequence< css::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const override;
 
-    private:
         VclPtr<ListBoxControl>    m_pListBoxControl;
 };
 
diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx
index 7779224ef059..3344ed1319f2 100644
--- a/framework/inc/uielement/edittoolbarcontroller.hxx
+++ b/framework/inc/uielement/edittoolbarcontroller.hxx
@@ -32,7 +32,7 @@ namespace framework
 
 class EditControl;
 
-class EditToolbarController : public ComplexToolbarController
+class EditToolbarController final : public ComplexToolbarController
 
 {
     public:
@@ -53,11 +53,10 @@ class EditToolbarController : public ComplexToolbarController
         void LoseFocus();
         bool PreNotify( NotifyEvent const & rNEvt );
 
-    protected:
+    private:
         virtual void executeControlCommand( const css::frame::ControlCommand& rControlCommand ) override;
         virtual css::uno::Sequence< css::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const override;
 
-    private:
         VclPtr<EditControl>    m_pEditControl;
 };
 
diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx
index e0f4f4ba1854..ef8231f18c8e 100644
--- a/framework/inc/uielement/fontmenucontroller.hxx
+++ b/framework/inc/uielement/fontmenucontroller.hxx
@@ -30,7 +30,7 @@
 
 namespace framework
 {
-    class FontMenuController :  public svt::PopupMenuControllerBase
+    class FontMenuController final : public svt::PopupMenuControllerBase
     {
         using svt::PopupMenuControllerBase::disposing;
 
diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx
index 9ffa4aac1dbf..36a960099910 100644
--- a/framework/inc/uielement/fontsizemenucontroller.hxx
+++ b/framework/inc/uielement/fontsizemenucontroller.hxx
@@ -34,7 +34,7 @@
 
 namespace framework
 {
-    class FontSizeMenuController :  public svt::PopupMenuControllerBase
+    class FontSizeMenuController final : public svt::PopupMenuControllerBase
     {
         using svt::PopupMenuControllerBase::disposing;
 
diff --git a/framework/inc/uielement/footermenucontroller.hxx b/framework/inc/uielement/footermenucontroller.hxx
index c560e89b9022..732524a5e071 100644
--- a/framework/inc/uielement/footermenucontroller.hxx
+++ b/framework/inc/uielement/footermenucontroller.hxx
@@ -24,7 +24,7 @@
 
 namespace framework
 {
-    class FooterMenuController :  public HeaderMenuController
+    class FooterMenuController final : public HeaderMenuController
     {
         public:
             FooterMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext );
diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx
index 4eee88c1fcf1..eac6e8276b50 100644
--- a/framework/inc/uielement/generictoolbarcontroller.hxx
+++ b/framework/inc/uielement/generictoolbarcontroller.hxx
@@ -69,7 +69,7 @@ class GenericToolbarController final : public svt::ToolboxController
         OUString            m_aEnumCommand;
 };
 
-class MenuToolbarController : public svt::ToolboxController
+class MenuToolbarController final : public svt::ToolboxController
 {
     css::uno::Reference< css::container::XIndexAccess > m_xMenuDesc;
     VclPtr<PopupMenu>                                   pMenu;
diff --git a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
index ced9b2005ceb..9b625059717f 100644
--- a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
@@ -30,7 +30,7 @@ class ToolBox;
 namespace framework
 {
 
-class ImageButtonToolbarController : public ComplexToolbarController
+class ImageButtonToolbarController final : public ComplexToolbarController
 
 {
     public:
@@ -44,10 +44,9 @@ class ImageButtonToolbarController : public ComplexToolbarController
         // XComponent
         virtual void SAL_CALL dispose() override;
 
-    protected:
+    private:
         virtual void executeControlCommand( const css::frame::ControlCommand& rControlCommand ) override;
 
-    private:
         bool ReadImageFromURL( bool bBigImage, const OUString& aImageURL, Image& aImage );
 };
 
diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx
index 34f90cd533b9..d22fc9a098c3 100644
--- a/framework/inc/uielement/itemcontainer.hxx
+++ b/framework/inc/uielement/itemcontainer.hxx
@@ -33,7 +33,7 @@
 namespace framework
 {
 class ConstItemContainer;
-class ItemContainer :   public ::cppu::WeakImplHelper< css::container::XIndexContainer>
+class ItemContainer final : public ::cppu::WeakImplHelper< css::container::XIndexContainer>
 {
     friend class ConstItemContainer;
 
diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx
index 5ce72880b151..080e98e32c1f 100644
--- a/framework/inc/uielement/langselectionmenucontroller.hxx
+++ b/framework/inc/uielement/langselectionmenucontroller.hxx
@@ -32,7 +32,7 @@
 
 namespace framework
 {
-    class LanguageSelectionMenuController :  public svt::PopupMenuControllerBase
+    class LanguageSelectionMenuController final : public svt::PopupMenuControllerBase
     {
         using svt::PopupMenuControllerBase::disposing;
 
diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx
index ec4568a40e82..c5fbd18f62ac 100644
--- a/framework/inc/uielement/macrosmenucontroller.hxx
+++ b/framework/inc/uielement/macrosmenucontroller.hxx
@@ -27,7 +27,7 @@
 
 namespace framework
 {
-    class MacrosMenuController :  public svt::PopupMenuControllerBase
+    class MacrosMenuController final : public svt::PopupMenuControllerBase
     {
         using svt::PopupMenuControllerBase::disposing;
 
diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx
index 1b20375b3154..58ec21f835f2 100644
--- a/framework/inc/uielement/menubarwrapper.hxx
+++ b/framework/inc/uielement/menubarwrapper.hxx
@@ -31,7 +31,7 @@
 namespace framework
 {
 
-class MenuBarWrapper : public UIConfigElementWrapperBase,
+class MenuBarWrapper final : public UIConfigElementWrapperBase,
                        public css::container::XNameAccess
 
 {
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index 3fae20bed266..96060e07f68b 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -31,7 +31,7 @@
 
 namespace framework
 {
-    class NewMenuController :  public svt::PopupMenuControllerBase
+    class NewMenuController final : public svt::PopupMenuControllerBase
     {
         using svt::PopupMenuControllerBase::disposing;
 
diff --git a/framework/inc/uielement/progressbarwrapper.hxx b/framework/inc/uielement/progressbarwrapper.hxx
index d38467949f8d..78dad538fe04 100644
--- a/framework/inc/uielement/progressbarwrapper.hxx
+++ b/framework/inc/uielement/progressbarwrapper.hxx
@@ -28,7 +28,7 @@
 
 namespace framework{
 
-class ProgressBarWrapper : public UIElementWrapperBase
+class ProgressBarWrapper final : public UIElementWrapperBase
 {
     public:
 
diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
index 89e1bc9598d8..bcf710fb24f3 100644
--- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
+++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
@@ -33,7 +33,7 @@ namespace framework
 
 class SpinfieldControl;
 
-class SpinfieldToolbarController : public ComplexToolbarController
+class SpinfieldToolbarController final : public ComplexToolbarController
 
 {
     public:
@@ -57,11 +57,10 @@ class SpinfieldToolbarController : public ComplexToolbarController
         void GetFocus();
         bool PreNotify( NotifyEvent const & rNEvt );
 
-    protected:
+    private:
         virtual void executeControlCommand( const css::frame::ControlCommand& rControlCommand ) override;
         virtual css::uno::Sequence< css::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const override;
 
-    private:
         bool impl_getValue( const css::uno::Any& rAny, sal_Int32& nValue, double& fValue, bool& bFloat );
         OUString impl_formatOutputString( double fValue );
 
diff --git a/framework/inc/uielement/statusbaritem.hxx b/framework/inc/uielement/statusbaritem.hxx
index 961f39b7bba0..7dd3ed672327 100644
--- a/framework/inc/uielement/statusbaritem.hxx
+++ b/framework/inc/uielement/statusbaritem.hxx
@@ -33,7 +33,7 @@ struct AddonStatusbarItemData;
 
 typedef cppu::WeakComponentImplHelper< css::ui::XStatusbarItem > StatusbarItem_Base;
 
-class StatusbarItem : protected cppu::BaseMutex,
+class StatusbarItem final : protected cppu::BaseMutex,
                       public StatusbarItem_Base
 {
 public:
diff --git a/framework/inc/uielement/statusbarwrapper.hxx b/framework/inc/uielement/statusbarwrapper.hxx
index 1fba23221b80..c8f0e53e11fa 100644
--- a/framework/inc/uielement/statusbarwrapper.hxx
+++ b/framework/inc/uielement/statusbarwrapper.hxx
@@ -28,7 +28,7 @@
 namespace framework
 {
 
-class StatusBarWrapper : public UIConfigElementWrapperBase
+class StatusBarWrapper final : public UIConfigElementWrapperBase
 {
     public:
         StatusBarWrapper(
diff --git a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
index a587c02b183f..c9913de0d83c 100644
--- a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
+++ b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
@@ -30,7 +30,7 @@
 namespace framework
 {
 
-class StatusIndicatorInterfaceWrapper :   public ::cppu::WeakImplHelper< css::task::XStatusIndicator>
+class StatusIndicatorInterfaceWrapper final : public ::cppu::WeakImplHelper< css::task::XStatusIndicator>
 {
     public:
         StatusIndicatorInterfaceWrapper( const css::uno::Reference< css::lang::XComponent >& rStatusIndicatorImpl );
diff --git a/framework/inc/uielement/styletoolbarcontroller.hxx b/framework/inc/uielement/styletoolbarcontroller.hxx
index 8947647d6fc9..e6d596905e4c 100644
--- a/framework/inc/uielement/styletoolbarcontroller.hxx
+++ b/framework/inc/uielement/styletoolbarcontroller.hxx
@@ -31,7 +31,7 @@ namespace framework {
  * responsibility of the owner to destroy the dispatcher first, in order
  * to break the cycle.
  */
-class StyleDispatcher : public cppu::WeakImplHelper< css::frame::XDispatch, css::frame::XStatusListener >
+class StyleDispatcher final : public cppu::WeakImplHelper< css::frame::XDispatch, css::frame::XStatusListener >
 {
 public:
     StyleDispatcher( const css::uno::Reference< css::frame::XFrame >& rFrame,
@@ -57,7 +57,7 @@ private:
     css::uno::Reference< css::frame::XStatusListener > m_xOwner;
 };
 
-class StyleToolbarController : public svt::ToolboxController
+class StyleToolbarController final : public svt::ToolboxController
 {
 public:
     StyleToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rContext,
diff --git a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
index 45e953c9e51f..9e667da83ba0 100644
--- a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
@@ -31,7 +31,7 @@ class ToolBox;
 namespace framework
 {
 
-class ToggleButtonToolbarController : public ComplexToolbarController
+class ToggleButtonToolbarController final : public ComplexToolbarController
 
 {
     public:
@@ -62,11 +62,10 @@ class ToggleButtonToolbarController : public ComplexToolbarController
         // XToolbarController
         virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() override;
 
-    protected:
+    private:
         virtual void executeControlCommand( const css::frame::ControlCommand& rControlCommand ) override;
         virtual css::uno::Sequence< css::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const override;
 
-    private:
         DECL_LINK( MenuSelectHdl, Menu *, bool);
 
         OUString                m_aCurrentSelection;
diff --git a/framework/inc/uielement/toolbarmodemenucontroller.hxx b/framework/inc/uielement/toolbarmodemenucontroller.hxx
index 5a6767f93ef0..28ec1de1c1a0 100644
--- a/framework/inc/uielement/toolbarmodemenucontroller.hxx
+++ b/framework/inc/uielement/toolbarmodemenucontroller.hxx
@@ -29,7 +29,7 @@
 
 namespace framework
 {
-    class ToolbarModeMenuController : public svt::PopupMenuControllerBase
+    class ToolbarModeMenuController final : public svt::PopupMenuControllerBase
     {
         using svt::PopupMenuControllerBase::disposing;
 
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx
index 2b5427a8488b..3d128f52ef1b 100644
--- a/framework/inc/uielement/toolbarsmenucontroller.hxx
+++ b/framework/inc/uielement/toolbarsmenucontroller.hxx
@@ -36,7 +36,7 @@
 
 namespace framework
 {
-    class ToolbarsMenuController :  public svt::PopupMenuControllerBase
+    class ToolbarsMenuController final : public svt::PopupMenuControllerBase
     {
         using svt::PopupMenuControllerBase::disposing;
 
diff --git a/framework/inc/uielement/toolbarwrapper.hxx b/framework/inc/uielement/toolbarwrapper.hxx
index 9b04569a29f8..60d5759f6316 100644
--- a/framework/inc/uielement/toolbarwrapper.hxx
+++ b/framework/inc/uielement/toolbarwrapper.hxx
@@ -30,7 +30,7 @@ namespace framework
 {
 
 class ToolBarManager;
-class ToolBarWrapper : public css::ui::XUIFunctionListener,
+class ToolBarWrapper final : public css::ui::XUIFunctionListener,
                        public UIConfigElementWrapperBase
 {
     public:
@@ -64,13 +64,10 @@ class ToolBarWrapper : public css::ui::XUIFunctionListener,
         using cppu::OPropertySetHelper::disposing;
         virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) override;
 
-    //  protected methods
-
-    protected:
+    private:
         virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any&  aValue ) override;
         virtual void impl_fillNewData() override;
 
-    private:
         css::uno::Reference< css::lang::XComponent >            m_xToolBarManager;
         css::uno::Reference< css::uno::XComponentContext >      m_xContext;
 };
diff --git a/framework/inc/uifactory/configurationaccessfactorymanager.hxx b/framework/inc/uifactory/configurationaccessfactorymanager.hxx
index edcc7f7e2e02..4f186107a729 100644
--- a/framework/inc/uifactory/configurationaccessfactorymanager.hxx
+++ b/framework/inc/uifactory/configurationaccessfactorymanager.hxx
@@ -35,7 +35,7 @@
 
 namespace framework {
 
-    class ConfigurationAccess_FactoryManager : public ::cppu::WeakImplHelper< css::container::XContainerListener>
+class ConfigurationAccess_FactoryManager final : public ::cppu::WeakImplHelper< css::container::XContainerListener>
 {
     public:
                       ConfigurationAccess_FactoryManager( const css::uno::Reference< css::uno::XComponentContext>& rxContext, const OUString& _sRoot );
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx
index a6a31b5ad311..fad809575c2a 100644
--- a/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
@@ -36,7 +36,7 @@ namespace framework
 
 //  Configuration access class for PopupMenuControllerFactory implementation
 
-class ConfigurationAccess_ControllerFactory : // interfaces
+class ConfigurationAccess_ControllerFactory final : // interfaces
                                                     public  ::cppu::WeakImplHelper< css::container::XContainerListener>
 {
 public:
diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx
index 2e54dc3e540d..76a0a159ca69 100644
--- a/framework/inc/xml/acceleratorconfigurationreader.hxx
+++ b/framework/inc/xml/acceleratorconfigurationreader.hxx
@@ -31,7 +31,7 @@
 
 namespace framework{
 
-class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler >
+class AcceleratorConfigurationReader final : public ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler >
 {
 
     // const, types
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index 2b356670e9db..f9cbd6122f78 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -32,7 +32,7 @@ namespace framework{
 
 // Hash code function for using in all hash maps of follow implementation.
 
-class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler >
+class OReadImagesDocumentHandler final : public ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler >
 {
     public:
         enum Image_XML_Entry
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index 3aba335d16f5..236e8359139c 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -77,7 +77,7 @@ class ReadMenuDocumentHandlerBase : public ::cppu::WeakImplHelper< css::xml::sax
         OUString m_aStyle;
 };
 
-class OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
+class OReadMenuDocumentHandler final : public ReadMenuDocumentHandlerBase
 {
     public:
         OReadMenuDocumentHandler(
@@ -105,7 +105,7 @@ class OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
           css::uno::Reference< css::lang::XSingleComponentFactory > m_xContainerFactory;
 };  // OReadMenuDocumentHandler
 
-class OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
+class OReadMenuBarHandler final : public ReadMenuDocumentHandlerBase
 {
     public:
         OReadMenuBarHandler(
@@ -133,7 +133,7 @@ class OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
         css::uno::Reference< css::lang::XSingleComponentFactory > m_xContainerFactory;
 };  // OReadMenuBarHandler
 
-class OReadMenuHandler : public ReadMenuDocumentHandlerBase
+class OReadMenuHandler final : public ReadMenuDocumentHandlerBase
 {
     public:
         OReadMenuHandler( const css::uno::Reference< css::container::XIndexContainer >& rMenuContainer,
@@ -160,7 +160,7 @@ class OReadMenuHandler : public ReadMenuDocumentHandlerBase
         css::uno::Reference< css::lang::XSingleComponentFactory > m_xContainerFactory;
 }; // OReadMenuHandler
 
-class OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase
+class OReadMenuPopupHandler final : public ReadMenuDocumentHandlerBase
 {
     public:
         OReadMenuPopupHandler( const css::uno::Reference< css::container::XIndexContainer >& rMenuContainer,
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index 58b9a008719b..a5cd90c68c0f 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -37,7 +37,7 @@ namespace framework{
 // workaround for incremental linking bugs in MSVC2015
 class SAL_DLLPUBLIC_TEMPLATE OReadStatusBarDocumentHandler_Base : public cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > {};
 
-class OReadStatusBarDocumentHandler : public OReadStatusBarDocumentHandler_Base
+class OReadStatusBarDocumentHandler final : public OReadStatusBarDocumentHandler_Base
 {
     public:
         enum StatusBar_XML_Entry
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index 670e6229e8a0..dccdac7bce47 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -37,7 +37,7 @@ namespace framework{
 // workaround for incremental linking bugs in MSVC2015
 class SAL_DLLPUBLIC_TEMPLATE OReadToolBoxDocumentHandler_Base : public cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > {};
 
-class OReadToolBoxDocumentHandler : public OReadToolBoxDocumentHandler_Base
+class OReadToolBoxDocumentHandler final : public OReadToolBoxDocumentHandler_Base
 {
     public:
         enum ToolBox_XML_Entry