[Libreoffice-commits] core.git: vcl/source

[Khaled Hosny (via logerrit)]

 vcl/source/fontsubset/sft.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit ff869c52899a4e54b5bd4bbaee81adc79705200f
Author:     Khaled Hosny <kha...@aliftype.com>
AuthorDate: Sat Sep 10 22:56:43 2022 +0200
Commit:     خالد حسني <kha...@aliftype.com>
CommitDate: Sun Sep 11 00:03:49 2022 +0200

    vcl: Fix setting symbol flag on TrueTypeFont
    
    This is a fallout from:
    
    commit 8597aed8a8576ad0f6efe139ff03556217b01b31
    Author: Khaled Hosny <kha...@aliftype.com>
    Date:   Thu Sep 8 02:05:14 2022 +0200
    
        vcl: Get FontCharMap from HarfBuzz
    
    The intent was to set m_bIsSymbolFont from m_xCharMap if provided, but
    the else branch went missing.
    
    Change-Id: I7c7a5a65b8ae78ec6e6d53397dc0e4fbda974e5e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139758
    Tested-by: Jenkins
    Reviewed-by: خالد حسني <kha...@aliftype.com>

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 93c09b31f0c5..710172fbd8de 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1299,8 +1299,10 @@ SFErrCodes AbstractTrueTypeFont::indexGlyphData()
     if (!m_xCharMap.is())
     {
         table = this->table(O_cmap, table_size);
-        m_bIsSymbolFont = HasSymbolCmap(reinterpret_cast<const unsigned 
char*>(table), table_size);
+        m_bIsSymbolFont = HasSymbolCmap(table, table_size);
     }
+    else
+        m_bIsSymbolFont = m_xCharMap->isSymbolic();
 
     return SFErrCodes::Ok;
 }