svx/inc/sdr/primitive2d/primitivefactory2d.hxx | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
New commits:
commit d1e270557a62bfe81f63a72b6802a11eff9e047d
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Fri Dec 24 11:54:21 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Dec 24 13:52:13 2021 +0100
use comphelper::WeakComponentImplHelper in PrimitiveFactory2D
Change-Id: Iead37062710d64705fca2d00404922b3ad3b6f17
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127409
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/svx/inc/sdr/primitive2d/primitivefactory2d.hxx
b/svx/inc/sdr/primitive2d/primitivefactory2d.hxx
index fd6ded05ab18..1fa65d52e01a 100644
--- a/svx/inc/sdr/primitive2d/primitivefactory2d.hxx
+++ b/svx/inc/sdr/primitive2d/primitivefactory2d.hxx
@@ -21,8 +21,7 @@
#include <com/sun/star/graphic/XPrimitiveFactory2D.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase.hxx>
+#include <comphelper/compbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdpage.hxx>
@@ -30,17 +29,15 @@
#include <svx/sdr/contact/viewcontact.hxx>
#include <comphelper/sequence.hxx>
-typedef cppu::WeakComponentImplHelper<css::graphic::XPrimitiveFactory2D,
css::lang::XServiceInfo>
+typedef comphelper::WeakComponentImplHelper<css::graphic::XPrimitiveFactory2D,
+ css::lang::XServiceInfo>
PrimitiveFactory2DImplBase;
// base class for C++ implementation of css::graphic::XPrimitiveFactory2D
-class PrimitiveFactory2D : protected cppu::BaseMutex, public
PrimitiveFactory2DImplBase
+class PrimitiveFactory2D final : public PrimitiveFactory2DImplBase
{
public:
- PrimitiveFactory2D()
- : PrimitiveFactory2DImplBase(m_aMutex)
- {
- }
+ PrimitiveFactory2D() {}
// Methods from XPrimitiveFactory2D
virtual css::uno::Sequence<css::uno::Reference<css::graphic::XPrimitive2D>>
