diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-17 22:42:53 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2022-02-14 11:25:37 +0100 |
commit | 204c348d282cfaa413ab72081c0e04f965aff12b (patch) | |
tree | 57175a0367e4ffc55225a2ec5f12ae2d3e8a7e0d /ucb | |
parent | 71f1d3c9304cd6051119da8d66d2367553ecf277 (diff) |
use more cppu::BaseMutex
Change-Id: Iddd7438161ead93b27cf8e8058ca5b1eae3d8001
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127075
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ucb')
-rw-r--r-- | ucb/source/ucp/expand/ucpexpand.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx index aa2f7a87dd2e..5b880a3d2a4d 100644 --- a/ucb/source/ucp/expand/ucpexpand.cxx +++ b/ucb/source/ucp/expand/ucpexpand.cxx @@ -22,6 +22,7 @@ #include <osl/mutex.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/factory.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implementationentry.hxx> #include <cppuhelper/supportsservice.hxx> #include <ucbhelper/content.hxx> @@ -41,16 +42,11 @@ using namespace ::com::sun::star; namespace { -struct MutexHolder -{ - mutable ::osl::Mutex m_mutex; -}; - typedef ::cppu::WeakComponentImplHelper< lang::XServiceInfo, ucb::XContentProvider > t_impl_helper; -class ExpandContentProviderImpl : protected MutexHolder, public t_impl_helper +class ExpandContentProviderImpl : protected cppu::BaseMutex, public t_impl_helper { uno::Reference< uno::XComponentContext > m_xComponentContext; uno::Reference< util::XMacroExpander > m_xMacroExpander; @@ -64,7 +60,7 @@ protected: public: explicit ExpandContentProviderImpl( uno::Reference< uno::XComponentContext > const & xComponentContext ) - : t_impl_helper( m_mutex ), + : t_impl_helper( m_aMutex ), m_xComponentContext( xComponentContext ), m_xMacroExpander( util::theMacroExpander::get(xComponentContext) ) {} |