use comphelper::WeakComponentImplHelper in PopupRequest

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

1 files changed, 3 insertions, 9 deletions

diff --git a/chart2/source/inc/PopupRequest.hxx b/chart2/source/inc/PopupRequest.hxx
index ac7e783c434c..a755fdfa3c85 100644
--- a/chart2/source/inc/PopupRequest.hxx
+++ b/chart2/source/inc/PopupRequest.hxx
@@ -11,18 +11,17 @@
 
 #include "charttoolsdllapi.hxx"
 
-#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase.hxx>
+#include <comphelper/compbase.hxx>
 #include <com/sun/star/awt/XRequestCallback.hpp>
 
 namespace chart
 {
 namespace impl
 {
-typedef cppu::WeakComponentImplHelper<css::awt::XRequestCallback> PopupRequest_Base;
+typedef comphelper::WeakComponentImplHelper<css::awt::XRequestCallback> PopupRequest_Base;
 }
 
-class OOO_DLLPUBLIC_CHARTTOOLS PopupRequest : public cppu::BaseMutex, public impl::PopupRequest_Base
+class OOO_DLLPUBLIC_CHARTTOOLS PopupRequest final : public impl::PopupRequest_Base
 {
 public:
     explicit PopupRequest();
@@ -30,15 +29,10 @@ public:
 
     css::uno::Reference<css::awt::XCallback> const& getCallback() const { return m_xCallback; }
 
-protected:
     // ____ XRequestCallback ____
     virtual void SAL_CALL addCallback(const css::uno::Reference<::css::awt::XCallback>& xCallback,
                                       const css::uno::Any& aData) override;
 
-    // ____ WeakComponentImplHelperBase ____
-    // is called when dispose() is called at this component
-    virtual void SAL_CALL disposing() override;
-
 private:
     css::uno::Reference<css::awt::XCallback> m_xCallback;
 };