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

[Andras Timar]

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

New commits:
commit 95506a57ddb5918db3052e90d11ca8ad0ae31d2d
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Oct 2 06:00:12 2013 -0700

    disable Liberation fonts on Windows
    
    Change-Id: Ida3e242fa6197d452cef66c692daf70efe3cbf5b

diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index 0781dfc..c438859 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -79,6 +79,7 @@ STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, DejaVuSerifCondense
 #endif 
 
 
+#ifndef WNT // fdo#62764 - Libreration fonts reportedly cause BSOD on Win7 SP1
 // Liberation fonts
 
 // Liberation Sans Narrow
@@ -113,6 +114,8 @@ STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Italic, LiberationSerif-Italic.ttf,
 STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic) 
 #endif
 
+#endif
+
 // Gentium fonts
 
 #ifndef WITHOUT_FONTS