This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit f37968ed8323159fd94a1e7fa4645e71402d024b
Author: Mechtilde <o...@mechtilde.de>
AuthorDate: Tue Nov 24 14:54:27 2020 +0100
Updated inforamtion abeout Report Builder
(cherry picked from commit 5973beeb52663cea99668fd344352e263f69e6e8)
---
main/dbaccess/source/ext/macromigration/migrationlog.cxx | 2 +-
main/dbaccess/source/ui/misc/dbumiscres.src | 4 ++--
main/reportbuilder/license/readme_en-US.html | 16 ++++++++--------
main/reportbuilder/license/readme_en-US.txt | 11 +++++------
.../reportbuilder/registry/data/org/openoffice/Setup.xcu | 2 +-
5 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/main/dbaccess/source/ext/macromigration/migrationlog.cxx
b/main/dbaccess/source/ext/macromigration/migrationlog.cxx
index a2775a8..3a86a87 100644
--- a/main/dbaccess/source/ext/macromigration/migrationlog.cxx
+++ b/main/dbaccess/source/ext/macromigration/migrationlog.cxx
@@ -368,7 +368,7 @@ namespace dbmm
break;
case ERR_NEW_STYLE_REPORT:
- pAsciiErrorDescription = "#doc# could not be processed, since
you don't have the Report Builder (TM) extension installed.";
+ pAsciiErrorDescription = "#doc# could not be processed, since
you don't have the Report Builder extension installed.";
aAsciiParameterNames.push_back( "#doc#" );
break;
diff --git a/main/dbaccess/source/ui/misc/dbumiscres.src
b/main/dbaccess/source/ui/misc/dbumiscres.src
index 8b844d7..11e998b 100644
--- a/main/dbaccess/source/ui/misc/dbumiscres.src
+++ b/main/dbaccess/source/ui/misc/dbumiscres.src
@@ -30,7 +30,7 @@ Resource RSC_CHARSETS
{
String 1
{
- Text [ en-US ] = "System";
+ Text [ en-US ] = "System";
};
};
@@ -92,5 +92,5 @@ String STR_NAMED_OBJECT_ALREADY_EXISTS
String RID_STR_EXTENSION_NOT_PRESENT
{
// #i96130# use hard coded name
- Text [ en-US ] = "The report, \"$file$\", requires the extension Oracle
Report Builder.";
+ Text [ en-US ] = "The report, \"$file$\", requires the extension Report
Builder.";
};
diff --git a/main/reportbuilder/license/readme_en-US.html
b/main/reportbuilder/license/readme_en-US.html
index adfa486..d8fb705 100644
--- a/main/reportbuilder/license/readme_en-US.html
+++ b/main/reportbuilder/license/readme_en-US.html
@@ -20,12 +20,12 @@
*
***********************************************************-->
<head>
- <title>Oracle Report Builder</title>
+ <title>Report Builder</title>
</head>
<body>
- <h1>Oracle Report Builder</h1>
+ <h1>Report Builder</h1>
<p>This file contains important information about the installation.</p>
- <p>This software offered by Oracle will enhance Oracle Open Office and
OpenOffice.org software. The following features will be added:</p>
+ <p>This software offered by ASf will enhance Apache Open Office
software. The following features will be added:</p>
<ul>
<li><p>In a Base database document, in the Reports window, you
now have an additional choice to "Create Report in Design
View".</p></li>
<li><p>An interactive window allows you to create a database
report by drag-and-drop, with visual feedback.</p></li>
@@ -35,15 +35,15 @@
<h2>Notes on Installation</h2>
<h3>System Requirements</h3>
<ul>
- <li><p>A recent version of Oracle Open Office or
OpenOffice.org</p></li>
- <li><p>A recent version of the Java(TM) Runtime
Environment</p></li>
+ <li><p>A recent version of Apache Open Office</p></li>
+ <li><p>A recent version of the Java(TM) Runtime
Environment</p></li>
</ul>
<h3>Installing</h3>
<p>You need administrator rights to install a shared
extension for all users on your network. You do not need administrator rights
to install a user extension for your own use only.</p>
<p>Double-click the extension file (*.oxt) in your
system's file browser or choose <b>Tools > Extension Manager</b>and click
<B>Add</B>.</P>
<h3>Uninstalling</h3>
- <p>Choose Tools > Extension Manager, click the Oracle Report
Builder entry, then click Remove.</P>
+ <p>Choose Tools > Extension Manager, click the Report
Builder entry, then click Remove.</P>
<h2>Using the Extension</h2>
- <p>You find complete instructions on using the Oracle Report
Builder in the application help that is installed with Oracle Open Office or
OpenOffice.org. Press F1 to open the Help Viewer, then enter the words "Report
Builder" in the Index text box.</p>
+ <p>You find complete instructions on using the Report Builder
in the application help that is installed with Apache Open Office. Press F1 to
open the Help Viewer, then enter the words "Report Builder" in the Index text
box.</p>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/main/reportbuilder/license/readme_en-US.txt
b/main/reportbuilder/license/readme_en-US.txt
index c7a75c2..7a142f1 100644
--- a/main/reportbuilder/license/readme_en-US.txt
+++ b/main/reportbuilder/license/readme_en-US.txt
@@ -19,11 +19,11 @@
#
###############################################################
-Oracle Report Builder
+Report Builder
=====================
This file contains important information about the installation.
-This software offered by Oracle will enhance Oracle Open Office and
OpenOffice.org software. The following features will be added:
+This software offered by ASF will enhance Apache Open Office software. The
following features will be added:
* In a Base database document, in the Reports window, you now have an
additional choice to "Create Report in Design View".
* An interactive window allows you to create a database report by
drag-and-drop, with visual feedback.
* All reports created by Report Builder can also be edited in the Report
Builder window.
@@ -35,7 +35,7 @@ Notes on Installation
System Requirements
-* A recent version of Oracle Open Office or OpenOffice.org
+* A recent version of Apache Open Office
* A recent version of the Java(TM) Runtime Environment
Installing
@@ -45,9 +45,8 @@ You need administrator rights to install a shared extension
for all users on you
Uninstalling
-* Choose Tools > Extension Manager, click the Oracle Report Builder entry,
then click Remove.
+* Choose Tools > Extension Manager, click the Report Builder entry, then click
Remove.
Using the Extension
-You find complete instructions on using the Oracle Report Builder in the
application help that is installed with Oracle Open Office or OpenOffice.org.
Press F1 to open the Help Viewer, then enter the words "Report Builder" in the
Index text box.
-
+You find complete instructions on using the Report Builder in the application
help that is installed with Apache Open Office. Press F1 to open the Help
Viewer, then enter the words "Report Builder" in the Index text box.
diff --git a/main/reportbuilder/registry/data/org/openoffice/Setup.xcu
b/main/reportbuilder/registry/data/org/openoffice/Setup.xcu
index 554e767..bed42a2 100644
--- a/main/reportbuilder/registry/data/org/openoffice/Setup.xcu
+++ b/main/reportbuilder/registry/data/org/openoffice/Setup.xcu
@@ -41,7 +41,7 @@
<value >GenericCategories</value>
</prop>
<prop oor:name="ooSetupFactoryUIName">
- <value >Base: Oracle Report Builder</value>
+ <value >Base: Report Builder</value>
</prop>
</node>
</node>
