cppcanvas/source/uno/uno_mtfrenderer.cxx | 9 ++++-----
sfx2/inc/preventduplicateinteraction.hxx | 8 +++-----
2 files changed, 7 insertions(+), 10 deletions(-)
New commits:
commit 62a80ea77e950a4bfeb1c826856352274171e285
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Dec 25 19:01:25 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Dec 27 07:35:15 2021 +0100
use comphelper::WeakComponentImplHelper in WarningDialogsParent
Change-Id: I952924973f27387a64c8c7f48506081099592f67
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127524
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sfx2/inc/preventduplicateinteraction.hxx
b/sfx2/inc/preventduplicateinteraction.hxx
index f5a92ca7dd36..a5eb448eca60 100644
--- a/sfx2/inc/preventduplicateinteraction.hxx
+++ b/sfx2/inc/preventduplicateinteraction.hxx
@@ -28,7 +28,7 @@
#include <com/sun/star/task/XInteractionHandler2.hpp>
#include <com/sun/star/task/XInteractionRequest.hpp>
-#include <cppuhelper/compbase.hxx>
+#include <comphelper/compbase.hxx>
#include <cppuhelper/implbase.hxx>
#include <toolkit/helper/vclunohelper.hxx>
@@ -56,10 +56,9 @@ inline void closedialogs(SystemWindow& rTopLevel, bool
bCloseRoot)
// If there are dialog children open on exit then veto termination,
// close the topmost dialog and retry termination.
class WarningDialogsParent final :
- public cppu::WeakComponentImplHelper<css::frame::XTerminateListener>
+ public comphelper::WeakComponentImplHelper<css::frame::XTerminateListener>
{
private:
- osl::Mutex m_aLock;
VclPtr<WorkWindow> m_xWin;
css::uno::Reference<css::awt::XWindow> m_xInterface;
@@ -77,7 +76,7 @@ private:
public:
- using cppu::WeakComponentImplHelperBase::disposing;
+ using comphelper::WeakComponentImplHelperBase::disposing;
virtual void SAL_CALL disposing(const css::lang::EventObject&) override
{
}
@@ -96,7 +95,6 @@ public:
public:
WarningDialogsParent()
- :
cppu::WeakComponentImplHelper<css::frame::XTerminateListener>(m_aLock)
{
SolarMutexGuard aSolarGuard;
m_xWin = VclPtr<WorkWindow>::Create(nullptr, WB_STDWORK);
commit 0c50bf65eff7a2f7b788adb7c9afebb859a0f81b
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Dec 25 18:55:33 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Dec 27 07:35:06 2021 +0100
use comphelper::WeakComponentImplHelper in MtfRenderer
Change-Id: I54812a5db5d69a158b93ea1b89db47eb6f996ba7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127523
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/cppcanvas/source/uno/uno_mtfrenderer.cxx
b/cppcanvas/source/uno/uno_mtfrenderer.cxx
index 76037892b4d0..a531e0938f9f 100644
--- a/cppcanvas/source/uno/uno_mtfrenderer.cxx
+++ b/cppcanvas/source/uno/uno_mtfrenderer.cxx
@@ -13,17 +13,16 @@
#include <com/sun/star/rendering/XBitmapCanvas.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/beans/XFastPropertySet.hpp>
-#include <cppuhelper/compbase.hxx>
-#include <cppuhelper/basemutex.hxx>
+#include <comphelper/compbase.hxx>
#include <vcl/gdimtf.hxx>
using namespace ::com::sun::star;
-typedef cppu::WeakComponentImplHelper<css::rendering::XMtfRenderer,
css::beans::XFastPropertySet> MtfRendererBase;
+typedef comphelper::WeakComponentImplHelper<css::rendering::XMtfRenderer,
css::beans::XFastPropertySet> MtfRendererBase;
namespace {
-class MtfRenderer : private cppu::BaseMutex, public MtfRendererBase
+class MtfRenderer : public MtfRendererBase
{
public:
MtfRenderer (css::uno::Sequence<css::uno::Any> const& args,
@@ -67,7 +66,7 @@ void MtfRenderer::setFastPropertyValue( sal_Int32 nHandle,
const uno::Any& aAny)
}
}
-MtfRenderer::MtfRenderer (uno::Sequence<uno::Any> const& aArgs,
uno::Reference<uno::XComponentContext> const&) : MtfRendererBase (m_aMutex),
mpMetafile (nullptr)
+MtfRenderer::MtfRenderer (uno::Sequence<uno::Any> const& aArgs,
uno::Reference<uno::XComponentContext> const&) : mpMetafile (nullptr)
{
if( aArgs.getLength() == 1 ) {
aArgs[0] >>= mxCanvas;
