incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1201184 - in /incubator/ooo/trunk/main: cui/source/options/ external_images/ packimages/pack/ scp2/source/ooo/ vcl/inc/ vcl/inc/vcl/ vcl/source/app/ vcl/source/window/
Date Sat, 12 Nov 2011 04:05:55 GMT
Author: pfg
Date: Sat Nov 12 04:05:54 2011
New Revision: 1201184

URL: http://svn.apache.org/viewvc?rev=1201184&view=rev
Log:
Revert old change for #i103482# oxygen icon theme - are copyleft.

Removed:
    incubator/ooo/trunk/main/external_images/ooo_oxygen_images-2009-06-17.tar.gz
Modified:
    incubator/ooo/trunk/main/cui/source/options/optgdlg.src
    incubator/ooo/trunk/main/packimages/pack/makefile.mk
    incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp
    incubator/ooo/trunk/main/scp2/source/ooo/module_hidden_ooo.scp
    incubator/ooo/trunk/main/vcl/inc/toolbox.h
    incubator/ooo/trunk/main/vcl/inc/vcl/settings.hxx
    incubator/ooo/trunk/main/vcl/source/app/settings.cxx
    incubator/ooo/trunk/main/vcl/source/window/toolbox2.cxx

Modified: incubator/ooo/trunk/main/cui/source/options/optgdlg.src
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/cui/source/options/optgdlg.src?rev=1201184&r1=1201183&r2=1201184&view=diff
==============================================================================
--- incubator/ooo/trunk/main/cui/source/options/optgdlg.src (original)
+++ incubator/ooo/trunk/main/cui/source/options/optgdlg.src Sat Nov 12 04:05:54 2011
@@ -259,7 +259,6 @@ TabPage OFA_TP_VIEW
             < "Industrial" ; > ;
             < "Crystal" ; > ;
             < "Tango" ; > ;
-            < "Oxygen" ; > ;
             < "Classic" ; > ;
         };
     };

Modified: incubator/ooo/trunk/main/packimages/pack/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/packimages/pack/makefile.mk?rev=1201184&r1=1201183&r2=1201184&view=diff
==============================================================================
--- incubator/ooo/trunk/main/packimages/pack/makefile.mk (original)
+++ incubator/ooo/trunk/main/packimages/pack/makefile.mk Sat Nov 12 04:05:54 2011
@@ -37,13 +37,12 @@ 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 crystal oxygen tango classic
+CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango 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
 
 CRYSTAL_TARBALL=$(SOLARSRC)$/external_images$/ooo_crystal_images-1.tar.gz
-OXYGEN_TARBALL=$(SOLARSRC)$/external_images$/ooo_oxygen_images-2009-06-17.tar.gz
 CLASSIC_TARBALL=$(SOLARSRC)$/ooo_custom_images$/classic/classic_images.tar.gz
 
 ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip
