diff options
| author | Akshay Deep <akshaydeepiitr@gmail.com> | 2016-11-26 02:26:30 +0530 |
|---|---|---|
| committer | Akshay Deep <akshaydeepiitr@gmail.com> | 2016-11-30 13:45:18 +0000 |
| commit | 8266787540b64396d6f0864a9d2bced0e40a8f1b (patch) | |
| tree | 70b4275d645b6f14e23980017858436261a31b45 /scp2 | |
| parent | dbdf91f93ee975b1b9b6bfc6d9571e13ca0e750e (diff) | |
EMOJI CONTROL: Add EmojiOne font for Emoji Support
Noto Emoji does not provide glyphs for all emojis in the toolbar
Change-Id: If3f3ea6e12f0b8824cb95e3db78c3c7aced4de8b
Reviewed-on: https://gerrit.libreoffice.org/31215
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 9e422bc19144ce3f0645e49450428802eab1abba)
Reviewed-on: https://gerrit.libreoffice.org/31359
Reviewed-by: Akshay Deep <akshaydeepiitr@gmail.com>
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 5475b8d14b10..b552fd271b26 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -65,6 +65,9 @@ STD_FONT_FILELIST(gid_File_Fnt_Caladea, "fonts_caladea.filelist") // Noto Emoji font STD_FONT_FILELIST(gid_File_Fnt_NotoEmoji, "fonts_notoemoji.filelist") +// EmojiOne_Color font +STD_FONT_FILELIST(gid_File_Fnt_EmojiOne_Color, "fonts_emojione_color.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 fa3969f33e9b..055e5545c545 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -110,6 +110,7 @@ Module gid_Module_Root_Fonts_OOo_Hidden gid_File_Fnt_SourceSans, gid_File_Fnt_SourceCode, gid_File_Fnt_NotoEmoji, + gid_File_Fnt_EmojiOne_Color, gid_File_FcLocal_Conf); End #endif |