loplugin:finalclasses in comphelper

convert ServiceInfoHelper to a namespace, since the only usage is to
call it's static method

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

4 files changed, 8 insertions, 24 deletions

diff --git a/include/comphelper/accessiblekeybindinghelper.hxx b/include/comphelper/accessiblekeybindinghelper.hxx
index 9710bb0d1192..4de48bf3ec39 100644
--- a/include/comphelper/accessiblekeybindinghelper.hxx
+++ b/include/comphelper/accessiblekeybindinghelper.hxx
@@ -41,14 +41,11 @@ namespace comphelper
 
     /** a helper class for implementing an accessible keybinding
      */
-    class COMPHELPER_DLLPUBLIC OAccessibleKeyBindingHelper : public OAccessibleKeyBindingHelper_Base
+    class COMPHELPER_DLLPUBLIC OAccessibleKeyBindingHelper final : public OAccessibleKeyBindingHelper_Base
     {
     private:
         typedef ::std::vector< css::uno::Sequence< css::awt::KeyStroke > > KeyBindings;
-
         KeyBindings     m_aKeyBindings;
-
-    protected:
         ::osl::Mutex    m_aMutex;
 
         virtual ~OAccessibleKeyBindingHelper() override;
diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx
index c1e521f3ee67..67cabd5c6402 100644
--- a/include/comphelper/propagg.hxx
+++ b/include/comphelper/propagg.hxx
@@ -86,10 +86,9 @@ protected:
 
 #define DEFAULT_AGGREGATE_PROPERTY_ID   10000
 
-class COMPHELPER_DLLPUBLIC OPropertyArrayAggregationHelper: public ::cppu::IPropertyArrayHelper
+class COMPHELPER_DLLPUBLIC OPropertyArrayAggregationHelper final : public ::cppu::IPropertyArrayHelper
 {
     friend class OPropertySetAggregationHelper;
-protected:
 
     std::vector<css::beans::Property>         m_aProperties;
     internal::PropertyAccessorMap             m_aPropertyAccessors;
@@ -176,7 +175,7 @@ public:
     */
     PropertyOrigin  classifyProperty( const OUString& _rName );
 
-protected:
+private:
     const css::beans::Property* findPropertyByName(const OUString& _rName) const;
 };
 
diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx
index ae7502f776e4..998c4a099d93 100644
--- a/include/comphelper/seqstream.hxx
+++ b/include/comphelper/seqstream.hxx
@@ -69,11 +69,10 @@ class SAL_DLLPUBLIC_TEMPLATE OSequenceOutputStream_Base
     : public ::cppu::WeakImplHelper< css::io::XOutputStream >
 {};
 
-class COMPHELPER_DLLPUBLIC OSequenceOutputStream : public OSequenceOutputStream_Base
+class COMPHELPER_DLLPUBLIC OSequenceOutputStream final : public OSequenceOutputStream_Base
 {
 private:
     void finalizeOutput();
-protected:
     css::uno::Sequence< sal_Int8 >&                 m_rSequence;
     double                                          m_nResizeFactor;
     sal_Int32                                       m_nMinimumResize;
@@ -86,7 +85,6 @@ protected:
 
     ::osl::Mutex                                    m_aMutex;
 
-protected:
     virtual ~OSequenceOutputStream() override { if (m_bConnected) finalizeOutput(); }
 
 public:
diff --git a/include/comphelper/serviceinfohelper.hxx b/include/comphelper/serviceinfohelper.hxx
index 527c09bbe75a..0e0e619e6440 100644
--- a/include/comphelper/serviceinfohelper.hxx
+++ b/include/comphelper/serviceinfohelper.hxx
@@ -29,24 +29,14 @@
 
 namespace comphelper {
 
-/** this class provides a basic helper for classes supporting the XServiceInfo Interface.
+/** This class provides a basic helper for classes supporting the XServiceInfo Interface.
  *
- *  you can override the <code>getSupprotedServiceNames</code> to implement a XServiceInfo.
- *  you can use the static helper methods to combine your services with that of parent
+ *  You can use the static helper methods to combine your services with that of parent
  *  or aggregated classes.
  */
-class COMPHELPER_DLLPUBLIC ServiceInfoHelper : public css::lang::XServiceInfo
+namespace ServiceInfoHelper
 {
-public:
-    // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
-
-    // helper
-    static void addToSequence( css::uno::Sequence< OUString >& rSeq, std::initializer_list<OUString> services ) throw();
-
-protected:
-    ~ServiceInfoHelper() {}
+    COMPHELPER_DLLPUBLIC void addToSequence( css::uno::Sequence< OUString >& rSeq, std::initializer_list<OUString> services ) throw();
 };
 
 }