diff options
author | Tor Lillqvist <tml@collabora.com> | 2022-04-13 16:50:17 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2022-04-13 21:57:52 +0200 |
commit | 126e1d15fd8764fe95c1df5de28a6149c0b3d380 (patch) | |
tree | 3cbca133b7439d750418c7120cbb138f70370106 | |
parent | lok: unit test for invalid entry save (diff) | |
download | core-126e1d15fd8764fe95c1df5de28a6149c0b3d380.tar.gz core-126e1d15fd8764fe95c1df5de28a6149c0b3d380.zip |
Follow-up fix to Collabora Online "addfont" handling: avoid assertion failure
Change-Id: Ib75954a39d515088dbd432d0aa0ca5893194ecc6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132969
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
-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 8f991c37f818..392441079820 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -4164,9 +4164,9 @@ static void lo_setOption(LibreOfficeKit* /*pThis*/, const char *pOption, const c else if (strcmp(pOption, "addfont") == 0) { OutputDevice *pDevice = Application::GetDefaultDevice(); - OutputDevice::ImplClearAllFontData(true); + OutputDevice::ImplClearAllFontData(false); pDevice->AddTempDevFont(OUString::fromUtf8(OString(pValue)), ""); - OutputDevice::ImplRefreshAllFontData(true); + OutputDevice::ImplRefreshAllFontData(false); } } |