Kaydet (Commit) 64d8e5f8 authored tarafından Mike Kaganski's avatar Mike Kaganski

Don't use own redundant mutex, since it's guarded by SolarMutex

Change-Id: Ie93519c6e0363344baf91bb2792f9da2cd13df7d
Reviewed-on: https://gerrit.libreoffice.org/66294Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
Tested-by: Jenkins
üst 267164a8
......@@ -595,18 +595,10 @@ void OutputDevice::ImplClearAllFontData(bool bNewFontLists)
}
}
namespace {
osl::Mutex& GetFontUpdatesLockMutex()
{
static osl::Mutex aFontUpdatesMutex;
return aFontUpdatesMutex;
}
}
void OutputDevice::ImplRefreshAllFontData(bool bNewFontLists)
{
auto svdata = ImplGetSVData();
osl::MutexGuard aGuard(GetFontUpdatesLockMutex());
DBG_TESTSOLARMUTEX();
if (!svdata->mnFontUpdatesLockCount)
ImplUpdateFontDataForAllFrames(&OutputDevice::ImplRefreshFontData, bNewFontLists);
else
......@@ -663,7 +655,7 @@ void OutputDevice::ImplUpdateFontDataForAllFrames( const FontUpdateHandler_t pHd
void OutputDevice::LockFontUpdates(bool bLock)
{
auto svdata = ImplGetSVData();
osl::MutexGuard aGuard(GetFontUpdatesLockMutex());
DBG_TESTSOLARMUTEX();
if (bLock)
{
++svdata->mnFontUpdatesLockCount;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment