summaryrefslogtreecommitdiff
path: root/basic/source/inc
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-12-05 21:25:20 +0100
committerMichael Stahl <mstahl@redhat.com>2017-12-06 10:03:24 +0100
commit9f9347c26531bc084d081f21b43c232f411e2cee (patch)
treeb66a48327acced540e15d692ba8a1bd84192fafe /basic/source/inc
parent15cdcd0346b7aa98d4697edec8aeea9c810efa62 (diff)
basic: SfxLibraryContainer: replace maMutex
... with cppu::BaseMutex, because a member cannot ensure the life cycle guarantees expected by WeakComponentImplHelper. Change-Id: Iaa10c699abf69882d917487740db241ba1455e1c
Diffstat (limited to 'basic/source/inc')
-rw-r--r--basic/source/inc/namecont.hxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 1b5d21ebbfd5..cc8d80a8f483 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -190,7 +190,10 @@ typedef ::cppu::WeakComponentImplHelper<
css::script::vba::XVBACompatibility,
css::lang::XServiceInfo > SfxLibraryContainer_BASE;
-class SfxLibraryContainer : public SfxLibraryContainer_BASE, public ::utl::OEventListenerAdapter
+class SfxLibraryContainer
+ : public ::cppu::BaseMutex
+ , public SfxLibraryContainer_BASE
+ , public ::utl::OEventListenerAdapter
{
VBAScriptListenerContainer maVBAScriptListeners;
sal_Int32 mnRunningVBAScripts;
@@ -202,7 +205,6 @@ protected:
css::uno::Reference< css::util::XStringSubstitution > mxStringSubstitution;
css::uno::WeakReference< css::frame::XModel > mxOwnerDocument;
- ::osl::Mutex maMutex;
ModifiableHelper maModifiable;
rtl::Reference<NameContainer> maNameContainer;