summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2021-12-25 19:01:25 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-12-27 07:35:15 +0100
commit62a80ea77e950a4bfeb1c826856352274171e285 (patch)
tree37118ed76fb9e716bde1df9ebfa09bef385a0646 /sfx2
parent0c50bf65eff7a2f7b788adb7c9afebb859a0f81b (diff)
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.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/preventduplicateinteraction.hxx8
1 files changed, 3 insertions, 5 deletions
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);