CWS-TOOLING: integrate CWS nativebooo/OOO320_m19ooo/OOO320_m18ooo/OOO320_m17

22 files changed, 38 insertions, 32 deletions

diff --git a/mysqlc/images/sun_extension.png b/mysqlc/images/sun_extension.png
deleted file mode 100644
index cf3fe5f..0000000
--- a/mysqlc/images/sun_extension.png
+++ /dev/null
diff --git a/mysqlc/images/sun_extension_hc.png b/mysqlc/images/sun_extension_hc.png
deleted file mode 100644
index 535a6bf..0000000
--- a/mysqlc/images/sun_extension_hc.png
+++ /dev/null
diff --git a/mysqlc/source/description.xml b/mysqlc/source/description.xml
index 2a4c452..727fc6b 100644..100755
--- a/mysqlc/source/description.xml
+++ b/mysqlc/source/description.xml
@@ -20,8 +20,8 @@
         <name xlink:href="http://www.oracle.com/us/products/applications/open-office" lang="en">Oracle</name>
     </publisher>
     <icon>
-        <default xlink:href="images/sun_extension.png" />
-        <high-contrast xlink:href="images/sun_extension_hc.png" />
+        <default xlink:href="images/extension_32.png" />
+        <high-contrast xlink:href="images/extension_32_h.png" />
     </icon>
     <extension-description>
         <src lang="#LANG#" xlink:href="description/description_#LANG#.txt"/>
diff --git a/mysqlc/source/description/description_en-US.txt b/mysqlc/source/description/description_en-US.txt
index bb3cf17..a8ddd59 100644..100755
--- a/mysqlc/source/description/description_en-US.txt
+++ b/mysqlc/source/description/description_en-US.txt
@@ -1 +1 @@
-The MySQL Connector for Oracle Open Office (formerly StarOffice) and OpenOffice.org installs a native MySQL database driver. It is faster, seamless integrated, easier to administrate and there is no need to install and setup a JDBC or ODBC driver separately. It was never easier to use MySQL databases in OpenOffice.org Base.
+The MySQL Connector for OpenOffice.org installs a native MySQL database driver. It is faster, seamless integrated, easier to administrate and there is no need to install and setup a JDBC or ODBC driver separately. It was never easier to use MySQL databases in OpenOffice.org Base.
diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk
index bfe46af..f224c63 100644..100755
--- a/mysqlc/source/makefile.mk
+++ b/mysqlc/source/makefile.mk
@@ -222,8 +222,8 @@ COMPONENT_LIBRARIES=\
             $(COMPONENT_LIBRARY)
 
 COMPONENT_IMAGES= \
-    $(EXTENSIONDIR)$/images$/sun_extension.png \
-    $(EXTENSIONDIR)$/images$/sun_extension_hc.png
+    $(EXTENSIONDIR)$/images$/extension_32.png \
+    $(EXTENSIONDIR)$/images$/extension_32_h.png
 
 
 # ........ component description ........
@@ -264,9 +264,9 @@ EXTENSION_PACKDEPS+=$(COMPONENT_MYSQL_CPPCONN_FILE)
 .INCLUDE : target.mk
 .INCLUDE : extension_post.mk
 
-$(EXTENSIONDIR)$/images$/%.png : $(PRJ)$/images$/%.png
+$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
     @@-$(MKDIRHIER) $(@:d)
-    @$(COPY) $< $@ > $(NULLDEV)
+    $(COPY) $< $@
 
 # existing descriptions: just copy
 $(EXTENSIONDIR)$/description$/%.txt: .$/description$/%.txt
diff --git a/reportbuilder/images/em47.png b/reportbuilder/images/em47.png
deleted file mode 100644
index cf3fe5f..0000000
--- a/reportbuilder/images/em47.png
+++ /dev/null
diff --git a/reportbuilder/images/em47_hc.png b/reportbuilder/images/em47_hc.png
deleted file mode 100644
index 535a6bf..0000000
--- a/reportbuilder/images/em47_hc.png
+++ /dev/null
diff --git a/reportbuilder/util/component.txt b/reportbuilder/util/component.txt
index 3b6ba31..21a1f1e 100644..100755
--- a/reportbuilder/util/component.txt
+++ b/reportbuilder/util/component.txt
@@ -1 +1 @@
-Create with the Oracle Report Builder stylish, smart-looking database reports. The flexible report editor can define group and page headers as well as group and page footers and even calculation fields are available to accomplish complex database reports.
+Create with the Report Builder stylish, smart-looking database reports. The flexible report editor can define group and page headers as well as group and page footers and even calculation fields are available to accomplish complex database reports.
diff --git a/reportbuilder/util/description.xml b/reportbuilder/util/description.xml
index 3e7a51a..88cce3a 100644..100755
--- a/reportbuilder/util/description.xml
+++ b/reportbuilder/util/description.xml
@@ -3,8 +3,7 @@
     xmlns:d="http://openoffice.org/extensions/description/2006" 
     xmlns:xlink="http://www.w3.org/1999/xlink">
   <display-name>
