[Libreoffice-commits] core.git: sd/source

[Noel Grandin (via logerrit)]

 sd/source/ui/framework/configuration/UpdateRequest.cxx |    5 +----
 sd/source/ui/framework/configuration/UpdateRequest.hxx |   10 ++++------
 2 files changed, 5 insertions(+), 10 deletions(-)

New commits:
commit c0dc544a853c179f6b5c0c227180c0858578746c
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon Dec 27 10:06:49 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Dec 27 14:18:49 2021 +0100

    use comphelper::WeakComponentImplHelper in UpdateRequest
    
    Change-Id: I9e8030d86e892ccd6488c1b87b51eb761391b76f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127555
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx 
b/sd/source/ui/framework/configuration/UpdateRequest.cxx
index b22e662a0e7c..b6c5e8c42dc8 100644
--- a/sd/source/ui/framework/configuration/UpdateRequest.cxx
+++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx
@@ -25,10 +25,7 @@ using namespace ::com::sun::star::drawing::framework;
 
 namespace sd::framework
 {
-UpdateRequest::UpdateRequest() noexcept
-    : UpdateRequestInterfaceBase(m_aMutex)
-{
-}
+UpdateRequest::UpdateRequest() noexcept {}
 
 UpdateRequest::~UpdateRequest() noexcept {}
 
diff --git a/sd/source/ui/framework/configuration/UpdateRequest.hxx 
b/sd/source/ui/framework/configuration/UpdateRequest.hxx
index 67b2486d65c1..712167154b3c 100644
--- a/sd/source/ui/framework/configuration/UpdateRequest.hxx
+++ b/sd/source/ui/framework/configuration/UpdateRequest.hxx
@@ -21,14 +21,13 @@
 
 #include <com/sun/star/drawing/framework/XConfigurationChangeRequest.hpp>
 #include <com/sun/star/container/XNamed.hpp>
-#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase.hxx>
+#include <comphelper/compbase.hxx>
 
 namespace com::sun::star::drawing::framework { class XConfiguration; }
 
 namespace sd::framework {
 
-typedef ::cppu::WeakComponentImplHelper <
+typedef comphelper::WeakComponentImplHelper <
       css::drawing::framework::XConfigurationChangeRequest,
       css::container::XNamed
     > UpdateRequestInterfaceBase;
@@ -41,9 +40,8 @@ typedef ::cppu::WeakComponentImplHelper <
     really do anything.  This request just triggers the update of the
     configuration when it is removed as last request from the queue.
 */
-class UpdateRequest
-    : private cppu::BaseMutex,
-      public UpdateRequestInterfaceBase
+class UpdateRequest final
+    : public UpdateRequestInterfaceBase
 {
 public:
     UpdateRequest() noexcept;