diff options
author | Akshay Deep <akshaydeepiitr@gmail.com> | 2016-06-30 15:59:58 +0530 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-07-19 15:54:00 +0000 |
commit | ecb096841a1d7b4d468ba111df4ebafc13134c8e (patch) | |
tree | 206a582dc5c3249f3e8c310fca678899ab1e0938 /scp2 | |
parent | 3b6b0ea6315d77a9715bd2080d2aef0b87f76369 (diff) |
Add Noto Emoji font for emoji support
Change-Id: I57cc123ec5e1f90967e82a60fdea792974054f86
Reviewed-on: https://gerrit.libreoffice.org/26800
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/source/ooo/file_font_ooo.scp | 3 | ||||
-rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index 3ff8daa69699..5475b8d14b10 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -62,6 +62,9 @@ STD_FONT_FILELIST(gid_File_Fnt_SourceCode, "fonts_sourcecode.filelist") STD_FONT_FILELIST(gid_File_Fnt_Carlito, "fonts_carlito.filelist") STD_FONT_FILELIST(gid_File_Fnt_Caladea, "fonts_caladea.filelist") +// Noto Emoji font +STD_FONT_FILELIST(gid_File_Fnt_NotoEmoji, "fonts_notoemoji.filelist") + #endif // fontconfig updates to allow proper use of local fonts diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index dfa159807587..fa3969f33e9b 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -109,6 +109,7 @@ Module gid_Module_Root_Fonts_OOo_Hidden gid_File_Fnt_OpenSans, gid_File_Fnt_SourceSans, gid_File_Fnt_SourceCode, + gid_File_Fnt_NotoEmoji, gid_File_FcLocal_Conf); End #endif |