summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2015-09-18 14:24:51 +0200
committerAndras Timar <andras.timar@collabora.com>2017-02-28 10:54:22 +0100
commit915704b3f388dd7fd157c8715d3afc336a3ec54f (patch)
tree0bef0ab1c40c809b10fb291d8b66389a56d789e0 /scp2
parent9952fedd1d2ec196ef8ddb59817101b833e70ec4 (diff)
Bundle Karla font
(cherry picked from commit 21dc27ab7834fe4d5783a9f4bd412c08cacc26b4) Change-Id: I666665c801367ff760b14b9f474952e9894b4791
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/file_font_ooo.scp3
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp1
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 3e123c7b4724..a606bf0366fd 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -67,6 +67,9 @@ STD_FONT_FILELIST(gid_File_Fnt_Caladea, "fonts_caladea.filelist")
// EmojiOne_Color font
STD_FONT_FILELIST(gid_File_Fnt_EmojiOne_Color, "fonts_emojione_color.filelist")
+//Karla fonts
+STD_FONT_FILELIST(gid_File_Fnt_Karla, "fonts_karla.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 a725b65bbba5..fda0c6a4d11c 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -102,6 +102,7 @@ Module gid_Module_Root_Fonts_OOo_Hidden
gid_File_Fnt_Carlito,
gid_File_Fnt_DejaVu,
gid_File_Fnt_Gentium,
+ gid_File_Fnt_Karla,
gid_File_Fnt_LibSansNarrow,
gid_File_Fnt_Liberation,
gid_File_Fnt_LinuxLibertineG,