-    <name lang="en-US">Oracle Report Builder</name>
-    <!-- <name lang="en-US">Sun(TM) Report Builder</name> -->
+    <name lang="en-US">Report Builder</name>
   </display-name>
   <registration>
     <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" >
@@ -20,8 +19,8 @@
     <name xlink:href="http://www.oracle.com/us/products/applications/open-office" lang="en">Oracle</name>
   </publisher>
   <icon>
-    <default xlink:href="images/em47.png" />
-    <high-contrast xlink:href="images/em47_hc.png" />
+    <default xlink:href="images/extension_32.png" />
+    <high-contrast xlink:href="images/extension_32_h.png" />
   </icon>
   <extension-description>
     <src xlink:href="help/component.txt" lang="en" />
diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk
index 0a1bc46..5715787 100644..100755
--- a/reportbuilder/util/makefile.mk
+++ b/reportbuilder/util/makefile.mk
@@ -41,8 +41,8 @@ EXTENSION_VERSION_BASE=1.2.1
 .IF "$(L10N_framework)"==""
 # ------------------------------------------------------------------
 # calready set in util$/makefile.pmk
-# EXTENSIONNAME:=oracle-report-builder
-EXTENSION_ZIPNAME:=oracle-report-builder
+# EXTENSIONNAME:=report-builder
+EXTENSION_ZIPNAME:=report-builder
 
 # create Extension -----------------------------
 
@@ -76,8 +76,8 @@ COMPONENT_OTR_FILES= \
     $(EXTENSIONDIR)$/template$/en-US$/wizard$/report$/default.otr
     
 COMPONENT_IMAGES= \
-    $(EXTENSIONDIR)$/images$/em47.png \
-    $(EXTENSIONDIR)$/images$/em47_hc.png
+    $(EXTENSIONDIR)$/images$/extension_32.png \
+    $(EXTENSIONDIR)$/images$/extension_32_h.png
 
 COMPONENT_HTMLFILES = $(EXTENSIONDIR)$/THIRDPARTYREADMELICENSE.html \
             $(EXTENSIONDIR)$/readme_en-US.html \
