[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/unx

[Tomáš Chvátal (via logerrit)]

 vcl/unx/generic/fontmanager/fontconfig.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 30312e66acb030b24fa4cf327a96fe19c5c571f7
Author:     Tomáš Chvátal <tchvatal at suse.com>
AuthorDate: Wed Sep 11 09:58:43 2019 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Sep 13 09:38:10 2019 +0200

    Check for EMOJI content only on ICU 57 and newer
    
    The older ICU does not have the logic to work with there as it is
    feature of the new icu only:
      http://bugs.icu-project.org/trac/ticket/11802
    
    Change-Id: Icd21be1e20b7cb988e94d107406a4f81d00116a7
    Reviewed-on: https://gerrit.libreoffice.org/78812
    Reviewed-by: Tomáš Chvátal <tchvatal at suse.com>
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index c7bfbb47e9bd..a36dfc868329 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -798,7 +798,11 @@ namespace
 
     bool isEmoji(sal_uInt32 nCurrentChar)
     {
+#if U_ICU_VERSION_MAJOR_NUM >= 57
         return u_hasBinaryProperty(nCurrentChar, UCHAR_EMOJI);
+#else
+	return false;
+#endif
     }
 
     //returns true if the given code-point couldn't possibly be in rLangTag.