From f153fe82239f24ff1abd2fbb8ab22eab2ea1dac0 Mon Sep 17 00:00:00 2001
From: Dirk Voelzke <dv@openoffice.org>
Date: Wed, 21 Apr 2010 08:25:26 +0200
Subject: nativeb: #i110985#: changed extension icons again

---
 reportbuilder/util/description.xml |  7 +++----
 reportbuilder/util/makefile.mk     | 10 +++++-----
 reportbuilder/util/makefile.pmk    |  0
 3 files changed, 8 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 reportbuilder/util/description.xml
 mode change 100644 => 100755 reportbuilder/util/makefile.mk
 mode change 100644 => 100755 reportbuilder/util/makefile.pmk

(limited to 'reportbuilder/util')

diff --git a/reportbuilder/util/description.xml b/reportbuilder/util/description.xml
old mode 100644
new mode 100755
index a4031236bd2b..a96d41bbe6af
--- 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
old mode 100644
new mode 100755
index 7ff8f64e7938..c52e85841f68
--- 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/reportbuilder/util/makefile.pmk b/reportbuilder/util/makefile.pmk
old mode 100644
new mode 100755
-- 
cgit 


From 68c7f8fae5659753748eead42d12ed64db84702e Mon Sep 17 00:00:00 2001
From: Dirk Voelzke <dv@openoffice.org>
Date: Wed, 21 Apr 2010 14:30:56 +0200
Subject: nativeb: #i111039#: changed extension description

---
 reportbuilder/util/component.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 reportbuilder/util/component.txt

(limited to 'reportbuilder/util')

diff --git a/reportbuilder/util/component.txt b/reportbuilder/util/component.txt
old mode 100644
new mode 100755
index 3b6ba3156efc..21a1f1e2d145
--- 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.
-- 
cgit