summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2021-12-25 18:53:42 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-12-27 07:36:38 +0100
commitbde743f7455f1b714e3fb495ef45ee00361484cb (patch)
tree5d12475e62994f529fc1d371a9a705e7ff028ac5 /ucb
parent34cbc302e3899fbacea01e27c66d3fd0bed4ac0d (diff)
use comphelper::WeakComponentImplHelper in UcbCommandEnvironment
Change-Id: Ic27f2554613e159094be4c180647c2e59f57e00e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127522 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/core/cmdenv.cxx2
-rw-r--r--ucb/source/core/cmdenv.hxx7
2 files changed, 4 insertions, 5 deletions
diff --git a/ucb/source/core/cmdenv.cxx b/ucb/source/core/cmdenv.cxx
index 0ea51438c920..9189f0e0f0aa 100644
--- a/ucb/source/core/cmdenv.cxx
+++ b/ucb/source/core/cmdenv.cxx
@@ -36,7 +36,7 @@ using namespace ucb_cmdenv;
// UcbCommandEnvironment Implementation.
-UcbCommandEnvironment::UcbCommandEnvironment() : UcbCommandEnvironment_Base(m_aMutex)
+UcbCommandEnvironment::UcbCommandEnvironment()
{
}
diff --git a/ucb/source/core/cmdenv.hxx b/ucb/source/core/cmdenv.hxx
index f70e71549429..8896cab85fe1 100644
--- a/ucb/source/core/cmdenv.hxx
+++ b/ucb/source/core/cmdenv.hxx
@@ -19,8 +19,7 @@
#pragma once
-#include <cppuhelper/compbase.hxx>
-#include <cppuhelper/basemutex.hxx>
+#include <comphelper/compbase.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -30,11 +29,11 @@
namespace ucb_cmdenv {
-using UcbCommandEnvironment_Base = cppu::WeakComponentImplHelper< css::lang::XInitialization,
+using UcbCommandEnvironment_Base = comphelper::WeakComponentImplHelper< css::lang::XInitialization,
css::lang::XServiceInfo,
css::ucb::XCommandEnvironment >;
-class UcbCommandEnvironment : public cppu::BaseMutex, public UcbCommandEnvironment_Base
+class UcbCommandEnvironment : public UcbCommandEnvironment_Base
{
css::uno::Reference< css::task::XInteractionHandler > m_xIH;
css::uno::Reference< css::ucb::XProgressHandler > m_xPH;