loplugin:unnecessaryvirtual in comphelper..forms

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

2 files changed, 3 insertions, 13 deletions

diff --git a/include/comphelper/proparrhlp.hxx b/include/comphelper/proparrhlp.hxx
index 3584553f3996..114efda1734f 100644
--- a/include/comphelper/proparrhlp.hxx
+++ b/include/comphelper/proparrhlp.hxx
@@ -85,16 +85,6 @@ protected:
         the additional parameters of the OPropertyArrayAggregationHelper.
     */
     virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
-
-    /** the return value is used for the construction of the OPropertyArrayAggregationHelper.
-        Beware of the lifetime of the returned object, as it has to exist 'til the last instance
-        of this class dies.
-    */
-    virtual IPropertyInfoService* getInfoService() const { return nullptr; }
-
-    /** the return value is used for the construction of the OPropertyArrayAggregationHelper.
-    */
-    virtual sal_Int32 getFirstAggregateId() const { return DEFAULT_AGGREGATE_PROPERTY_ID; }
 };
 
 template<class TYPE>
@@ -145,7 +135,7 @@ template <class TYPE> inline
     css::uno::Sequence< css::beans::Property > aAggregateProps;
     fillProperties(aProps, aAggregateProps);
     OSL_ENSURE(aProps.getLength(), "OAggregationArrayUsageHelper::createArrayHelper : fillProperties returned nonsense !");
-    return new OPropertyArrayAggregationHelper(aProps, aAggregateProps, getInfoService(), getFirstAggregateId());
+    return new OPropertyArrayAggregationHelper(aProps, aAggregateProps, nullptr, DEFAULT_AGGREGATE_PROPERTY_ID);
 }
 
 }
diff --git a/include/comphelper/threadpool.hxx b/include/comphelper/threadpool.hxx
index 93f6b59ee9de..7910a83ceeb7 100644
--- a/include/comphelper/threadpool.hxx
+++ b/include/comphelper/threadpool.hxx
@@ -36,7 +36,7 @@ public:
 };
 
 /// A very basic thread pool implementation
-class COMPHELPER_DLLPUBLIC ThreadPool
+class COMPHELPER_DLLPUBLIC ThreadPool final
 {
 public:
     /// returns a pointer to a shared pool with optimal thread
@@ -54,7 +54,7 @@ public:
     static      sal_Int32 getPreferredConcurrency();
 
     ThreadPool( sal_Int32 nWorkers );
-    virtual    ~ThreadPool();
+    ~ThreadPool();
 
     /// push a new task onto the work queue
     void        pushTask( ThreadTask *pTask /* takes ownership */ );