desktop/source/lib/init.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f8cf2eaba67dc19b4daffc46fabe0fc6bd470ab6
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Nov 4 16:46:21 2024 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Nov 5 11:53:07 2024 +0100
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 <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 01bc3b57a4c9..33c69a580a25 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -5308,9 +5308,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, "");
- OutputDevice::ImplRefreshAllFontData(false);
+ OutputDevice::ImplRefreshAllFontData(true);
}
#endif
}
