diff options
author | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2010-07-06 11:50:00 +0200 |
---|---|---|
committer | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2010-07-06 11:50:00 +0200 |
commit | ff20536b3f1b4f7ecd8394c463e4d5dc976f1c40 (patch) | |
tree | dae7dfb7d13178ebda9ace5d91fc9e8304fad926 | |
parent | 00a7b6a40f56997b3f7635a1ed1d68ee523bb495 (diff) | |
parent | 49d8e46fe25d76c0639d3cee8d50ff2a376c59a2 (diff) |
Automated merge with http://hg.services.openoffice.org/OOO330
4 files changed, 6 insertions, 5 deletions
diff --git a/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu b/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu index f4c4eea..255eeff 100644 --- a/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu +++ b/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu @@ -130,7 +130,7 @@ <node oor:name="EntryNames"> <node oor:name="SunReportBuilder" oor:op="replace"> <prop oor:name="DisplayName"> - <value xml:lang="en-US">Sun Report Builder</value> + <value xml:lang="en-US">Oracle Report Builder</value> </prop> <node oor:name="Entries"> <node oor:name="ReportHeader" oor:op="replace"> diff --git a/reportbuilder/registry/data/org/openoffice/Setup.xcu b/reportbuilder/registry/data/org/openoffice/Setup.xcu index a31fc22..2f51d59 100644 --- a/reportbuilder/registry/data/org/openoffice/Setup.xcu +++ b/reportbuilder/registry/data/org/openoffice/Setup.xcu @@ -45,7 +45,7 @@ <value >GenericCategories</value> </prop> <prop oor:name="ooSetupFactoryUIName"> - <value>Base: Sun Report Builder</value> + <value >Base: Oracle Report Builder</value> </prop> </node> </node> diff --git a/reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs b/reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs index 8311358..c290e00 100644 --- a/reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs +++ b/reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs @@ -50,7 +50,7 @@ <prop oor:name="DownloadURL" oor:type="xs:string"> <info> <author>LLA</author> - <desc>Direct download URL to the Sun(tm) Report Builder extension.</desc> + <desc>Direct download URL to the Oracle(tm) Report Builder extension.</desc> </info> <value>http://extensions.services.openoffice.org</value> </prop> @@ -59,7 +59,7 @@ <author>LLA</author> <desc>Name of the extension.</desc> </info> - <value>Sun(tm) Report Builder</value> + <value>Oracle(tm) Report Builder</value> </prop> </group> <group oor:name="UserData" oor:extensible="true"> diff --git a/reportbuilder/util/description.xml b/reportbuilder/util/description.xml index 88cce3a..22f95ef 100755 --- a/reportbuilder/util/description.xml +++ b/reportbuilder/util/description.xml @@ -3,7 +3,8 @@ xmlns:d="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink"> <display-name> - <name lang="en-US">Report Builder</name> + <name lang="en-US">Oracle Report Builder</name> + <!-- <name lang="en-US">Oracle(TM) Report Builder</name> --> </display-name> <registration> <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" > |