cmcfixes74: merge with DEV300 m79

28 files changed, 55 insertions, 0 deletions

diff --git a/default_images/framework/res/folder_32.png b/default_images/framework/res/folder_32.png
index 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
new 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
new 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
new file mode 100644
index 00000000..de0a9f5b
--- /dev/null
+++ b/default_images/framework/res/templates_32_hc.png
diff --git a/default_images/res/odb_32_hc.png b/default_images/res/odb_32_hc.png
new 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
new 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
new 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
new 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
new 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
new file mode 100644
index 00000000..e9487262
--- /dev/null
+++ b/default_images/res/odt_32_hc.png
diff --git a/ooo_custom_images/broffice/introabout/about.png b/ooo_custom_images/broffice/introabout/about.png
index 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
index 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
index 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
index 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
index 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
index 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
index 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
new 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
new 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
new 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
new 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
index 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) $< $@
+