@@ -82,14 +81,6 @@ $(MISC)$/crystal.flag : $(CRYSTAL_TARBAL
 .ENDIF
 	@$(TYPE) $@ || echo "ERROR: unpacking $(CRYSTAL_TARBALL) failed"
 
-# unpack the Oxygen icon set
-$(MISC)$/oxygen.flag : $(OXYGEN_TARBALL)
-	cd $(MISC) && gzip -d -c $(OXYGEN_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
-.IF "$(GUI)"=="UNX"
-	chmod -R g+w $(MISC)$/oxygen
-.ENDIF
-	@$(TYPE) $@ || echo "ERROR: unpacking $(CRYSTAL_TARBALL) failed"
-
 # unpack the classic icon set
 $(MISC)$/classic.flag : $(CLASSIC_TARBALL)
     cd $(MISC) && gunzip -c $(CLASSIC_TARBALL) | ( tar -xf - ) && $(TOUCH)
$(@:f)
@@ -103,7 +94,5 @@ images_hicontrast : $(MISC)$/hicontrast.
 
 images_crystal : $(MISC)$/crystal.flag $(RES)$/img$/commandimagelist.ilst
 
-images_oxygen : $(MISC)$/oxygen.flag $(RES)$/img$/commandimagelist.ilst
-
 images_classic : $(MISC)$/classic.flag $(RES)$/img$/commandimagelist.ilst
 

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=1201184&r1=1201183&r2=1201184&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp Sat Nov 12 04:05:54 2011
@@ -1780,13 +1780,6 @@ File gid_File_ImagesCrystal_Zip
     Styles = (PACKED);
 End
 
-File gid_File_ImagesOxygen_Zip
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Config;
-    Name = "images_oxygen.zip";
-    Styles = (PACKED);
-End
-
 File gid_File_ImagesHicontrast_Zip
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Config;

Modified: incubator/ooo/trunk/main/scp2/source/ooo/module_hidden_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/module_hidden_ooo.scp?rev=1201184&r1=1201183&r2=1201184&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/module_hidden_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/module_hidden_ooo.scp Sat Nov 12 04:05:54 2011
@@ -733,7 +733,6 @@ Module gid_Module_Root_Files_Images
 	Styles = (HIDDEN_ROOT);
 	Files = (gid_File_Images_Zip,
              gid_File_ImagesCrystal_Zip,
-             gid_File_ImagesOxygen_Zip,
              gid_File_ImagesHicontrast_Zip,
              gid_File_ImagesIndustrial_Zip,
              gid_File_ImagesTango_Zip,

Modified: incubator/ooo/trunk/main/vcl/inc/toolbox.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/inc/toolbox.h?rev=1201184&r1=1201183&r2=1201184&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/inc/toolbox.h (original)
+++ incubator/ooo/trunk/main/vcl/inc/toolbox.h Sat Nov 12 04:05:54 2011
@@ -48,7 +48,6 @@
 #define TB_LARGEIMAGESIZE            26
 #define TB_LARGEIMAGESIZE_INDUSTRIAL 24
 #define TB_LARGEIMAGESIZE_CRYSTAL    22
-#define TB_LARGEIMAGESIZE_OXYGEN     22
 
 class Window;
 

Modified: incubator/ooo/trunk/main/vcl/inc/vcl/settings.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/inc/vcl/settings.hxx?rev=1201184&r1=1201183&r2=1201184&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/inc/vcl/settings.hxx (original)
+++ incubator/ooo/trunk/main/vcl/inc/vcl/settings.hxx Sat Nov 12 04:05:54 2011
@@ -487,11 +487,9 @@ private:
 #define STYLE_SYMBOLS_HICONTRAST	((sal_uLong)2)
 #define STYLE_SYMBOLS_INDUSTRIAL	((sal_uLong)3)
 #define STYLE_SYMBOLS_CRYSTAL		((sal_uLong)4)
-#define STYLE_SYMBOLS_TANGO         ((sal_uLong)5)
-#define STYLE_SYMBOLS_OXYGEN        ((sal_uLong)6)
-#define STYLE_SYMBOLS_CLASSIC		((sal_uLong)7)
-#define STYLE_SYMBOLS_THEMES_MAX	((sal_uLong)8)
-
+#define STYLE_SYMBOLS_TANGO		((sal_uLong)5)
+#define STYLE_SYMBOLS_CLASSIC		((sal_uLong)6)
+#define STYLE_SYMBOLS_THEMES_MAX	((sal_uLong)7)
 #define STYLE_CURSOR_NOBLINKTIME    ((sal_uLong)0xFFFFFFFF)
 
 class VCL_DLLPUBLIC StyleSettings

Modified: incubator/ooo/trunk/main/vcl/source/app/settings.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/source/app/settings.cxx?rev=1201184&r1=1201183&r2=1201184&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/source/app/settings.cxx (original)
+++ incubator/ooo/trunk/main/vcl/source/app/settings.cxx Sat Nov 12 04:05:54 2011
@@ -697,7 +697,6 @@ void StyleSettings::Set3DColors( const C
 		case STYLE_SYMBOLS_INDUSTRIAL: return ::rtl::OUString::createFromAscii( "industrial" );
 		case STYLE_SYMBOLS_CRYSTAL:    return ::rtl::OUString::createFromAscii( "crystal" );
 		case STYLE_SYMBOLS_TANGO:      return ::rtl::OUString::createFromAscii( "tango" );
-		case STYLE_SYMBOLS_OXYGEN:     return ::rtl::OUString::createFromAscii( "oxygen" );
 		case STYLE_SYMBOLS_CLASSIC:    return ::rtl::OUString::createFromAscii( "classic" );
 	}
 
@@ -718,8 +717,6 @@ sal_uLong StyleSettings::ImplNameToSymbo
 		return STYLE_SYMBOLS_CRYSTAL;
 	else if ( rName == ::rtl::OUString::createFromAscii( "tango" ) )
 		return STYLE_SYMBOLS_TANGO;
-	else if ( rName == ::rtl::OUString::createFromAscii( "oxygen" ) )
-		return STYLE_SYMBOLS_OXYGEN;
 	else if ( rName == ::rtl::OUString::createFromAscii( "classic" ) )
 		return STYLE_SYMBOLS_CLASSIC;
 
@@ -811,8 +808,6 @@ sal_uLong StyleSettings::GetAutoSymbolsS
             nRet = STYLE_SYMBOLS_TANGO;
         else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
             nRet = STYLE_SYMBOLS_CRYSTAL;
-        else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde4" ) )
-            nRet = STYLE_SYMBOLS_OXYGEN;
     }
 
     // falback to any existing style

Modified: incubator/ooo/trunk/main/vcl/source/window/toolbox2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/source/window/toolbox2.cxx?rev=1201184&r1=1201183&r2=1201184&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/source/window/toolbox2.cxx (original)
+++ incubator/ooo/trunk/main/vcl/source/window/toolbox2.cxx Sat Nov 12 04:05:54 2011
@@ -991,9 +991,6 @@ const Size& ToolBox::GetDefaultImageSize
             case STYLE_SYMBOLS_CRYSTAL:
                 aLargeButtonSize = Size( TB_LARGEIMAGESIZE_CRYSTAL, TB_LARGEIMAGESIZE_CRYSTAL
);
                 break;
-            case STYLE_SYMBOLS_OXYGEN:
-                aLargeButtonSize = Size( TB_LARGEIMAGESIZE_OXYGEN, TB_LARGEIMAGESIZE_OXYGEN
);
-                break;
             default:
                 aLargeButtonSize = Size( TB_LARGEIMAGESIZE, TB_LARGEIMAGESIZE );
         }



Mime
View raw message