loplugin:finalclasses in xmlsecurity..UnoControls

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

17 files changed, 27 insertions, 30 deletions

diff --git a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
index 45579f33f200..a1a8a34178a7 100644
--- a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
@@ -27,7 +27,7 @@ namespace com::sun::star::lang { class XConnectionPoint; }
 
 namespace unocontrols {
 
-class OConnectionPointContainerHelper   :   public  css::lang::XConnectionPointContainer
+class OConnectionPointContainerHelper final :   public  css::lang::XConnectionPointContainer
                                         ,   public  ::cppu::OWeakObject
 {
 public:
diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx
index 9cd5a7907396..f075b071a3cb 100644
--- a/UnoControls/source/inc/OConnectionPointHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointHelper.hxx
@@ -28,7 +28,7 @@ namespace unocontrols { class OConnectionPointContainerHelper; }
 
 namespace unocontrols {
 
-class OConnectionPointHelper    :   public  css::lang::XConnectionPoint
+class OConnectionPointHelper final :   public  css::lang::XConnectionPoint
                                 ,   public  ::cppu::OWeakObject
 {
 public:
diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx
index 2261490421b8..dad27d8f8f2f 100644
--- a/UnoControls/source/inc/framecontrol.hxx
+++ b/UnoControls/source/inc/framecontrol.hxx
@@ -31,7 +31,7 @@ namespace unocontrols { class OConnectionPointContainerHelper; }
 
 namespace unocontrols {
 
-class FrameControl  : public css::awt::XControlModel
+class FrameControl final : public css::awt::XControlModel
                     , public css::lang::XConnectionPointContainer
                     , public BaseControl                                // This order is necessary for right initialization of m_aMutex!
                     , public ::cppu::OBroadcastHelper
@@ -130,7 +130,8 @@ public:
 
     static OUString impl_getStaticImplementationName();
 
-protected:
+private:
+
     using OPropertySetHelper::getFastPropertyValue;
 
     //  OPropertySetHelper
@@ -162,8 +163,6 @@ protected:
         const css::uno::Reference< css::awt::XWindowPeer >& xParentPeer
     ) override;
 
-private:
-
     void impl_createFrame(  const css::uno::Reference< css::awt::XWindowPeer >&       xPeer           ,
                             const OUString&                                         sURL            ,
                             const css::uno::Sequence< css::beans::PropertyValue >&    seqArguments    );
diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx
index 8a3f4db1b181..a85fd731de4a 100644
--- a/UnoControls/source/inc/progressbar.hxx
+++ b/UnoControls/source/inc/progressbar.hxx
@@ -39,7 +39,7 @@ namespace unocontrols {
 #define PROGRESSBAR_LINECOLOR_BRIGHT        sal_Int32(Color( 0x00, 0xFF, 0xFF, 0xFF )) // white
 #define PROGRESSBAR_LINECOLOR_SHADOW        sal_Int32(Color( 0x00, 0x00, 0x00, 0x00 )) // black
 
-class ProgressBar   : public css::awt::XControlModel
+class ProgressBar final : public css::awt::XControlModel
                     , public css::awt::XProgressBar
                     , public BaseControl
 {
@@ -118,7 +118,7 @@ public:
 
     static OUString impl_getStaticImplementationName();
 
-protected:
+private:
     virtual void impl_paint(
         sal_Int32 nX ,
         sal_Int32 nY ,
@@ -127,7 +127,6 @@ protected:
 
     void impl_recalcRange();
 
-private:
     bool            m_bHorizontal;   // orientation for steps            [true=horizontal/false=vertical]
     css::awt::Size  m_aBlockSize;   // width and height of a block      [>=0,0]
     Color           m_nForegroundColor;   //                                  (alpha,r,g,b)
diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx
index bbb4837347a6..77927020582f 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -51,7 +51,7 @@ struct IMPL_TextlistItem
     OUString sText;          /// Right site of textline in dialog
 };
 
-class ProgressMonitor   : public css::awt::XLayoutConstrains
+class ProgressMonitor final : public css::awt::XLayoutConstrains
                         , public css::awt::XButton
                         , public css::awt::XProgressMonitor
                         , public BaseContainerControl
@@ -212,12 +212,11 @@ public:
 
     static OUString impl_getStaticImplementationName();
 
-protected:
+private:
     virtual void impl_paint( sal_Int32 nX ,
                              sal_Int32 nY ,
                              const css::uno::Reference< css::awt::XGraphics >& xGraphics ) override;
 
-private:
     using BaseControl::impl_recalcLayout;
 
     void impl_recalcLayout();
@@ -230,7 +229,6 @@ private:
 
 // debug methods
 
-private:
     static bool impl_debug_checkParameter( const OUString& sTopic, const OUString& sText );    // addText, updateText
     static bool impl_debug_checkParameter( const OUString& rTopic );                           // removeText
 
diff --git a/UnoControls/source/inc/statusindicator.hxx b/UnoControls/source/inc/statusindicator.hxx
index 7676f12902d3..658062c1512c 100644
--- a/UnoControls/source/inc/statusindicator.hxx
+++ b/UnoControls/source/inc/statusindicator.hxx
@@ -42,7 +42,7 @@ class ProgressBar;
 #define STATUSINDICATOR_DEFAULT_WIDTH           300
 #define STATUSINDICATOR_DEFAULT_HEIGHT          25
 
-class StatusIndicator   : public css::awt::XLayoutConstrains
+class StatusIndicator final : public css::awt::XLayoutConstrains
                         , public css::task::XStatusIndicator
                         , public BaseContainerControl
 {
@@ -154,7 +154,7 @@ public:
 
     static OUString impl_getStaticImplementationName();
 
-protected:
+private:
     virtual css::awt::WindowDescriptor impl_getWindowDescriptor(
         const css::uno::Reference< css::awt::XWindowPeer >& xParentPeer
     ) override;
@@ -167,7 +167,6 @@ protected:
 
     virtual void impl_recalcLayout( const css::awt::WindowEvent& aEvent ) override;
 
-private:
     css::uno::Reference< css::awt::XFixedText >   m_xText;
     rtl::Reference<ProgressBar>                   m_xProgressBar;
 
diff --git a/compilerplugins/clang/finalclasses.py b/compilerplugins/clang/finalclasses.py
index 7b08bdfbd966..524aec6f48a2 100755
--- a/compilerplugins/clang/finalclasses.py
+++ b/compilerplugins/clang/finalclasses.py
@@ -32,7 +32,8 @@ with open("workdir/loplugin.finalclasses.log") as txt:
         else:
             print( "unknown line: " + line)
 
-match_module_inc = re.compile('^\w+/inc/')
+match_module_inc1 = re.compile('^\w+/inc/')
+match_module_inc2 = re.compile('^\w+/.*/inc/')
 tmpset = set()
 for clazz in sorted(definitionSet - inheritFromSet):
     file = definitionToFileDict[clazz]
@@ -43,7 +44,8 @@ for clazz in sorted(definitionSet - inheritFromSet):
     if (file.startswith("workdir/")): continue
     # We are only really interested in classes that are shared between linkage units, where the compiler
     # is not able to figure out for itself that classes are final.
-    if not(file.startswith("include/") or match_module_inc.match(file)): continue
+    if not(file.startswith("include/") or match_module_inc1.match(file) or match_module_inc2.match(file)): continue
+    #if not(file.endswith(".hxx")): continue
     # Exclude URE
     if file.startswith("include/com/"): continue
     if file.startswith("include/cppu/"): continue
diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx
index 51007916b43b..69d02ec544c8 100644
--- a/vcl/inc/headless/svpdummies.hxx
+++ b/vcl/inc/headless/svpdummies.hxx
@@ -45,7 +45,7 @@ public:
     virtual const SystemEnvData*    GetSystemData() const override;
 };
 
-class SvpSalSystem : public SalGenericSystem
+class SvpSalSystem final : public SalGenericSystem
 {
 public:
     SvpSalSystem() {}
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 7245a31d5c8c..1a5aff05bfe6 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -35,7 +35,7 @@
 class SvpSalInstance;
 class SvpSalGraphics;
 
-class SvpSalFrame : public SalFrame
+class SvpSalFrame final : public SalFrame
 {
     SvpSalInstance*                     m_pInstance;
     SvpSalFrame*                        m_pParent;       // pointer to parent frame
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 519e2ddf7ef9..dd3575b79c38 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -349,7 +349,7 @@ public:
     SystemWindow* getSystemWindow();
 };
 
-class SalInstanceLabel : public SalInstanceWidget, public virtual weld::Label
+class SalInstanceLabel final : public SalInstanceWidget, public virtual weld::Label
 {
 private:
     // Control instead of FixedText so we can also use this for
@@ -497,7 +497,7 @@ public:
     virtual weld::Container* weld_content_area() override;
 };
 
-class WeldTextFilter : public TextFilter
+class WeldTextFilter final : public TextFilter
 {
 private:
     Link<OUString&, bool>& m_rInsertTextHdl;
@@ -567,7 +567,7 @@ public:
     virtual ~SalInstanceEntry() override;
 };
 
-class SalInstanceSpinButton : public SalInstanceEntry, public virtual weld::SpinButton
+class SalInstanceSpinButton final : public SalInstanceEntry, public virtual weld::SpinButton
 {
 private:
     VclPtr<FormattedField> m_xButton;
diff --git a/vcl/inc/skia/x11/textrender.hxx b/vcl/inc/skia/x11/textrender.hxx
index 2aeda63cfb5c..d6eda9a048ea 100644
--- a/vcl/inc/skia/x11/textrender.hxx
+++ b/vcl/inc/skia/x11/textrender.hxx
@@ -25,7 +25,7 @@
 #include <SkFontMgr.h>
 #include <SkFontMgr_fontconfig.h>
 
-class VCL_DLLPUBLIC SkiaTextRender : public FreeTypeTextRenderImpl
+class VCL_DLLPUBLIC SkiaTextRender final : public FreeTypeTextRenderImpl
 {
 public:
     virtual void DrawTextLayout(const GenericSalLayout&, const SalGraphics&) override;
diff --git a/vcl/inc/watchdog.hxx b/vcl/inc/watchdog.hxx
index ee357fb2dc89..9202e432f07a 100644
--- a/vcl/inc/watchdog.hxx
+++ b/vcl/inc/watchdog.hxx
@@ -15,7 +15,7 @@
 #include <atomic>
 #include <vector>
 
-class WatchdogThread : private salhelper::Thread
+class WatchdogThread final : private salhelper::Thread
 {
     WatchdogThread();
     virtual void execute() override;
diff --git a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
index 9eb8b2f3f0c0..992c9fc3747e 100644
--- a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
@@ -31,7 +31,7 @@
 
 namespace treeview {
 
-class TVFactory: public cppu::WeakImplHelper <
+class TVFactory final : public cppu::WeakImplHelper <
     css::lang::XServiceInfo,
     css::lang::XMultiServiceFactory >
     {
diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx
index fe529d3bfcfa..0419ce0ab185 100644
--- a/xmlhelp/source/cxxhelp/inc/tvread.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx
@@ -135,7 +135,7 @@ namespace treeview {
 
     }; // end class TVBase
 
-    class TVRead
+    class TVRead final
         : public TVBase
     {
         friend class TVChildTarget;
diff --git a/xmlsecurity/inc/certificatechooser.hxx b/xmlsecurity/inc/certificatechooser.hxx
index 645c72929771..3a87dca71acb 100644
--- a/xmlsecurity/inc/certificatechooser.hxx
+++ b/xmlsecurity/inc/certificatechooser.hxx
@@ -48,7 +48,7 @@ enum class UserAction
     Encrypt
 };
 
-class CertificateChooser : public weld::GenericDialogController
+class CertificateChooser final : public weld::GenericDialogController
 {
 private:
     std::vector< css::uno::Reference< css::xml::crypto::XXMLSecurityContext > > mxSecurityContexts;
diff --git a/xmlsecurity/inc/certificateviewer.hxx b/xmlsecurity/inc/certificateviewer.hxx
index d531dd1fc205..5d6473de16ff 100644
--- a/xmlsecurity/inc/certificateviewer.hxx
+++ b/xmlsecurity/inc/certificateviewer.hxx
@@ -36,7 +36,7 @@ class CertificateViewerDetailsTP;
 class CertificateViewerCertPathTP;
 class CertificateChooser;
 
-class CertificateViewer : public weld::GenericDialogController
+class CertificateViewer final : public weld::GenericDialogController
 {
 private:
     friend class CertificateViewerGeneralTP;
diff --git a/xmlsecurity/inc/digitalsignaturesdialog.hxx b/xmlsecurity/inc/digitalsignaturesdialog.hxx
index 59e699db7b69..d035d64c528f 100644
--- a/xmlsecurity/inc/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/digitalsignaturesdialog.hxx
@@ -45,7 +45,7 @@ namespace xml { namespace dom {
 
 class HeaderBar;
 
-class DigitalSignaturesDialog : public weld::GenericDialogController
+class DigitalSignaturesDialog final : public weld::GenericDialogController
 {
 private:
     DocumentSignatureManager maSignatureManager;