diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-11-04 16:46:21 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-11-20 13:12:06 +0100 |
| commit | 343232190f1bafd608c574ac85ec27b4f404b79a (patch) | |
| tree | 31f8b4eccaa663265c3be8ef98e954eb47a6e6be /desktop/source | |
| parent | 57d123745a6e07da2a9893540e42b72e55641a59 (diff) | |
use bNewFontLists of true to refetch new font lists
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 <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176823
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/lib/init.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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 } |