diff options
10 files changed, 16 insertions, 17 deletions
diff --git a/dbaccess/inc/strings.hrc b/dbaccess/inc/strings.hrc index 47068f43d09e..d046ac5a299e 100644 --- a/dbaccess/inc/strings.hrc +++ b/dbaccess/inc/strings.hrc @@ -349,7 +349,7 @@ #define STR_WARNINGS_DURING_CONNECT NC_("STR_WARNINGS_DURING_CONNECT", "Warnings were encountered while connecting to the data source. Press \"$buttontext$\" to view them.") #define STR_NAMED_OBJECT_ALREADY_EXISTS NC_("STR_NAMED_OBJECT_ALREADY_EXISTS", "The name '$#$' already exists.\nPlease enter another name." ) // #i96130# use hard coded name -#define RID_STR_EXTENSION_NOT_PRESENT NC_("RID_STR_EXTENSION_NOT_PRESENT", "The report, \"$file$\", requires the Oracle Report Builder feature.") +#define RID_STR_EXTENSION_NOT_PRESENT NC_("RID_STR_EXTENSION_NOT_PRESENT", "The report, \"$file$\", requires the Report Builder feature.") #define STR_COULDNOTCREATE_DRIVERMANAGER NC_("STR_COULDNOTCREATE_DRIVERMANAGER", "Cannot connect to the SDBC driver manager (#servicename#).") #define STR_NOREGISTEREDDRIVER NC_("STR_NOREGISTEREDDRIVER", "A driver is not registered for the URL #connurl#.") diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx index 1d17c8fec1d7..b46894ac0a58 100644 --- a/dbaccess/source/ext/macromigration/migrationlog.cxx +++ b/dbaccess/source/ext/macromigration/migrationlog.cxx @@ -316,7 +316,7 @@ namespace dbmm break; case ERR_NEW_STYLE_REPORT: - pAsciiErrorDescription = "#doc# could not be processed, since you don't have the Oracle Report Builder (TM) extension installed."; + pAsciiErrorDescription = "#doc# could not be processed, since you don't have the Report Builder feature installed."; aParameterNames.emplace_back("#doc#"); break; diff --git a/officecfg/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu b/officecfg/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu index 6bb41178bec2..137da86f2879 100644 --- a/officecfg/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu +++ b/officecfg/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu @@ -143,7 +143,7 @@ <node oor:name="EntryNames"> <node oor:name="SunReportBuilder" oor:op="replace"> <prop oor:name="DisplayName"> - <value xml:lang="en-US">Oracle Report Builder</value> + <value xml:lang="en-US">Report Builder</value> </prop> <node oor:name="Entries"> <node oor:name="ReportHeader" oor:op="replace"> diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu index 84a2bb68fa52..0472de91f20e 100644 --- a/officecfg/registry/data/org/openoffice/Setup.xcu +++ b/officecfg/registry/data/org/openoffice/Setup.xcu @@ -769,7 +769,7 @@ <value>GenericCategories</value> </prop> <prop oor:name="ooSetupFactoryUIName"> - <value xml:lang="en-US">Base: Oracle Report Builder</value> + <value xml:lang="en-US">Base: Report Builder</value> </prop> </node> </node> diff --git a/officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs b/officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs index 98230cea7199..556ddb72c710 100644 --- a/officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs @@ -36,17 +36,11 @@ <info> <desc>specifies extension settings for the report designer.</desc> </info> - <prop oor:name="DownloadURL" oor:type="xs:string"> - <info> - <desc>Direct download URL to the Oracle(tm) Report Builder extension.</desc> - </info> - <value>http://extensions.go-oo.org</value> - </prop> <prop oor:name="Name" oor:type="xs:string"> <info> <desc>Name of the extension.</desc> </info> - <value>Oracle(tm) Report Builder</value> + <value>Report Builder</value> </prop> </group> <group oor:name="UserData" oor:extensible="true"> diff --git a/reportbuilder/README b/reportbuilder/README index 4bbe2db85936..25f8e85710ef 100644 --- a/reportbuilder/README +++ b/reportbuilder/README @@ -1 +1,7 @@ -Oracle report builder extension, from [http://extensions.services.openoffice.org/project/reportdesign]. +Report Builder, or "new style reports", replacing legacy reports (in reportdesign). +Started as an extension called "Sun Report Builder" then "Oracle Report Builder" +[http://extensions.services.openoffice.org/project/reportdesign], +which got bundled with LibreOffice, then converted to an optionallly installable +(but installed by default) part of LibreOffice proper. + +Uses the Pentaho Reporting Flow Engine of Pentaho BI [http://www.pentaho.com/]. diff --git a/reportbuilder/registry/data/org/openoffice/Setup.xcu b/reportbuilder/registry/data/org/openoffice/Setup.xcu index 149eab98bc44..c8f613ff1a17 100644 --- a/reportbuilder/registry/data/org/openoffice/Setup.xcu +++ b/reportbuilder/registry/data/org/openoffice/Setup.xcu @@ -36,10 +36,9 @@ <value >GenericCategories</value> </prop> <prop oor:name="ooSetupFactoryUIName"> - <value >Base: Oracle Report Builder</value> + <value >Base: Report Builder</value> </prop> </node> </node> </node> </oor:component-data> - diff --git a/reportdesign/README b/reportdesign/README index c6e0e67c72c7..0cffd43da3ef 100644 --- a/reportdesign/README +++ b/reportdesign/README @@ -1 +1 @@ -Part of LibreOffice Base +Legacy Reports for LibreOffice Base diff --git a/wizards/com/sun/star/wizards/report/IReportDocument.java b/wizards/com/sun/star/wizards/report/IReportDocument.java index 0c124a2c7a22..2b456977838e 100644 --- a/wizards/com/sun/star/wizards/report/IReportDocument.java +++ b/wizards/com/sun/star/wizards/report/IReportDocument.java @@ -26,7 +26,7 @@ import java.util.ArrayList; /** * New Interface which gives us the possibility to switch on the fly between the old - * Wizard and the new Sun Report Builder Wizard, which use the same UI. + * Wizard and the new Report Builder Wizard, which use the same UI. */ public interface IReportDocument { diff --git a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java index 0d118e20cb64..d55178ce857c 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java +++ b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java @@ -58,7 +58,7 @@ import com.sun.star.wizards.ui.UIConsts; /** * This class use the IReportDocument Interface to communicate between the UI - * and the ReportBuilderLayouter which communicates to the new Sun Report Builder. + * and the ReportBuilderLayouter which communicates to the new Report Builder. */ @SuppressWarnings("ucd") public class ReportBuilderImplementation extends ReportImplementationHelper |