diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-06-03 14:33:05 +0200 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-06-03 14:33:05 +0200 |
| commit | 002c55b37206352e69b423018279701856b3ebab (patch) | |
| tree | 57bac6d0a6922d5de1634b79e318f47964138fee | |
| parent | c27d1080e0a7e2d81e287b29ccb25a3a1095831d (diff) | |
| parent | 00e024ae3e77987e01704e28511de6348f011b38 (diff) | |
slidecopy: merged latest DEV300.m80 changes
43 files changed, 55 insertions, 0 deletions
diff --git a/default_images/framework/res/folder_32.png b/default_images/framework/res/folder_32.png Binary files differindex 95efe642..1c7774b2 100644 --- a/default_images/framework/res/folder_32.png +++ b/default_images/framework/res/folder_32.png diff --git a/default_images/framework/res/folder_32_hc.png b/default_images/framework/res/folder_32_hc.png Binary files differnew file mode 100644 index 00000000..04513f55 --- /dev/null +++ b/default_images/framework/res/folder_32_hc.png diff --git a/default_images/framework/res/templates_32.png b/default_images/framework/res/templates_32.png Binary files differnew file mode 100644 index 00000000..584c3b2a --- /dev/null +++ b/default_images/framework/res/templates_32.png diff --git a/default_images/framework/res/templates_32_hc.png b/default_images/framework/res/templates_32_hc.png Binary files differnew file mode 100644 index 00000000..de0a9f5b --- /dev/null +++ b/default_images/framework/res/templates_32_hc.png diff --git a/default_images/res/mainapp_16.png b/default_images/res/mainapp_16.png Binary files differindex fe7477df..3aa8f08a 100644 --- a/default_images/res/mainapp_16.png +++ b/default_images/res/mainapp_16.png diff --git a/default_images/res/mainapp_16_8.png b/default_images/res/mainapp_16_8.png Binary files differindex 6b6f5ac2..3aa8f08a 100644 --- a/default_images/res/mainapp_16_8.png +++ b/default_images/res/mainapp_16_8.png diff --git a/default_images/res/mainapp_16_h.png b/default_images/res/mainapp_16_h.png Binary files differindex 46fbf528..08df53ac 100644 --- a/default_images/res/mainapp_16_h.png +++ b/default_images/res/mainapp_16_h.png diff --git a/default_images/res/mainapp_32.png b/default_images/res/mainapp_32.png Binary files differindex f2e6e9e4..296c6f4c 100644 --- a/default_images/res/mainapp_32.png +++ b/default_images/res/mainapp_32.png diff --git a/default_images/res/mainapp_32_8.png b/default_images/res/mainapp_32_8.png Binary files differindex 9792932c..296c6f4c 100644 --- a/default_images/res/mainapp_32_8.png +++ b/default_images/res/mainapp_32_8.png diff --git a/default_images/res/mainapp_32_h.png b/default_images/res/mainapp_32_h.png Binary files differindex d885c82d..113cbf16 100644 --- a/default_images/res/mainapp_32_h.png +++ b/default_images/res/mainapp_32_h.png diff --git a/default_images/res/mainapp_48_8.png b/default_images/res/mainapp_48_8.png Binary files differindex b1c2ff30..86bcf599 100644 --- a/default_images/res/mainapp_48_8.png +++ b/default_images/res/mainapp_48_8.png diff --git a/default_images/res/odb_32_hc.png b/default_images/res/odb_32_hc.png Binary files differnew file mode 100644 index 00000000..70068a09 --- /dev/null +++ b/default_images/res/odb_32_hc.png diff --git a/default_images/res/odf_32_hc.png b/default_images/res/odf_32_hc.png Binary files differnew file mode 100644 index 00000000..b63b9d74 --- /dev/null +++ b/default_images/res/odf_32_hc.png diff --git a/default_images/res/odg_32_hc.png b/default_images/res/odg_32_hc.png Binary files differnew file mode 100644 index 00000000..ee8a0d1c --- /dev/null +++ b/default_images/res/odg_32_hc.png diff --git a/default_images/res/odp_32_hc.png b/default_images/res/odp_32_hc.png Binary files differnew file mode 100644 index 00000000..7372ba53 --- /dev/null +++ b/default_images/res/odp_32_hc.png diff --git a/default_images/res/ods_32_hc.png b/default_images/res/ods_32_hc.png Binary files differnew file mode 100644 index 00000000..fde5d70e --- /dev/null +++ b/default_images/res/ods_32_hc.png diff --git a/default_images/res/odt_32_hc.png b/default_images/res/odt_32_hc.png Binary files differnew file mode 100644 index 00000000..e9487262 --- /dev/null +++ b/default_images/res/odt_32_hc.png diff --git a/default_images/res/printeradmin_16.png b/default_images/res/printeradmin_16.png Binary files differindex 87bc1b9e..399076c9 100644 --- a/default_images/res/printeradmin_16.png +++ b/default_images/res/printeradmin_16.png diff --git a/default_images/res/printeradmin_16_8.png b/default_images/res/printeradmin_16_8.png Binary files differindex 560f74d3..399076c9 100644 --- a/default_images/res/printeradmin_16_8.png +++ b/default_images/res/printeradmin_16_8.png diff --git a/default_images/res/printeradmin_16_h.png b/default_images/res/printeradmin_16_h.png Binary files differindex 6c9fd4ea..11f08c7f 100644 --- a/default_images/res/printeradmin_16_h.png +++ b/default_images/res/printeradmin_16_h.png diff --git a/default_images/res/printeradmin_32.png b/default_images/res/printeradmin_32.png Binary files differindex 01134535..b09999c7 100644 --- a/default_images/res/printeradmin_32.png +++ b/default_images/res/printeradmin_32.png diff --git a/default_images/res/printeradmin_32_8.png b/default_images/res/printeradmin_32_8.png Binary files differindex c82750ce..b09999c7 100644 --- a/default_images/res/printeradmin_32_8.png +++ b/default_images/res/printeradmin_32_8.png diff --git a/default_images/res/printeradmin_32_h.png b/default_images/res/printeradmin_32_h.png Binary files differindex 9113f86a..6ccf29c4 100644 --- a/default_images/res/printeradmin_32_h.png +++ b/default_images/res/printeradmin_32_h.png diff --git a/default_images/res/printeradmin_48_8.png b/default_images/res/printeradmin_48_8.png Binary files differindex 5f44cee1..a11cbe5a 100644 --- a/default_images/res/printeradmin_48_8.png +++ b/default_images/res/printeradmin_48_8.png diff --git a/default_images/sc/res/calcteam.png b/default_images/sc/res/calcteam.png Binary files differdeleted file mode 100644 index 0a204212..00000000 --- a/default_images/sc/res/calcteam.png +++ /dev/null diff --git a/ooo_custom_images/broffice/introabout/about.png b/ooo_custom_images/broffice/introabout/about.png Binary files differindex ffc8c7b1..38d180af 100755 --- a/ooo_custom_images/broffice/introabout/about.png +++ b/ooo_custom_images/broffice/introabout/about.png diff --git a/ooo_custom_images/broffice/introabout/intro.png b/ooo_custom_images/broffice/introabout/intro.png Binary files differindex 53f09f08..ba55331d 100755 --- a/ooo_custom_images/broffice/introabout/intro.png +++ b/ooo_custom_images/broffice/introabout/intro.png diff --git a/ooo_custom_images/classic/classic_images.tar.gz b/ooo_custom_images/classic/classic_images.tar.gz Binary files differindex ecef0d48..53f81400 100644 --- a/ooo_custom_images/classic/classic_images.tar.gz +++ b/ooo_custom_images/classic/classic_images.tar.gz diff --git a/ooo_custom_images/dev_broffice/introabout/intro.png b/ooo_custom_images/dev_broffice/introabout/intro.png Binary files differindex 14fc3742..6f2ec0c8 100755 --- a/ooo_custom_images/dev_broffice/introabout/intro.png +++ b/ooo_custom_images/dev_broffice/introabout/intro.png diff --git a/ooo_custom_images/dev_nologo/introabout/intro.png b/ooo_custom_images/dev_nologo/introabout/intro.png Binary files differindex 59547887..72e6681b 100755 --- a/ooo_custom_images/dev_nologo/introabout/intro.png +++ b/ooo_custom_images/dev_nologo/introabout/intro.png diff --git a/ooo_custom_images/dev_nologo_broffice/introabout/intro.png b/ooo_custom_images/dev_nologo_broffice/introabout/intro.png Binary files differindex cc526ef4..16951ee3 100755 --- a/ooo_custom_images/dev_nologo_broffice/introabout/intro.png +++ b/ooo_custom_images/dev_nologo_broffice/introabout/intro.png diff --git a/ooo_custom_images/nologo/introabout/intro.png b/ooo_custom_images/nologo/introabout/intro.png Binary files differindex 0a8afe4a..cafcdf93 100755 --- a/ooo_custom_images/nologo/introabout/intro.png +++ b/ooo_custom_images/nologo/introabout/intro.png diff --git a/ooo_custom_images/nologo_broffice/delzip b/ooo_custom_images/nologo_broffice/delzip new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/ooo_custom_images/nologo_broffice/delzip diff --git a/ooo_custom_images/nologo_broffice/framework/res/backing.png b/ooo_custom_images/nologo_broffice/framework/res/backing.png Binary files differnew file mode 100644 index 00000000..bbaf0ef2 --- /dev/null +++ b/ooo_custom_images/nologo_broffice/framework/res/backing.png diff --git a/ooo_custom_images/nologo_broffice/framework/res/backing_hc.png b/ooo_custom_images/nologo_broffice/framework/res/backing_hc.png Binary files differnew file mode 100644 index 00000000..0549dda1 --- /dev/null +++ b/ooo_custom_images/nologo_broffice/framework/res/backing_hc.png diff --git a/ooo_custom_images/nologo_broffice/framework/res/backing_right.png b/ooo_custom_images/nologo_broffice/framework/res/backing_right.png Binary files differnew file mode 100644 index 00000000..355f4adf --- /dev/null +++ b/ooo_custom_images/nologo_broffice/framework/res/backing_right.png diff --git a/ooo_custom_images/nologo_broffice/framework/res/backing_right_hc.png b/ooo_custom_images/nologo_broffice/framework/res/backing_right_hc.png Binary files differnew file mode 100644 index 00000000..56736f2f --- /dev/null +++ b/ooo_custom_images/nologo_broffice/framework/res/backing_right_hc.png diff --git a/ooo_custom_images/nologo_broffice/introabout/intro.png b/ooo_custom_images/nologo_broffice/introabout/intro.png Binary files differindex 56fd725b..4f8c8389 100755 --- a/ooo_custom_images/nologo_broffice/introabout/intro.png +++ b/ooo_custom_images/nologo_broffice/introabout/intro.png diff --git a/ooo_custom_images/nologo_broffice/makefile.mk b/ooo_custom_images/nologo_broffice/makefile.mk new file mode 100755 index 00000000..d322a8e2 --- /dev/null +++ b/ooo_custom_images/nologo_broffice/makefile.mk @@ -0,0 +1,20 @@ +#*********************************************************************** +# +# Copyright 2004 Sun Microsystems, Inc. +# +# All Rights Reserved. +# +#************************************************************************* + +PRJ=.. + + +PRJNAME=ooo_custom_images +TARGET=broffice_nologo + +.INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/settings.pmk + +.INCLUDE : target.mk +.INCLUDE : $(PRJ)$/target.pmk + diff --git a/ooo_custom_images/prj/build.lst b/ooo_custom_images/prj/build.lst new file mode 100644 index 00000000..57b9dd45 --- /dev/null +++ b/ooo_custom_images/prj/build.lst @@ -0,0 +1,4 @@ +oci ooo_custom_images : solenv NULL +oci ooo_custom_images usr1 - all oci_mkout NULL +oci ooo_custom_images\nologo_broffice nmake - all oci_nologo_broffice NULL + diff --git a/ooo_custom_images/prj/d.lst b/ooo_custom_images/prj/d.lst new file mode 100644 index 00000000..444e9b22 --- /dev/null +++ b/ooo_custom_images/prj/d.lst @@ -0,0 +1,2 @@ +mkdir: %COMMON_DEST%\bin%_EXT%\broffice_nologo +..\%__SRC%\bin\broffice_nologo\*.zip %COMMON_DEST%\bin%_EXT%\broffice_nologo diff --git a/ooo_custom_images/settings.pmk b/ooo_custom_images/settings.pmk new file mode 100644 index 00000000..ae95552e --- /dev/null +++ b/ooo_custom_images/settings.pmk @@ -0,0 +1,13 @@ +#*********************************************************************** +# +# Copyright 2004 Sun Microsystems, Inc. +# +# All Rights Reserved. +# +#************************************************************************* + +ZIP1FLAGS += -r +ZIP1TARGET = images_brand_$(TARGET) + +ZIP1LIST = * -x makefile.mk + diff --git a/ooo_custom_images/target.pmk b/ooo_custom_images/target.pmk new file mode 100644 index 00000000..6b78a397 --- /dev/null +++ b/ooo_custom_images/target.pmk @@ -0,0 +1,16 @@ +#*********************************************************************** +# +# Copyright 2004 Sun Microsystems, Inc. +# +# All Rights Reserved. +# +#************************************************************************* + +.IF "$(depend)"=="" +ALLTAR : $(COMMONBIN)$/$(TARGET)$/images_brand$(ZIP1EXT) +.ENDIF # "$(depend)"=="" + +$(COMMONBIN)$/$(TARGET)$/images_brand$(ZIP1EXT) : $(COMMONBIN)$/images_brand_$(TARGET)$(ZIP1EXT) + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ + |
