incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1202246 - in /incubator/ooo/trunk/main: ooo.lst scp2/source/ooo/file_font_ooo.scp
Date Tue, 15 Nov 2011 15:38:27 GMT
Author: pfg
Date: Tue Nov 15 15:38:26 2011
New Revision: 1202246

URL: http://svn.apache.org/viewvc?rev=1202246&view=rev
Log:
i118600 - IP clearance: Remove liberation fonts. Patch by Andre (af@).

Modified:
    incubator/ooo/trunk/main/ooo.lst
    incubator/ooo/trunk/main/scp2/source/ooo/file_font_ooo.scp

Modified: incubator/ooo/trunk/main/ooo.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ooo.lst?rev=1202246&r1=1202245&r2=1202246&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ooo.lst (original)
+++ incubator/ooo/trunk/main/ooo.lst Tue Nov 15 15:38:26 2011
@@ -15,9 +15,7 @@ http://hg.services.openoffice.org/binari
 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
 2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz
-ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz
 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
 377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt
 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz

Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_font_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_font_ooo.scp?rev=1202246&r1=1202245&r2=1202246&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_font_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_font_ooo.scp Tue Nov 15 15:38:26 2011
@@ -79,61 +79,6 @@ STD_FONT_FILE( gid_File_Fnt_DejaVuSerifC
 #endif 
 
 
-// Liberation fonts
-
-// Liberation Sans Narrow
-#ifndef WITHOUT_FONTS 
-STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Regular, LiberationSansNarrow-Regular.ttf, Liberation
Sans Narrow Regular) 
-STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Bold, LiberationSansNarrow-Bold.ttf, Liberation
Sans Narrow Bold) 
-STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Italic, LiberationSansNarrow-Italic.ttf, Liberation
Sans Narrow Italic) 
-STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_BoldItalic, LiberationSansNarrow-BoldItalic.ttf,
Liberation Sans Narrow Bold Italic) 
-#endif
-
-// Liberation Mono
-#ifndef WITHOUT_FONTS 
-#ifndef WNT 
-STD_FONT_FILE( gid_File_Fnt_LiberationMono_Regular, LiberationMono-Regular.ttf, Liberation
Mono Regular) 
-STD_FONT_FILE( gid_File_Fnt_LiberationMono_Bold, LiberationMono-Bold.ttf, Liberation Mono
Bold) 
-STD_FONT_FILE( gid_File_Fnt_LiberationMono_Italic, LiberationMono-Italic.ttf, Liberation
Mono Italic) 
-STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic.ttf, Liberation
Mono Bold Italic) 
-#endif
-#endif
-
-// Liberation Sans
-#ifndef WITHOUT_FONTS 
-#ifndef WNT 
-STD_FONT_FILE( gid_File_Fnt_LiberationSans_Regular, LiberationSans-Regular.ttf, Liberation
Sans Regular) 
-STD_FONT_FILE( gid_File_Fnt_LiberationSans_Italic, LiberationSans-Italic.ttf, Liberation
Sans Italic) 
-STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, Liberation Serif
Bold) 
-STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic.ttf, Liberation
Sans Bold Italic) 
-#endif
-#endif
-
-// Liberation Serif
-#ifndef WITHOUT_FONTS 
-#ifndef WNT 
-STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Regular, LiberationSerif-Regular.ttf, Liberation
Serif Regular) 
-STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Bold, LiberationSerif-Bold.ttf, Liberation Serif
Bold) 
-STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Italic, LiberationSerif-Italic.ttf, Liberation
Serif Italic) 
-STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation
Serif Bold Italic) 
-#endif
-#endif
-
-// Gentium fonts
-
-#ifndef WITHOUT_FONTS 
-STD_FONT_FILE( gid_File_Fnt_GentiumBasicRegular, GenBasR.ttf, Gentium Basic)
-STD_FONT_FILE( gid_File_Fnt_GentiumBasicBold, GenBasB.ttf, Gentium Basic Bold)
-STD_FONT_FILE( gid_File_Fnt_GentiumBasicItalic, GenBasI.ttf, Gentium Basic Bold)
-STD_FONT_FILE( gid_File_Fnt_GentiumBasicBoldItalic, GenBasBI.ttf, Gentium Basic Bold Italic)
-#endif 
-
-#ifndef WITHOUT_FONTS 
-STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicRegular, GenBkBasR.ttf, Gentium Book Basic)
-STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBold, GenBkBasB.ttf, Gentium Book Basic Bold)
-STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicItalic, GenBkBasI.ttf, Gentium Book Basic Bold)
-STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBoldItalic, GenBkBasBI.ttf, Gentium Book Basic
Bold Italic)
-#endif 
 
 // fontconfig updates to allow proper use of local fonts
 



Mime
View raw message