ucb/source/core/provprox.cxx | 2 +- ucb/source/core/provprox.hxx | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-)
New commits: commit 34cbc302e3899fbacea01e27c66d3fd0bed4ac0d Author: Noel Grandin <noelgran...@gmail.com> AuthorDate: Sat Dec 25 18:52:35 2021 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Mon Dec 27 07:35:38 2021 +0100 use comphelper::WeakComponentImplHelper in UcbContentProviderProxyFactory Change-Id: I60b68c6589ce34673a2435260cd7b75c17b91a69 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127521 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx index 0489123c8294..7af7ba28add2 100644 --- a/ucb/source/core/provprox.cxx +++ b/ucb/source/core/provprox.cxx @@ -37,7 +37,7 @@ using namespace com::sun::star::uno; UcbContentProviderProxyFactory::UcbContentProviderProxyFactory( const Reference< XComponentContext >& rxContext ) -: UcbContentProviderProxyFactory_Base(m_aMutex), m_xContext( rxContext ) +: m_xContext( rxContext ) { } diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx index ccab5781810e..b71fdfe7031c 100644 --- a/ucb/source/core/provprox.hxx +++ b/ucb/source/core/provprox.hxx @@ -28,17 +28,15 @@ #include <com/sun/star/ucb/XParameterizedContentProvider.hpp> #include <com/sun/star/ucb/XContentProviderSupplier.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/compbase.hxx> +#include <comphelper/compbase.hxx> #include <cppuhelper/weak.hxx> -#include <cppuhelper/basemutex.hxx> -#include <mutex> -using UcbContentProviderProxyFactory_Base = cppu::WeakComponentImplHelper < +using UcbContentProviderProxyFactory_Base = comphelper::WeakComponentImplHelper < css::lang::XServiceInfo, css::ucb::XContentProviderFactory >; -class UcbContentProviderProxyFactory : public cppu::BaseMutex, public UcbContentProviderProxyFactory_Base +class UcbContentProviderProxyFactory : public UcbContentProviderProxyFactory_Base { css::uno::Reference< css::uno::XComponentContext > m_xContext;