@@ -133,7 +133,7 @@ $(EXTENSIONDIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.%
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
 
-$(EXTENSIONDIR)$/images$/%.png : $(PRJ)$/images$/%.png
+$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
 
diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml
index 3d2ec9c..64a67a0 100644..100755
--- a/sdext/source/minimizer/description.xml
+++ b/sdext/source/minimizer/description.xml
@@ -30,8 +30,8 @@
     </display-name>
 
     <icon>
-      <default xlink:href="bitmaps/em47.png" />
-      <high-contrast xlink:href="bitmaps/em47_hc.png" />
+      <default xlink:href="bitmaps/extension_32.png" />
+      <high-contrast xlink:href="bitmaps/extension_32_h.png" />
     </icon>
 
 </description>
diff --git a/sdext/source/minimizer/images/em47.png b/sdext/source/minimizer/images/em47.png
deleted file mode 100644
index cf3fe5f..0000000
--- a/sdext/source/minimizer/images/em47.png
+++ /dev/null
diff --git a/sdext/source/minimizer/images/em47_hc.png b/sdext/source/minimizer/images/em47_hc.png
deleted file mode 100644
index 535a6bf..0000000
--- a/sdext/source/minimizer/images/em47_hc.png
+++ /dev/null
diff --git a/sdext/source/minimizer/makefile.mk b/sdext/source/minimizer/makefile.mk
index ad569e3..4bd6e8f 100644..100755
--- a/sdext/source/minimizer/makefile.mk
+++ b/sdext/source/minimizer/makefile.mk
@@ -103,8 +103,8 @@ COMPONENT_BITMAPS= \
     $(EXTENSIONDIR)$/bitmaps$/minimizepresi_80_h.png
 
 COMPONENT_IMAGES=\
-    $(EXTENSIONDIR)$/bitmaps$/em47.png \
-    $(EXTENSIONDIR)$/bitmaps$/em47_hc.png
+    $(EXTENSIONDIR)$/bitmaps$/extension_32.png \
+    $(EXTENSIONDIR)$/bitmaps$/extension_32_h.png
 
 # rather freestyle or common to all?
 COMPONENT_HELP= \
@@ -129,7 +129,7 @@ $(COMPONENT_BITMAPS) : $(SOLARSRC)$/$(RSCDEFIMG)$/minimizer$/$$(@:f)
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
 
-$(COMPONENT_IMAGES) : images$/$$(@:f)
+$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
 
diff --git a/sdext/source/pdfimport/config/description.xml b/sdext/source/pdfimport/config/description.xml
index 37548da..9ab1866 100644..100755
--- a/sdext/source/pdfimport/config/description.xml
+++ b/sdext/source/pdfimport/config/description.xml
@@ -29,8 +29,8 @@
     </display-name>
     
     <icon>
-      <default xlink:href="images/pdfiext.png" />
-      <high-contrast xlink:href="images/pdfiext_hc.png" />
+      <default xlink:href="images/extension_32.png" />
+      <high-contrast xlink:href="images/extension_32_h.png" />
     </icon>
 
 </description>
diff --git a/sdext/source/pdfimport/images/pdfiext.png b/sdext/source/pdfimport/images/pdfiext.png
deleted file mode 100644
index cf3fe5f..0000000
--- a/sdext/source/pdfimport/images/pdfiext.png
+++ /dev/null
diff --git a/sdext/source/pdfimport/images/pdfiext_hc.png b/sdext/source/pdfimport/images/pdfiext_hc.png
deleted file mode 100644
index 535a6bf..0000000
--- a/sdext/source/pdfimport/images/pdfiext_hc.png
+++ /dev/null
diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk
index e67f35d..a17c9cd 100644..100755
--- a/sdext/source/pdfimport/makefile.mk
+++ b/sdext/source/pdfimport/makefile.mk
@@ -125,8 +125,8 @@ COMPONENT_LIBRARIES= \
     $(EXTENSIONDIR)$/$(SHL1TARGET)$(DLLPOST)
 
 COMPONENT_IMAGES=\
-    $(EXTENSIONDIR)$/images$/pdfiext.png \
-    $(EXTENSIONDIR)$/images$/pdfiext_hc.png
+    $(EXTENSIONDIR)$/images$/extension_32.png \
+    $(EXTENSIONDIR)$/images$/extension_32_h.png
 
 EXTENSION_PACKDEPS=$(CONVERTER_FILE) $(COMPONENT_DIALOGS) $(COMPONENT_HELP) $(COMPONENT_IMAGES) makefile.mk
 
@@ -148,7 +148,7 @@ $(COMPONENT_HELP) : help$/$$(@:f)
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
 
-$(COMPONENT_IMAGES) : images$/$$(@:f)
+$(COMPONENT_IMAGES) :  $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
 .ENDIF # L10N_framework
diff --git a/sdext/source/presenter/bitmaps/em47.png b/sdext/source/presenter/bitmaps/em47.png
deleted file mode 100644
index cf3fe5f..0000000
--- a/sdext/source/presenter/bitmaps/em47.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/em47_hc.png b/sdext/source/presenter/bitmaps/em47_hc.png
deleted file mode 100644
index 535a6bf..0000000
--- a/sdext/source/presenter/bitmaps/em47_hc.png
+++ /dev/null
diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml
index b861f5a..0ee9f0b 100644..100755
--- a/sdext/source/presenter/description.xml
+++ b/sdext/source/presenter/description.xml
@@ -30,8 +30,8 @@
   </display-name>
 
   <icon>
-    <default xlink:href="bitmaps/em47.png" />
-    <high-contrast xlink:href="bitmaps/em47_hc.png" />
+    <default xlink:href="bitmaps/extension_32.png" />
+    <high-contrast xlink:href="bitmaps/extension_32_h.png" />
   </icon>
 
 </description>
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index c6dbe71..e4b7afa 100644..100755
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -231,9 +231,11 @@ COMPONENT_BITMAPS=												\
                                                                 \
     $(ZIP1DIR)$/bitmaps$/LabelMouseOverLeft.png					\
     $(ZIP1DIR)$/bitmaps$/LabelMouseOverCenter.png				\
-    $(ZIP1DIR)$/bitmaps$/LabelMouseOverRight.png                \
-    $(ZIP1DIR)$/bitmaps$/em47.png                               \
-    $(ZIP1DIR)$/bitmaps$/em47_hc.png
+    $(ZIP1DIR)$/bitmaps$/LabelMouseOverRight.png
+
+COMPONENT_IMAGES=\
+    $(ZIP1DIR)$/bitmaps$/extension_32.png \
+    $(ZIP1DIR)$/bitmaps$/extension_32_h.png
 
 COMPONENT_MANIFEST= 							\
     $(ZIP1DIR)$/META-INF$/manifest.xml
@@ -257,6 +259,7 @@ ZIP1DEPS=					\
     $(COMPONENT_MANIFEST)	\
     $(COMPONENT_FILES)		\
     $(COMPONENT_BITMAPS)	\
+    $(COMPONENT_IMAGES)    	\
     $(COMPONENT_LIBRARY)	\
     $(COMPONENT_HELP)
 #	$(COMPONENT_MERGED_XCU) \
@@ -290,6 +293,10 @@ $(COMPONENT_BITMAPS) : bitmaps$/$$(@:f)
     @-$(MKDIRHIER) $(@:d)
     +$(COPY) $< $@
 
+$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
+    @@-$(MKDIRHIER) $(@:d)
+    $(COPY) $< $@
+
 $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f)
     @-$(MKDIRHIER) $(@:d)
     +$(COPY) $< $@