findbar01: Merge changes from m78

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 95efe64263df..1c7774b28571 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 000000000000..04513f55b9f1
--- /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 000000000000..584c3b2a28ac
--- /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 000000000000..de0a9f5b1a5a
--- /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 000000000000..70068a091c9c
--- /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 000000000000..b63b9d7450cb
--- /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 000000000000..ee8a0d1cf52a
--- /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 000000000000..7372ba53e266
--- /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 000000000000..fde5d70e18de
--- /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 000000000000..e9487262f8a5
--- /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 ffc8c7b1c85e..38d180afdc88 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 53f09f08d9c0..ba55331d6b77 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 ecef0d4824be..53f81400484f 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 14fc3742f3ac..6f2ec0c8d690 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 59547887821d..72e6681b8635 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 cc526ef4f7a3..16951ee34a8e 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 0a8afe4a6293..cafcdf9330aa 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 000000000000..e69de29bb2d1
--- /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 000000000000..bbaf0ef2bc57
--- /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 000000000000..0549dda178ee
--- /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 000000000000..355f4adf7c6a
--- /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 000000000000..56736f2fc385
--- /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 56fd725ba6f6..4f8c83890b04 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 000000000000..d322a8e29f2a
--- /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 000000000000..57b9dd452da6
--- /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 000000000000..444e9b22491f
--- /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 000000000000..ae95552ed21f
--- /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 000000000000..6b78a397b231
--- /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) $< $@
+