tdf#137643 Revert "lock refreshing font data when loading a document"

from tdf#69060, to replace with an alternative solution

This reverts commit 98d71c4e0847797a4ba9229a8e6d832a8a3d5e0f.
and
This reverts commit 64d8e5f8db70f4f913abb902b41f4cff8dd1cdad.

Change-Id: I384e994b54aa1bfc735c6ab591b9b1410058451f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104716
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

2 files changed, 1 insertions, 36 deletions

diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 150caea518ee..3ee9413edf7f 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1038,11 +1038,6 @@ void Application::RemoveUserEvent( ImplSVEvent * nUserEvent )
     }
 }
 
-void Application::LockFontUpdates(bool bLock)
-{
-    OutputDevice::LockFontUpdates(bLock);
-}
-
 vcl::Window* Application::GetFocusWindow()
 {
     return ImplGetSVData()->mpWinData->mpFocusWin;
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index a5301e3a594a..faaff5682df5 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -543,16 +543,7 @@ void OutputDevice::ImplClearAllFontData(bool bNewFontLists)
 
 void OutputDevice::ImplRefreshAllFontData(bool bNewFontLists)
 {
-    auto svdata = ImplGetSVData();
-    DBG_TESTSOLARMUTEX();
-    if (!svdata->mnFontUpdatesLockCount)
-        ImplUpdateFontDataForAllFrames(&OutputDevice::ImplRefreshFontData, bNewFontLists);
-    else
-    {
-        svdata->mbFontUpdatesPending = true;
-        if (bNewFontLists)
-            svdata->mbFontUpdatesNewLists = true;
-    }
+    ImplUpdateFontDataForAllFrames( &OutputDevice::ImplRefreshFontData, bNewFontLists );
 }
 
 void OutputDevice::ImplUpdateAllFontData(bool bNewFontLists)
@@ -598,27 +589,6 @@ void OutputDevice::ImplUpdateFontDataForAllFrames( const FontUpdateHandler_t pHd
     }
 }
 
-void OutputDevice::LockFontUpdates(bool bLock)
-{
-    auto svdata = ImplGetSVData();
-    DBG_TESTSOLARMUTEX();
-    if (bLock)
-    {
-        ++svdata->mnFontUpdatesLockCount;
-    }
-    else if (svdata->mnFontUpdatesLockCount > 0)
-    {
-        --svdata->mnFontUpdatesLockCount;
-        if (!svdata->mnFontUpdatesLockCount && svdata->mbFontUpdatesPending)
-        {
-            ImplRefreshAllFontData(svdata->mbFontUpdatesNewLists);
-
-            svdata->mbFontUpdatesPending = false;
-            svdata->mbFontUpdatesNewLists = false;
-        }
-    }
-}
-
 void OutputDevice::BeginFontSubstitution()
 {
     ImplSVData* pSVData = ImplGetSVData();