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

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

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

New commits:
commit 39b8846276e82a50625a08dfddec34de67ca71c8
Author:     Tomáš Chvátal <tchvatal at suse.com>
AuthorDate: Wed Sep 11 09:58:43 2019 +0200
Commit:     Tomáš Chvátal <tchvatal at suse.com>
CommitDate: Wed Sep 11 10:55:44 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/78811
    Tested-by: Jenkins
    Reviewed-by: Tomáš Chvátal <tchvatal at suse.com>

diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 2767cafcf07f..bfa487153321 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -800,7 +800,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.