diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-12-05 21:25:20 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-12-06 10:03:24 +0100 |
| commit | 9f9347c26531bc084d081f21b43c232f411e2cee (patch) | |
| tree | b66a48327acced540e15d692ba8a1bd84192fafe /basic/source | |
| parent | 15cdcd0346b7aa98d4697edec8aeea9c810efa62 (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')
| -rw-r--r-- | basic/source/inc/namecont.hxx | 6 | ||||
| -rw-r--r-- | basic/source/uno/namecont.cxx | 7 |
2 files changed, 7 insertions, 6 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; diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index b5853950aeef..54b2f8eb1bf1 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -359,12 +359,11 @@ bool VBAScriptListenerContainer::implTypedNotify( const Reference< vba::XVBAScri // Ctor SfxLibraryContainer::SfxLibraryContainer() - : SfxLibraryContainer_BASE( maMutex ) - - , maVBAScriptListeners( maMutex ) + : SfxLibraryContainer_BASE( m_aMutex ) + , maVBAScriptListeners( m_aMutex ) , mnRunningVBAScripts( 0 ) , mbVBACompat( false ) - , maModifiable( *this, maMutex ) + , maModifiable( *this, m_aMutex ) , maNameContainer( new NameContainer(cppu::UnoType<XNameAccess>::get()) ) , mbOldInfoFormat( false ) , mbOasis2OOoFormat( false ) |