[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - scp2/source

[Andras Timar]

 scp2/source/ooo/file_font_ooo.scp |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit b55c5c4aef74dd05acd1f0d84c49067667dfc611
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Oct 24 16:29:23 2013 +0200

    disable Liberation fonts on Windows
    
    Change-Id: Ief9ee02f78f08a3002cc3ced3b9da80fc855aeef
    (cherry picked from commit 88e971fe680b5509e749f5ff74e0d51111098769)

diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index 3ff8daa..618b7b6 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -36,9 +36,11 @@ STD_FONT_FILELIST( gid_File_Fnt_Opensymb, "extras_fonts.filelist" )
 // DejaVu fonts
 STD_FONT_FILELIST(gid_File_Fnt_DejaVu, "fonts_dejavu.filelist")
 
+#ifndef WNT // fdo#62764 - Libreration fonts reportedly cause BSOD on Win7 SP1
 // Liberation fonts
 STD_FONT_FILELIST(gid_File_Fnt_LibSansNarrow, "fonts_liberation_narrow.filelist")
 STD_FONT_FILELIST(gid_File_Fnt_Liberation, "fonts_liberation.filelist")
+#endif
 
 // Gentium fonts
 STD_FONT_FILELIST(gid_File_Fnt_Gentium, "fonts_gentium.filelist")