Author: hdu
Date: Tue Mar 20 13:02:58 2012
New Revision: 1302867
URL: http://svn.apache.org/viewvc?rev=1302867&view=rev
Log:
#i119096# remove category-x licensed tango theme
Removed:
incubator/ooo/trunk/main/ooo_custom_images/tango/
Modified:
incubator/ooo/trunk/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs
incubator/ooo/trunk/main/packimages/pack/makefile.mk
incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp
Modified:
incubator/ooo/trunk/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs?rev=1302867&r1=1302866&r2=1302867&view=diff
==============================================================================
---
incubator/ooo/trunk/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs
(original)
+++
incubator/ooo/trunk/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs
Tue Mar 20 13:02:58 2012
@@ -5627,11 +5627,6 @@
<desc>Industrial</desc>
</info>
</enumeration>
- <enumeration oor:value="tango">
- <info>
- <desc>Tango - the Gnome
default theme</desc>
- </info>
- </enumeration>
<enumeration oor:value="classic">
<info>
<desc>Classic - the
OpenOffice.org 2.0 default theme</desc>
Modified: incubator/ooo/trunk/main/packimages/pack/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/packimages/pack/makefile.mk?rev=1302867&r1=1302866&r2=1302867&view=diff
==============================================================================
--- incubator/ooo/trunk/main/packimages/pack/makefile.mk (original)
+++ incubator/ooo/trunk/main/packimages/pack/makefile.mk Tue Mar 20 13:02:58
2012
@@ -33,10 +33,9 @@ RSCCUSTOMIMG*=$(PRJ)
IMAGES := $(COMMONBIN)$/images.zip
SORTED_LIST=$(RES)$/img$/sorted.lst
# Custom sets, at 24x24 & 16x16 fall-back to industrial preferentially
-CUSTOM_IMAGE_SETS=hicontrast industrial tango classic
+CUSTOM_IMAGE_SETS=hicontrast industrial classic
CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i)
-CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/tango
-CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/ooo_custom_images$/industrial
+CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/industrial
CLASSIC_TARBALL=$(SOLARSRC)$/ooo_custom_images$/classic/classic_images.tar.gz
Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp?rev=1302867&r1=1302866&r2=1302867&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp Tue Mar 20 13:02:58
2012
@@ -1778,13 +1778,6 @@ File gid_File_ImagesIndustrial_Zip
Styles = (PACKED);
End
-File gid_File_ImagesTango_Zip
- TXT_FILE_BODY;
- Dir = gid_Dir_Share_Config;
- Name = "images_tango.zip";
- Styles = (PACKED);
-End
-
File gid_File_ImagesClassic8_Zip
TXT_FILE_BODY;
Dir = gid_Dir_Share_Config;
