[Libreoffice-commits] core.git: vcl/source

[Libreoffice Gerrit user]

 vcl/source/outdev/font.cxx |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 64d8e5f8db70f4f913abb902b41f4cff8dd1cdad
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Mon Jan 14 12:50:01 2019 +0100
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Mon Jan 14 14:18:53 2019 +0100

    Don't use own redundant mutex, since it's guarded by SolarMutex
    
    Change-Id: Ie93519c6e0363344baf91bb2792f9da2cd13df7d
    Reviewed-on: https://gerrit.libreoffice.org/66294
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Jenkins

diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 4d982e9d1f3a..04e689a17f67 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -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;