sd/source/ui/framework/tools/FrameworkHelper.cxx | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 10a0f2dc50fec37a858b5e20c240cc416503019e
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Tue Dec 28 20:05:38 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Dec 29 08:01:32 2021 +0100
use comphelper::WeakComponentImplHelper in CallbackCaller
Change-Id: I98844120f2cf6b1137a781b6401bcd45859b0689
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127656
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx
b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 141d4cfe63e4..20ee30f040ba 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -31,8 +31,7 @@
#include <com/sun/star/drawing/framework/XControllerManager.hpp>
#include <com/sun/star/frame/XController.hpp>
#include <comphelper/servicehelper.hxx>
-#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase.hxx>
+#include <comphelper/compbase.hxx>
#include <svl/lstner.hxx>
#include <rtl/ustrbuf.hxx>
@@ -53,7 +52,7 @@ namespace {
//----- CallbackCaller --------------------------------------------------------
-typedef ::cppu::WeakComponentImplHelper <
+typedef comphelper::WeakComponentImplHelper <
css::drawing::framework::XConfigurationChangeListener
> CallbackCallerInterfaceBase;
@@ -64,8 +63,7 @@ typedef ::cppu::WeakComponentImplHelper <
actual callback object is called and the CallbackCaller destroys itself.
*/
class CallbackCaller
- : public cppu::BaseMutex,
- public CallbackCallerInterfaceBase
+ : public CallbackCallerInterfaceBase
{
public:
/** Create a new CallbackCaller object. This object controls its own
@@ -92,7 +90,7 @@ public:
const
::sd::framework::FrameworkHelper::ConfigurationChangeEventFilter& rFilter,
const ::sd::framework::FrameworkHelper::Callback& rCallback);
- virtual void SAL_CALL disposing() override;
+ virtual void disposing(std::unique_lock<std::mutex>&) override;
// XEventListener
virtual void SAL_CALL disposing (const lang::EventObject& rEvent) override;
// XConfigurationChangeListener
@@ -804,8 +802,7 @@ CallbackCaller::CallbackCaller (
const OUString& rsEventType,
const ::sd::framework::FrameworkHelper::ConfigurationChangeEventFilter&
rFilter,
const ::sd::framework::FrameworkHelper::Callback& rCallback)
- : CallbackCallerInterfaceBase(m_aMutex),
- msEventType(rsEventType),
+ : msEventType(rsEventType),
maFilter(rFilter),
maCallback(rCallback)
{
@@ -836,7 +833,7 @@ CallbackCaller::CallbackCaller (
}
}
-void CallbackCaller::disposing()
+void CallbackCaller::disposing(std::unique_lock<std::mutex>&)
{
try
{
