diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-10-08 15:21:07 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-10-08 15:46:06 +0200 |
| commit | fca62934f492125ea6728fd6d09f0c66c9e4fa69 (patch) | |
| tree | 82d3bc36d945e9c3fd5862c516975d666b3e1679 | |
| parent | 26b79470cabb191c3291789f99d8737da1a4fbab (diff) | |
basic: use SolarMutex to lock SfxLibraryContainer
Originally this used both SolarMutex and an own mutex, then a deadlock
was resolved in 2fe6a4a34b38c05e252c71f4d2f18e4a90e61b29 by not locking
SolarMutex.
Since the class will call event listeners without dropping the mutex
e.g. in insertNoCheck(), using the SolarMutex appears better anyway.
With this, installing a BASIC extension no longer triggers SolarMutex
asserts in SfxBroadcaster.
Change-Id: Ib9a2ee491ef53b1a53855af0fc22e863c5e7cb91
| -rw-r--r-- | basic/source/uno/namecont.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 55d732705b24..db22aef5a886 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -417,13 +417,13 @@ void SfxLibraryContainer::checkDisposed() const void SfxLibraryContainer::enterMethod() { - maMutex.acquire(); + Application::GetSolarMutex().acquire(); checkDisposed(); } void SfxLibraryContainer::leaveMethod() { - maMutex.release(); + Application::GetSolarMutex().release(); } BasicManager* SfxLibraryContainer::getBasicManager() |