sd/source/ui/annotations/annotationmanager.cxx |
5 ++---
sd/source/ui/annotations/annotationmanagerimpl.hxx |
9 ++++-----
sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx |
3 +--
sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx |
10 ++++------
4 files changed, 11 insertions(+), 16 deletions(-)
New commits:
commit 0f3d19d2ce953b5e2883ecb51643fd3c47bf7ec7
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon Dec 27 09:57:57 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Dec 27 13:28:44 2021 +0100
use comphelper::WeakComponentImplHelper in GenericConfigurationChangeRequest
Change-Id: Iab037f7fe008dc4662f8d5b403f54c39facaa2d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127554
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git
a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
index 45110742b543..fa6d415034c8 100644
--- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
+++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
@@ -34,8 +34,7 @@ namespace sd::framework {
GenericConfigurationChangeRequest::GenericConfigurationChangeRequest (
const Reference<XResourceId>& rxResourceId,
const Mode eMode)
- : GenericConfigurationChangeRequestInterfaceBase(m_aMutex),
- mxResourceId(rxResourceId),
+ : mxResourceId(rxResourceId),
meMode(eMode)
{
if ( ! rxResourceId.is() || rxResourceId->getResourceURL().isEmpty())
diff --git
a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
index 347354bf32e4..3caa7a8cacfb 100644
--- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
+++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
@@ -21,15 +21,14 @@
#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 com::sun::star::drawing::framework { class XResourceId; }
namespace sd::framework {
-typedef ::cppu::WeakComponentImplHelper <
+typedef comphelper::WeakComponentImplHelper <
css::drawing::framework::XConfigurationChangeRequest,
css::container::XNamed
> GenericConfigurationChangeRequestInterfaceBase;
@@ -40,9 +39,8 @@ typedef ::cppu::WeakComponentImplHelper <
example this is the case when the deactivation of a unique resource is
requested: the resources linked to it have to be deactivated as well.
*/
-class GenericConfigurationChangeRequest
- : private cppu::BaseMutex,
- public GenericConfigurationChangeRequestInterfaceBase
+class GenericConfigurationChangeRequest final
+ : public GenericConfigurationChangeRequestInterfaceBase
{
public:
/** This enum specified whether the activation or deactivation of a
commit 3a7e36eff37070a4626184bf0af479aef6292d8e
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon Dec 27 09:55:49 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Dec 27 13:28:26 2021 +0100
use comphelper::WeakComponentImplHelper in AnnotationManagerImpl
Change-Id: Iab6dc63a9b05e096118fb948ec535269b74812ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127553
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sd/source/ui/annotations/annotationmanager.cxx
b/sd/source/ui/annotations/annotationmanager.cxx
index c59dc3f9eabb..cfa4a6048eca 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -164,8 +164,7 @@ OUString getAnnotationDateTimeString( const Reference<
XAnnotation >& xAnnotatio
}
AnnotationManagerImpl::AnnotationManagerImpl( ViewShellBase& rViewShellBase )
-: AnnotationManagerImplBase( m_aMutex )
-, mrBase( rViewShellBase )
+: mrBase( rViewShellBase )
, mpDoc( rViewShellBase.GetDocument() )
, mbShowAnnotations( true )
, mnUpdateTagsEvent( nullptr )
@@ -200,7 +199,7 @@ void AnnotationManagerImpl::init()
}
// WeakComponentImplHelper
-void SAL_CALL AnnotationManagerImpl::disposing ()
+void AnnotationManagerImpl::disposing (std::unique_lock<std::mutex>&)
{
try
{
diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx
b/sd/source/ui/annotations/annotationmanagerimpl.hxx
index 63e6ead48fd3..740e1acb6936 100644
--- a/sd/source/ui/annotations/annotationmanagerimpl.hxx
+++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx
@@ -23,8 +23,7 @@
#include <rtl/ustring.hxx>
-#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase.hxx>
+#include <comphelper/compbase.hxx>
#include "annotationtag.hxx"
@@ -45,11 +44,11 @@ namespace tools {
class EventMultiplexerEvent;
}
-typedef ::cppu::WeakComponentImplHelper <
+typedef comphelper::WeakComponentImplHelper <
css::document::XEventListener
> AnnotationManagerImplBase;
-class AnnotationManagerImpl : private ::cppu::BaseMutex, public
AnnotationManagerImplBase
+class AnnotationManagerImpl : public AnnotationManagerImplBase
{
public:
explicit AnnotationManagerImpl( ViewShellBase& rViewShellBase );
@@ -57,7 +56,7 @@ public:
void init();
// WeakComponentImplHelper
- virtual void SAL_CALL disposing () override;
+ virtual void disposing (std::unique_lock<std::mutex>&) override;
// XEventListener
virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event
) override;
