[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - desktop/source

[Tor Lillqvist (via logerrit)]

 desktop/source/lib/init.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 969ff3427835ba730b24e23c6f370e9206b7870a
Author:     Tor Lillqvist <t...@collabora.com>
AuthorDate: Fri Sep 16 11:26:07 2022 +0300
Commit:     Tor Lillqvist <t...@collabora.com>
CommitDate: Mon Sep 19 10:46:00 2022 +0200

    Ignore also when a font has been substituted by itself with an empty style
    
    Change-Id: I40fbce716a11b010323ac07e0dacdc114f7d2320
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140056
    Tested-by: Tor Lillqvist <t...@collabora.com>
    Reviewed-by: Tor Lillqvist <t...@collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 7342e57caeb8..4eed88331948 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2663,7 +2663,8 @@ static LibreOfficeKitDocument* 
lo_documentLoadWithOptions(LibreOfficeKit* pThis,
 
                                 if (x.mOriginalFont.indexOf('/') == -1)
                                     for (const auto &j : x.mUsedFonts)
-                                        if 
(j.startsWith(OUStringConcatenation(x.mOriginalFont + "/")))
+                                        if (j == x.mOriginalFont ||
+                                            
j.startsWith(OUStringConcatenation(x.mOriginalFont + "/")))
                                             return true;
 
                                 return false;