From 343232190f1bafd608c574ac85ec27b4f404b79a Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 4 Nov 2024 16:46:21 +0000 Subject: use bNewFontLists of true to refetch new font lists MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit which becomes more obviously required since: commit d85cb3832286ae1fdcf4a8494abb8212f21e4e9a CommitDate: Fri Feb 2 22:47:28 2024 +0100 preload: open and close empty documents of main types in preinit. because since then SdModule has called GetVirtualRefDevice to create the long-life virtual device that is used to set the lists of available fonts before "addfonts" has been called to add extra fonts to the kit so impress/draw remains unaware of any changes there. It was actually "true" here before: commit ab612633003c75dfb30664db8cc8924c086a91ee CommitDate: Wed Apr 13 20:09:54 2022 +0200 Follow-up fix to Collabora Online "addfont" handling: avoid assertion failure but its uncertain what assertion is referred to here, perhaps the same assertion as later fixed by: commit d1ed24ba34d422128fd48184dbc3b344b5922d3a CommitDate: Wed Oct 2 16:19:47 2024 +0200 Get SolarMutex before calling ImplClearAllFontData Change-Id: Ibc81191ba3b88d9b4def90b6d9662a83295ec9cf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176032 Tested-by: Jenkins CollaboraOffice Reviewed-by: Michael Meeks Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176823 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- desktop/source/lib/init.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'desktop/source') diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index e4c1c15aed12..d6f209c2f1b8 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -5279,9 +5279,9 @@ static void lo_setOption(LibreOfficeKit* /*pThis*/, const char *pOption, const c SolarMutexGuard aGuard; OutputDevice *pDevice = Application::GetDefaultDevice(); - OutputDevice::ImplClearAllFontData(false); + OutputDevice::ImplClearAllFontData(true); pDevice->AddTempDevFont(sMagicFileName, u""_ustr); - OutputDevice::ImplRefreshAllFontData(false); + OutputDevice::ImplRefreshAllFontData(true); } #endif } -- cgit