diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-28 21:29:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-29 19:50:26 +0100 |
| commit | f0f67a42b82ecb0e654e3e0716d194ff4cbb13b1 (patch) | |
| tree | 2ff316fbccded6143fdd7858bf18811c9ca25c6e /chart2 | |
| parent | f55f46594cf43b46ed092af415a8a3af6972a7cd (diff) | |
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>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/inc/PopupRequest.hxx | 12 | ||||
| -rw-r--r-- | chart2/source/tools/PopupRequest.cxx | 9 |
2 files changed, 4 insertions, 17 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; }; diff --git a/chart2/source/tools/PopupRequest.cxx b/chart2/source/tools/PopupRequest.cxx index 685dac49369c..70dd65b78393 100644 --- a/chart2/source/tools/PopupRequest.cxx +++ b/chart2/source/tools/PopupRequest.cxx @@ -14,10 +14,7 @@ using namespace css; namespace chart { -PopupRequest::PopupRequest() - : impl::PopupRequest_Base(m_aMutex) -{ -} +PopupRequest::PopupRequest() {} PopupRequest::~PopupRequest() {} @@ -29,10 +26,6 @@ void SAL_CALL PopupRequest::addCallback(const uno::Reference<awt::XCallback>& xC m_xCallback = xCallback; } -// ____ WeakComponentImplHelperBase ____ -// is called when dispose() is called at this component -void SAL_CALL PopupRequest::disposing() {} - } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |