[Libreoffice-commits] core.git: configure.ac dbaccess/source officecfg/Configuration_officecfg.mk officecfg/registry postprocess/CustomTarget_registry.mk postprocess/Rdb_services.mk reportbuilder/Configuration_reportbuilder.mk reportbuilder/Extension_reportbuilder.mk reportbuilder/Jar_reportbuilder.mk reportbuilder/java reportbuilder/license reportbuilder/Module_reportbuilder.mk reportbuilder/Package_readme.mk reportbuilder/registry reportbuilder/util Repository.mk scp2/InstallModule_base.mk scp2/InstallModule_ooo.mk scp2/source setup_native/source solenv/bin
David Ostrovsky
david at ostrovsky.org
Mon Mar 18 08:31:04 PDT 2013
Repository.mk | 2
configure.ac | 17
dbaccess/source/ui/misc/dbumiscres.src | 2
officecfg/Configuration_officecfg.mk | 11
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 127 +++
officecfg/registry/data/org/openoffice/Office/DataAccess.xcu | 15
officecfg/registry/data/org/openoffice/Office/Embedding.xcu | 40 +
officecfg/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu | 186 ++++
officecfg/registry/data/org/openoffice/Office/ReportDesign.xcu | 25
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 135 +++
officecfg/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu | 145 +++
officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu | 394 ++++++++++
officecfg/registry/data/org/openoffice/Setup.xcu | 20
officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu | 67 +
officecfg/registry/data/org/openoffice/TypeDetection/Types.xcu | 72 +
officecfg/registry/files.mk | 3
officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs | 62 +
officecfg/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs | 39
officecfg/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs | 44 +
postprocess/CustomTarget_registry.mk | 19
postprocess/Rdb_services.mk | 6
reportbuilder/Configuration_reportbuilder.mk | 56 -
reportbuilder/Extension_reportbuilder.mk | 105 --
reportbuilder/Jar_reportbuilder.mk | 24
reportbuilder/Module_reportbuilder.mk | 5
reportbuilder/Package_readme.mk | 33
reportbuilder/java/manifest.mf | 2
reportbuilder/java/reportbuilder.component | 21
reportbuilder/license/readme_en-US.html | 46 -
reportbuilder/license/readme_en-US.txt | 49 -
reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu | 186 ----
reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu | 25
reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu | 145 ---
reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu | 394 ----------
reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu | 67 -
reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu | 72 -
reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs | 62 -
reportbuilder/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs | 39
reportbuilder/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs | 44 -
reportbuilder/util/META-INF/manifest.xml | 53 -
reportbuilder/util/components.rdb | 22
reportbuilder/util/description-en-US.txt | 1
reportbuilder/util/description.xml | 40 -
reportbuilder/util/manifest.mf | 2
scp2/InstallModule_base.mk | 7
scp2/InstallModule_ooo.mk | 31
scp2/source/extensions/directory_extensions.scp | 11
scp2/source/extensions/file_extensions.scp | 13
scp2/source/extensions/module_extensions.scp | 15
scp2/source/ooo/module_reportbuilder.scp | 71 +
setup_native/source/packinfo/packinfo_extensions.txt | 15
solenv/bin/linkoo | 1
52 files changed, 1563 insertions(+), 1525 deletions(-)
New commits:
commit 90a326c7028d5af132c62edfaef77c53627e4c0e
Author: David Ostrovsky <david at ostrovsky.org>
Date: Wed Mar 13 22:45:02 2013 +0100
fdo#61950 move report builder from bundled extensions to plain code
For test sample report from fdo#61726 can be used.
Change-Id: Iacf8ddc4cf8ad0a408d72e18ecb7237476afeffe
Reviewed-on: https://gerrit.libreoffice.org/2718
Reviewed-by: David Ostrovsky <David.Ostrovsky at gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky at gmx.de>
diff --git a/Repository.mk b/Repository.mk
index 6c7e971..579cba9 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -777,6 +777,7 @@ $(eval $(call gb_Helper_register_jars,OOO, \
pocketword \
query \
report \
+ reportbuilder \
reportbuilderwizard \
sdbc_hsqldb \
table \
@@ -791,7 +792,6 @@ $(eval $(call gb_Helper_register_jars,OXT, \
mediawiki \
nlpsolver \
passive_java \
- report-builder \
))
# External executables
diff --git a/configure.ac b/configure.ac
index 15c575d..1492d72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -623,9 +623,9 @@ AC_ARG_ENABLE(ext-presenter-minimizer,
[Disable the Presentation Minimizer extension.])
)
-AC_ARG_ENABLE(ext-report-builder,
- AS_HELP_STRING([--disable-ext-report-builder],
- [Disable the Report Builder extension.])
+AC_ARG_ENABLE(report-builder,
+ AS_HELP_STRING([--disable-report-builder],
+ [Disable the Report Builder.])
)
AC_ARG_ENABLE(ext-wiki-publisher,
@@ -9535,9 +9535,9 @@ AC_SUBST(SYSTEM_SERVLETAPI)
AC_SUBST(SERVLETAPI_JAR)
AC_MSG_CHECKING([whether to build the Report Builder extension])
-if test "$enable_ext_report_builder" != "no" -a "x$enable_extension_integration" != "xno" -a "$with_java" != "no"; then
+if test "$enable_report_builder" != "no" -a "$with_java" != "no"; then
AC_MSG_RESULT([yes])
- ENABLE_REPORTBUILDER=YES
+ ENABLE_REPORTBUILDER=TRUE
AC_MSG_CHECKING([which jfreereport libs to use])
if test "$with_system_jfreereport" = "yes"; then
SYSTEM_JFREEREPORT=YES
@@ -9705,8 +9705,7 @@ if test "$enable_ext_report_builder" != "no" -a "x$enable_extension_integration"
fi
else
AC_MSG_RESULT([no])
- ENABLE_REPORTBUILDER=NO
- SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_REPORTDESIGN"
+ ENABLE_REPORTBUILDER=FALSE
SYSTEM_JFREEREPORT=NO
fi
AC_SUBST(ENABLE_REPORTBUILDER)
@@ -9725,7 +9724,7 @@ AC_SUBST(LIBSERIALIZER_JAR)
# this has to be here because both the Wiki Publisher and the SRB use
# commons-logging
-if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
+if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then
AC_MSG_CHECKING([which Apache commons-* libs to use])
if test "$with_system_apache_commons" = "yes"; then
SYSTEM_APACHE_COMMONS=YES
@@ -9776,7 +9775,7 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
[AC_MSG_ERROR(commons-httpclient.jar not found.)], [])
fi
fi
- if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
+ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then
if test -z $COMMONS_LOGGING_JAR; then
AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.1.jar,
[ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar ],
diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src
index a7092e0..ce7eb37 100644
--- a/dbaccess/source/ui/misc/dbumiscres.src
+++ b/dbaccess/source/ui/misc/dbumiscres.src
@@ -86,7 +86,7 @@ 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 Oracle Report Builder feature.";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
index eba42f0..3a0bae3 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\
org/openoffice/Office/Calc.xcu \
org/openoffice/Office/Canvas.xcu \
org/openoffice/Office/Compatibility.xcu \
+ org/openoffice/Office/ExtendedColorScheme.xcu \
org/openoffice/Office/ExtensionDependencies.xcu \
org/openoffice/Office/ExtensionManager.xcu \
org/openoffice/Office/Impress.xcu \
@@ -48,8 +49,12 @@ $(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\
org/openoffice/Office/Views.xcu \
org/openoffice/Office/Paths.xcu \
org/openoffice/Office/Histories.xcu \
+ org/openoffice/Office/ReportDesign.xcu \
org/openoffice/Office/UI/Controller.xcu \
org/openoffice/Office/UI/Factories.xcu \
+ org/openoffice/Office/UI/ReportCommands.xcu \
+ org/openoffice/TypeDetection/Filter.xcu \
+ org/openoffice/TypeDetection/Types.xcu \
org/openoffice/TypeDetection/UISort.xcu \
org/openoffice/ucb/Configuration.xcu \
))
@@ -65,11 +70,13 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
org/openoffice/Setup-base.xcu \
org/openoffice/Setup-math.xcu \
org/openoffice/Setup-report.xcu \
+ org/openoffice/Setup-reportbuilder.xcu \
org/openoffice/Setup-start.xcu \
org/openoffice/UserProfile-unixdesktop.xcu \
org/openoffice/VCL-gconflockdown.xcu \
org/openoffice/VCL-unixdesktop.xcu \
org/openoffice/Office/Accelerators-macosx.xcu \
+ org/openoffice/Office/Accelerators-reportbuilder.xcu \
org/openoffice/Office/Accelerators-unxwnt.xcu \
org/openoffice/Office/Addons-librelogo.xcu \
org/openoffice/Office/Common-writer.xcu \
@@ -93,6 +100,7 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
org/openoffice/Office/Common-ctlseqcheck.xcu \
org/openoffice/Office/Common-korea.xcu \
org/openoffice/Office/DataAccess-evoab2.xcu \
+ org/openoffice/Office/DataAccess-reportbuilder.xcu \
org/openoffice/Office/Paths-macosx.xcu \
org/openoffice/Office/Paths-unxwnt.xcu \
org/openoffice/Office/Paths-unixdesktop.xcu \
@@ -106,9 +114,11 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
org/openoffice/Office/Embedding-impress.xcu \
org/openoffice/Office/Embedding-math.xcu \
org/openoffice/Office/Embedding-base.xcu \
+ org/openoffice/Office/Embedding-reportbuilder.xcu \
org/openoffice/Office/Embedding-writer.xcu \
org/openoffice/Office/Recovery-gconflockdown.xcu \
org/openoffice/Office/UI/WriterWindowState-librelogo.xcu \
+ org/openoffice/Office/UI/Controller-reportbuilder.xcu \
org/openoffice/TypeDetection/UISort-writer.xcu \
org/openoffice/TypeDetection/UISort-calc.xcu \
org/openoffice/TypeDetection/UISort-draw.xcu \
@@ -150,6 +160,7 @@ $(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/d
org/openoffice/Office/UI/DbQueryWindowState.xcu \
org/openoffice/Office/UI/DbTableWindowState.xcu \
org/openoffice/Office/UI/DbRelationWindowState.xcu \
+ org/openoffice/Office/UI/DbReportWindowState.xcu \
org/openoffice/Office/UI/DbBrowserWindowState.xcu \
org/openoffice/Office/UI/DbTableDataWindowState.xcu \
org/openoffice/Office/UI/DrawImpressCommands.xcu \
diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 50f76cf..fd649ba 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -178,7 +178,9 @@
</prop>
</node>
</node>
+
<node oor:name="Modules">
+
<node oor:name="com.sun.star.script.BasicIDE" oor:op="replace">
<node oor:name="F5" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
@@ -6185,6 +6187,131 @@
</prop>
</node>
</node>
+
+<!-- Report Builder start here at the bottom of Modules section-->
+ <node oor:name="com.sun.star.report.ReportDefinition" oor:op="replace" install:module="reportbuilder">
+
+ <node oor:name="R_MOD1" oor:op="replace">
+ <prop oor:name="Command">
+ <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="en-US">.uno:SelectReport</value>
+ </prop>
+ </node>
+
+ <node oor:name="RETURN_MOD2" oor:op="replace">
+ <prop oor:name="Command">
+ <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="en-US">.uno:ControlProperties</value>
+ </prop>
+ </node>
+
+ <node oor:name="F4" oor:op="replace">
+ <prop oor:name="Command">
+ <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="en-US">.uno:ControlProperties</value>
+ </prop>
+ </node>
+
+ <node oor:name="F5" oor:op="replace">
+ <prop oor:name="Command">
+ <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="en-US">.uno:ReportNavigator</value>
+ </prop>
+ </node>
+
+ <node oor:name="F8_MOD2" oor:op="replace">
+ <prop oor:name="Command">
+ <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="en-US">.uno:AddField</value>
+ </prop>
+ </node>
+
+ <node oor:name="ESCAPE" oor:op="replace">
+ <prop oor:name="Command">
+ <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="en-US">.uno:Escape</value>
+ </prop>
+ </node>
+
+ <node oor:name="G_MOD1" oor:op="replace">
+ <prop oor:name="Command">
+ <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="en-US">.uno:DbSortingAndGrouping</value>
+ </prop>
+ </node>
+
+ <node oor:name="E_MOD1" oor:op="replace">
+ <prop oor:name="Command">
+ <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="en-US">.uno:ExecuteReport</value>
+ </prop>
+ </node>
+
+ <node oor:name="A_SHIFT_MOD1" oor:op="replace">
+ <prop oor:name="Command">
+ <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="en-US">.uno:SelectAllInSection</value>
+ </prop>
+ </node>
+
+ <node oor:name="T_MOD1" oor:op="replace">
+ <prop oor:name="Command">
+ <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="en-US">.uno:SelectAllLabels</value>
+ </prop>
+ </node>
+
+ <node oor:name="F_MOD1" oor:op="replace">
+ <prop oor:name="Command">
+ <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="en-US">.uno:SelectAllEdits</value>
+ </prop>
+ </node>
+
+ <node oor:name="Y_MOD1" oor:op="replace">
+ <prop oor:name="Command">
+ <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="en-US">.uno:Redo</value>
+ </prop>
+ </node>
+
+ <node oor:name="Z_MOD1" oor:op="replace">
+ <prop oor:name="Command">
+ <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="en-US">.uno:Undo</value>
+ </prop>
+ </node>
+
+ <node oor:name="TAB_MOD1" oor:op="replace">
+ <prop oor:name="Command">
+ <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="en-US">.uno:NextMark</value>
+ </prop>
+ </node>
+
+ <node oor:name="TAB_SHIFT_MOD1" oor:op="replace">
+ <prop oor:name="Command">
+ <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="en-US">.uno:PrevMark</value>
+ </prop>
+ </node>
+
+ <node oor:name="SUBTRACT" oor:op="replace">
+ <prop oor:name="Command">
+ <value xml:lang="en-US">.uno:CollapseSection</value>
+ <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ </prop>
+ </node>
+
+ <node oor:name="ADD" oor:op="replace">
+ <prop oor:name="Command">
+ <value xml:lang="en-US">.uno:ExpandSection</value>
+ <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ </prop>
+ </node>
+
+ </node>
+
</node>
</node>
</oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
index 1958a77..4f15a46 100644
--- a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
@@ -18,6 +18,21 @@
-->
<!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
<oor:component-data oor:name="DataAccess" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <node oor:name="ReportEngines" install:module="reportbuilder">
+ <prop oor:name="DefaultReportEngine" oor:type="xs:string">
+ <value>Pentaho Reporting Flow Engine</value>
+ </prop>
+ <node oor:name="ReportEngineNames">
+ <node oor:name="Pentaho Reporting Flow Engine" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value>Pentaho Reporting Flow Engine</value>
+ </prop>
+ <prop oor:name="ServiceName" oor:type="xs:string">
+ <value>org.libreoffice.report.pentaho.SOReportJobFactory</value>
+ </prop>
+ </node>
+ </node>
+ </node>
<node oor:name="ConnectionPool">
<node oor:name="DriverSettings">
<node oor:name="com.sun.star.comp.sdbc.evoab.OEvoabDriver" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
index 7098248..543940d 100644
--- a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
@@ -259,6 +259,37 @@
<value>PRIMARY SHOW OPEN HIDE UIACTIVATE IPACTIVATE SAVECOPYAS</value>
</prop>
</node>
+ <node oor:name="D7896D52-B7AF-4820-9DFE-D404D015960F" oor:op="replace" install:module="reportbuilder">
+ <prop oor:name="ObjectFactory">
+ <value>com.sun.star.embed.OOoEmbeddedObjectFactory</value>
+ </prop>
+ <prop oor:name="ObjectDocumentServiceName">
+ <value>com.sun.star.report.ReportDefinition</value>
+ </prop>
+ <prop oor:name="ObjectMiscStatus">
+ <value>1</value>
+ </prop>
+ <prop oor:name="ObjectVerbs">
+ <value>PRIMARY SHOW OPEN HIDE UIACTIVATE IPACTIVATE</value>
+ </prop>
+ </node>
+ <node oor:name="80243D39-6741-46C5-926E-069164FF87BB" oor:op="replace" >
+ <prop oor:name="ObjectFactory">
+ <value>com.sun.star.embed.OOoEmbeddedObjectFactory</value>
+ </prop>
+ <prop oor:name="ObjectDocumentServiceName">
+ <value>com.sun.star.chart2.ChartDocument</value>
+ </prop>
+ <prop oor:name="ObjectDocumentFilterName">
+ <value>StarOffice XML (Base) Report Chart</value>
+ </prop>
+ <prop oor:name="ObjectMiscStatus">
+ <value>1</value>
+ </prop>
+ <prop oor:name="ObjectVerbs">
+ <value>PRIMARY SHOW OPEN HIDE UIACTIVATE IPACTIVATE</value>
+ </prop>
+ </node>
</node>
<node oor:name="ObjectNames">
<node oor:name="Calc" oor:op="replace" install:module="calc">
@@ -316,5 +347,14 @@
</prop>
</node>
</node>
+
+ <node oor:name="MimeTypeClassIDRelations" install:module="reportbuilder">
+ <prop oor:name="application/vnd.sun.xml.report.chart" oor:op="replace" oor:type="xs:string">
+ <value>80243D39-6741-46C5-926E-069164FF87BB</value>
+ </prop>
+ <prop oor:name="application/vnd.sun.xml.report" oor:op="replace" oor:type="xs:string">
+ <value>D7896D52-B7AF-4820-9DFE-D404D015960F</value>
+ </prop>
+ </node>
</oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu b/officecfg/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
new file mode 100644
index 0000000..890127e
--- /dev/null
+++ b/officecfg/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+<oor:component-data oor:name="ExtendedColorScheme" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <node oor:name="ExtendedColorScheme">
+ <prop oor:name="CurrentColorScheme">
+ <value>default</value>
+ </prop>
+ <node oor:name="ColorSchemes">
+ <node oor:name="default" oor:op="replace">
+ <node oor:name="SunReportBuilder" oor:op="replace">
+ <node oor:name="Entries">
+ <node oor:name="ReportHeader" oor:op="replace">
+ <prop oor:name="Color">
+ <value>8364108</value> <!-- 0x007Fa04C -->
+ </prop>
+ <prop oor:name="DefaultColor">
+ <value>8364108</value> <!-- 0x007Fa04C -->
+ </prop>
+ </node>
+ <node oor:name="ReportFooter" oor:op="replace">
+ <prop oor:name="Color">
+ <value>8364108</value> <!-- 0x007Fa04C -->
+ </prop>
+ <prop oor:name="DefaultColor">
+ <value>8364108</value> <!-- 0x007Fa04C -->
+ </prop>
+ </node>
+ <node oor:name="PageHeader" oor:op="replace">
+ <prop oor:name="Color">
+ <value>15778136</value> <!-- 0x00F0C158 -->
+ </prop>
+ <prop oor:name="DefaultColor">
+ <value>15778136</value> <!-- 0x00F0C158 -->
+ </prop>
+ </node>
+ <node oor:name="PageFooter" oor:op="replace">
+ <prop oor:name="Color">
+ <value>15778136</value> <!-- 0x00F0C158 -->
+ </prop>
+ <prop oor:name="DefaultColor">
+ <value>15778136</value> <!-- 0x00F0C158 -->
+ </prop>
+ </node>
+ <node oor:name="GroupHeader" oor:op="replace">
+ <prop oor:name="Color">
+ <value>11190738</value> <!-- 0x00AAC1D2 -->
+ </prop>
+ <prop oor:name="DefaultColor">
+ <value>11190738</value> <!-- 0x00AAC1D2 -->
+ </prop>
+ </node>
+ <node oor:name="GroupFooter" oor:op="replace">
+ <prop oor:name="Color">
+ <value>11190738</value> <!-- 0x00AAC1D2 -->
+ </prop>
+ <prop oor:name="DefaultColor">
+ <value>11190738</value> <!-- 0x00AAC1D2 -->
+ </prop>
+ </node>
+ <node oor:name="ColumnHeader" oor:op="replace">
+ <prop oor:name="Color">
+ <value>11190738</value> <!-- 0x00AAC1D2 -->
+ </prop>
+ <prop oor:name="DefaultColor">
+ <value>11190738</value> <!-- 0x00AAC1D2 -->
+ </prop>
+ </node>
+ <node oor:name="ColumnFooter" oor:op="replace">
+ <prop oor:name="Color">
+ <value>11190738</value> <!-- 0x00AAC1D2 -->
+ </prop>
+ <prop oor:name="DefaultColor">
+ <value>11190738</value> <!-- 0x00AAC1D2 -->
+ </prop>
+ </node>
+ <node oor:name="Detail" oor:op="replace">
+ <prop oor:name="Color">
+ <value>15844514</value> <!-- 0x00F1C4A2 -->
+ </prop>
+ <prop oor:name="DefaultColor">
+ <value>15844514</value> <!-- 0x00F1C4A2 -->
+ </prop>
+ </node>
+ <node oor:name="OverlappedControl" oor:op="replace">
+ <prop oor:name="Color">
+ <value>16724838</value> <!-- 0x00FF3366 -->
+ </prop>
+ <prop oor:name="DefaultColor">
+ <value>16724838</value> <!-- 0x00FF3366 -->
+ </prop>
+ </node>
+ <node oor:name="TextBoxBoundContent" oor:op="replace">
+ <prop oor:name="Color">
+ <value>8421504</value> <!-- 0x00808080 -->
+ </prop>
+ <prop oor:name="DefaultColor">
+ <value>8421504</value> <!-- 0x00808080 -->
+ </prop>
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ </node>
+ <node oor:name="EntryNames">
+ <node oor:name="SunReportBuilder" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en-US">Oracle Report Builder</value>
+ </prop>
+ <node oor:name="Entries">
+ <node oor:name="ReportHeader" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en-US">Report Header</value>
+ </prop>
+ </node>
+ <node oor:name="ReportFooter" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en-US">Report Footer</value>
+ </prop>
+ </node>
+ <node oor:name="PageHeader" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en-US">Page Header</value>
+ </prop>
+ </node>
+ <node oor:name="PageFooter" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en-US">Page Footer</value>
+ </prop>
+ </node>
+ <node oor:name="GroupHeader" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en-US">Group Header</value>
+ </prop>
+ </node>
+ <node oor:name="GroupFooter" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en-US">Group Footer</value>
+ </prop>
+ </node>
+ <node oor:name="ColumnHeader" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en-US">Column Header</value>
+ </prop>
+ </node>
+ <node oor:name="ColumnFooter" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en-US">Column Footer</value>
+ </prop>
+ </node>
+ <node oor:name="Detail" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en-US">Detail</value>
+ </prop>
+ </node>
+ <node oor:name="OverlappedControl" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en-US">Overlapped Control</value>
+ </prop>
+ </node>
+ <node oor:name="TextBoxBoundContent" oor:op="replace">
+ <prop oor:name="DisplayName">
+ <value xml:lang="en-US">Text Box Bound Content</value>
+ </prop>
+ </node>
+ </node>
+ </node>
+ </node>
+</oor:component-data>
+
diff --git a/officecfg/registry/data/org/openoffice/Office/ReportDesign.xcu b/officecfg/registry/data/org/openoffice/Office/ReportDesign.xcu
new file mode 100644
index 0000000..53b8ba5
--- /dev/null
+++ b/officecfg/registry/data/org/openoffice/Office/ReportDesign.xcu
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="ReportDesign" oor:package="org.openoffice.Office">
+ <node oor:name="UserData" oor:extensible="true">
+ <prop oor:name="Chart" oor:op="replace" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+</oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 2f40b2a..8b01361 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -429,6 +429,117 @@
<value>com.sun.star.svx.UpSearchToolboxController</value>
</prop>
</node>
+
+ <node oor:name="c4" oor:op="replace" install:module="reportbuilder">
+ <prop oor:name="Command">
+ <value>.uno:FontColor</value>
+ </prop>
+ <prop oor:name="Module">
+ <value>com.sun.star.report.ReportDefinition</value>
+ </prop>
+ <prop oor:name="Controller">
+ <value>com.sun.star.report.ReportToolboxController</value>
+ </prop>
+ </node>
+ <node oor:name="c5" oor:op="replace" install:module="reportbuilder">
+ <prop oor:name="Command">
+ <value>.uno:BackgroundColor</value>
+ </prop>
+ <prop oor:name="Module">
+ <value>com.sun.star.report.ReportDefinition</value>
+ </prop>
+ <prop oor:name="Controller">
+ <value>com.sun.star.report.ReportToolboxController</value>
+ </prop>
+ </node>
+ <node oor:name="c6" oor:op="replace" install:module="reportbuilder">
+ <prop oor:name="Command">
+ <value>.uno:Color</value>
+ </prop>
+ <prop oor:name="Module">
+ <value>com.sun.star.report.ReportDefinition</value>
+ </prop>
+ <prop oor:name="Controller">
+ <value>com.sun.star.report.ReportToolboxController</value>
+ </prop>
+ </node>
+ <node oor:name="c7" oor:op="replace" install:module="reportbuilder">
+ <prop oor:name="Command">
+ <value>.uno:BasicShapes</value>
+ </prop>
+ <prop oor:name="Module">
+ <value>com.sun.star.report.ReportDefinition</value>
+ </prop>
+ <prop oor:name="Controller">
+ <value>com.sun.star.report.ReportToolboxController</value>
+ </prop>
+ </node>
+ <node oor:name="c8" oor:op="replace" install:module="reportbuilder">
+ <prop oor:name="Command">
+ <value>.uno:SymbolShapes</value>
+ </prop>
+ <prop oor:name="Module">
+ <value>com.sun.star.report.ReportDefinition</value>
+ </prop>
+ <prop oor:name="Controller">
+ <value>com.sun.star.report.ReportToolboxController</value>
+ </prop>
+ </node>
+ <node oor:name="c9" oor:op="replace" install:module="reportbuilder">
+ <prop oor:name="Command">
+ <value>.uno:ArrowShapes</value>
+ </prop>
+ <prop oor:name="Module">
+ <value>com.sun.star.report.ReportDefinition</value>
+ </prop>
+ <prop oor:name="Controller">
+ <value>com.sun.star.report.ReportToolboxController</value>
+ </prop>
+ </node>
+ <node oor:name="c10" oor:op="replace" install:module="reportbuilder">
+ <prop oor:name="Command">
+ <value>.uno:FlowChartShapes</value>
+ </prop>
+ <prop oor:name="Module">
+ <value>com.sun.star.report.ReportDefinition</value>
+ </prop>
+ <prop oor:name="Controller">
+ <value>com.sun.star.report.ReportToolboxController</value>
+ </prop>
+ </node>
+ <node oor:name="c11" oor:op="replace" install:module="reportbuilder">
+ <prop oor:name="Command">
+ <value>.uno:CalloutShapes</value>
+ </prop>
+ <prop oor:name="Module">
+ <value>com.sun.star.report.ReportDefinition</value>
+ </prop>
+ <prop oor:name="Controller">
+ <value>com.sun.star.report.ReportToolboxController</value>
+ </prop>
+ </node>
+ <node oor:name="c12" oor:op="replace" install:module="reportbuilder">
+ <prop oor:name="Command">
+ <value>.uno:StarShapes</value>
+ </prop>
+ <prop oor:name="Module">
+ <value>com.sun.star.report.ReportDefinition</value>
+ </prop>
+ <prop oor:name="Controller">
+ <value>com.sun.star.report.ReportToolboxController</value>
+ </prop>
+ </node>
+ <node oor:name="c14" oor:op="replace" install:module="reportbuilder">
+ <prop oor:name="Command">
+ <value>.uno:CharFontName</value>
+ </prop>
+ <prop oor:name="Module">
+ <value>com.sun.star.report.ReportDefinition</value>
+ </prop>
+ <prop oor:name="Controller">
+ <value>com.sun.star.report.ReportToolboxController</value>
+ </prop>
+ </node>
</node>
<node oor:name="StatusBar">
<node oor:name="c1" oor:op="replace">
@@ -508,6 +619,30 @@
<value>com.sun.star.comp.framework.LangSelectionStatusbarController</value>
</prop>
</node>
+
+ <node oor:name="c8" oor:op="replace" install:module="reportbuilder">
+ <prop oor:name="Command">
+ <value>.uno:ZoomSlider</value>
+ </prop>
+ <prop oor:name="Module">
+ <value>com.sun.star.report.ReportDefinition</value>
+ </prop>
+ <prop oor:name="Controller">
+ <value>com.sun.star.report.comp.StatusbarController</value>
+ </prop>
+ </node>
+ <node oor:name="c9" oor:op="replace" install:module="reportbuilder">
+ <prop oor:name="Command">
+ <value>.uno:Zoom</value>
+ </prop>
+ <prop oor:name="Module">
+ <value>com.sun.star.report.ReportDefinition</value>
+ </prop>
+ <prop oor:name="Controller">
+ <value>com.sun.star.report.comp.StatusbarController</value>
+ </prop>
+ </node>
+
</node>
</node>
</oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu
new file mode 100644
index 0000000..91bce67
--- /dev/null
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="DbReportWindowState" oor:package="org.openoffice.Office.UI">
+ <node oor:name="UIElements">
+ <node oor:name="States">
+ <node oor:name="private:resource/toolbar/toolbar" oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,1</value>
+ </prop>
+ <prop oor:name="Docked" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>0</value>
+ </prop>
+ <prop oor:name="Style" oor:type="xs:int">
+ <value>0</value>
+ </prop>
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Standard</value>
+ </prop>
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/toolbar/Formatting" oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,1</value>
+ </prop>
+ <prop oor:name="Docked" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>0</value>
+ </prop>
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Formatting</value>
+ </prop>
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/toolbar/reportcontrols" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Report Controls</value>
+ </prop>
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,2</value>
+ </prop>
+ <prop oor:name="Docked" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/toolbar/drawbar" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Drawing objects</value>
+ </prop>
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>297,2</value>
+ </prop>
+ <prop oor:name="Docked" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>false</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/toolbar/alignmentbar" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Align</value>
+ </prop>
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>489,2</value>
+ </prop>
+ <prop oor:name="Docked" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/toolbar/sectionalignmentbar" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Align at Section</value>
+ </prop>
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,2</value>
+ </prop>
+ <prop oor:name="Docked" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/toolbar/sectionshrinkbar" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Shrink at Section</value>
+ </prop>
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,2</value>
+ </prop>
+ <prop oor:name="Docked" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/toolbar/resizebar" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Object Resizing</value>
+ </prop>
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>670,2</value>
+ </prop>
+ <prop oor:name="Docked" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ </node>
+ </node>
+</oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
new file mode 100644
index 0000000..df7277d
--- /dev/null
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
@@ -0,0 +1,394 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+<oor:component-data oor:name="ReportCommands" oor:package="org.openoffice.Office.UI" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <node oor:name="UserInterface">
+ <node oor:name="Commands">
+ <node oor:name=".uno:ReportHeaderFooter" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Report Header/Footer</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:PageHeaderFooter" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Page Header/Footer</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:ShowRuler" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Ruler</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:DbSortingAndGrouping" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Sorting and Grouping</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:AddField" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Add Field</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:ConditionalFormatting" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Conditional Formatting...</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:PageDialog" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Page Settings</value>
+ </prop>
+ <prop oor:name="ContextLabel" oor:type="xs:string">
+ <value xml:lang="en-US">~Page...</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:ResetAttributes" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Clear Direct Formatting</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:InsertPageNumberField" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Page Numbers...</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:InsertDateTimeField" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Date and Time...</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SelectReport" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Select Report</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SubReportInNewWindow" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Subreport in New Window...</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:FontColor" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Font Color</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:GridMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Gr~id</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:ColumnHeaderFooter" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Column Header/Footer</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:PasteSpecial" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Paste ~Special...</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:ExecuteReport" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Execute Report...</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:ImageControl" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Graphic...</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:TextDocument" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Text Document</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:Spreadsheet" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Spreadsheet Document</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:ReportNavigator" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Report Navigator</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SmallestWidth" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Fit to smallest width</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SmallestHeight" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Fit to smallest height</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:GreatestWidth" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Fit to greatest width</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:GreatestHeight" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Fit to greatest height</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:ControlProperties" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Properties</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:Distribution" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Distribution...</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SelectAllInSection" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Select Objects in Section</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SectionAlignLeft" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Left Align on Section</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SectionAlignRight" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Right Align on Section</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SectionAlignTop" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Top Align on Section</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SectionAlignBottom" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Bottom Align on Section</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SectionAlignCenter" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Centered on Section</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SectionAlignMiddle" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Middle on Section</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SelectAllLabels" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Select all Labels</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SelectAllEdits" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Select all Formatted Fields</value>
+ </prop>
+ </node>
+
+ <!-- You will find corresponding icons in icon-themes/(name of theme)/cmd. -->
+ <!-- The name has no .uno: prefix but lc_ or lch_ or sc_ or sch_ -->
+
+ <node oor:name=".uno:EditShapeMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Shape Arrange</value>
+ </prop>
+ </node>
+
+ <node oor:name=".uno:EditControlMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Control</value>
+ </prop>
+ </node>
+
+ <!--
+ <node oor:name=".uno:EditSectionMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Section</value>
+ </prop>
+ </node>
+-->
+
+ <node oor:name=".uno:AlignmentMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Alignment</value>
+ </prop>
+ </node>
+
+ <node oor:name=".uno:ResizeMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Resize</value>
+ </prop>
+ </node>
+
+ <node oor:name=".uno:SectionAlignmentMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Section alignment</value>
+ </prop>
+ </node>
+
+ <node oor:name=".uno:ReportControlMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Report Controls</value>
+ </prop>
+ </node>
+
+ <node oor:name=".uno:ShapesMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Shapes</value>
+ </prop>
+ </node>
+
+ <node oor:name=".uno:BasicShapesMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Basic Shapes</value>
+ </prop>
+ </node>
+
+ <node oor:name=".uno:SymbolShapesMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Symbol Shapes</value>
+ </prop>
+ </node>
+
+ <node oor:name=".uno:ArrowShapesMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Arrow Shapes</value>
+ </prop>
+ </node>
+
+ <node oor:name=".uno:FlowChartShapesMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">FlowChart Shapes</value>
+ </prop>
+ </node>
+
+ <node oor:name=".uno:CalloutShapesMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Callout Shapes</value>
+ </prop>
+ </node>
+
+ <node oor:name=".uno:StarShapesMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Star Shapes</value>
+ </prop>
+ </node>
+
+ <node oor:name=".uno:SectionShrinkMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Section</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SectionShrink" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Shrink</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SectionShrinkTop" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Shrink from top</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SectionShrinkBottom" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Shrink from bottom</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+
+ </node>
+ <node oor:name="Popups">
+ <node oor:name=".uno:ExportReportTo" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Report Output Format</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SnapLinesMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Snap Lines</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:ObjectResize" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Object Resizing</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:ArrangeMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">A~rrange</value>
+ </prop>
+ </node>
+ </node>
+ </node>
+</oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index 4017fc7..ea9b186 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -757,6 +757,26 @@
<value>Base</value>
</prop>
</node>
+ <node oor:name="com.sun.star.report.ReportDefinition" oor:op="replace" install:module="reportbuilder">
+ <prop oor:name="ooSetupFactoryCommandConfigRef">
+ <value >ReportCommands</value>
+ </prop>
+ <prop oor:name="ooSetupFactoryShortName">
+ <value >dbreport</value>
+ </prop>
+ <prop oor:name="ooSetupFactoryWindowStateConfigRef">
+ <value >DbReportWindowState</value>
+ </prop>
+ <prop oor:name="ooSetupFactoryIcon">
+ <value >12</value>
+ </prop>
+ <prop oor:name="ooSetupFactoryCmdCategoryConfigRef">
+ <value >GenericCategories</value>
+ </prop>
+ <prop oor:name="ooSetupFactoryUIName">
+ <value >Base: Oracle Report Builder</value>
+ </prop>
+ </node>
</node>
</node>
<node oor:name="Migration">
diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu b/officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu
new file mode 100644
index 0000000..1b24d40
--- /dev/null
+++ b/officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:package="org.openoffice.TypeDetection" oor:name="Filter">
+ <node oor:name="Filters">
+ <node oor:name="StarOffice XML (Base) Report" oor:op="replace" oor:finalized="false" oor:mandatory="false">
+ <prop oor:name="Flags">
+ <value>IMPORT EXPORT OWN DEFAULT 3RDPARTYFILTER NOTINFILEDIALOG NOTINCHOOSER</value>
+ </prop>
+ <prop oor:name="UIComponent"/>
+ <prop oor:name="FilterService"/>
+ <prop oor:name="UserData"/>
+ <prop oor:name="FileFormatVersion">
+ <value>6800</value>
+ </prop>
+ <prop oor:name="Type">
+ <value>StarBaseReport</value>
+ </prop>
+ <prop oor:name="TemplateName"/>
+ <prop oor:name="DocumentService">
+ <value>com.sun.star.report.ReportDefinition</value>
+ </prop>
+ <prop oor:name="UIName">
+ <value xml:lang="en-US">ODF Database Report</value>
+ </prop>
+ </node>
+
+ <node oor:name="StarOffice XML (Base) Report Chart" oor:op="replace" oor:finalized="false" oor:mandatory="false">
+ <prop oor:name="Flags">
+ <value>IMPORT EXPORT OWN DEFAULT NOTINFILEDIALOG NOTINCHOOSER</value>
+ </prop>
+ <prop oor:name="UIComponent"/>
+ <prop oor:name="FilterService">
+ <value>com.sun.star.comp.chart2.report.XMLFilter</value>
+ </prop>
+ <prop oor:name="UserData"/>
+ <prop oor:name="FileFormatVersion">
+ <value>6800</value>
+ </prop>
+ <prop oor:name="Type">
+ <value>StarBaseReportChart</value>
+ </prop>
+ <prop oor:name="TemplateName"/>
+ <prop oor:name="DocumentService">
+ <value>com.sun.star.chart2.ChartDocument</value>
+ </prop>
+ <prop oor:name="UIName">
+ <value xml:lang="en-US">%productname% %formatversion% Report Chart</value>
+ </prop>
+ </node>
+ </node>
+</oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/Types.xcu b/officecfg/registry/data/org/openoffice/TypeDetection/Types.xcu
new file mode 100644
index 0000000..9faf9ea
--- /dev/null
+++ b/officecfg/registry/data/org/openoffice/TypeDetection/Types.xcu
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:package="org.openoffice.TypeDetection" oor:name="Types">
+ <node oor:name="Types">
+ <node oor:name="StarBaseReport" oor:op="replace">
+ <prop oor:name="DetectService">
+ <value>com.sun.star.comp.report.ORptTypeDetection</value>
+ </prop>
+ <prop oor:name="URLPattern">
+ <value>private:factory/sreport*</value>
+ </prop>
+ <prop oor:name="Extensions">
+ <value>orp</value>
+ </prop>
+ <prop oor:name="MediaType">
+ <value>application/vnd.sun.xml.report</value>
+ </prop>
+ <prop oor:name="Preferred">
+ <value>false</value>
+ </prop>
+ <prop oor:name="PreferredFilter">
+ <value>StarOffice XML (Base) Report</value>
+ </prop>
+ <prop oor:name="UIName">
+ <value xml:lang="en-US">OpenDocument Database Report</value>
+ </prop>
+ <prop oor:name="ClipboardFormat">
+ <value>StarBaseReport 9.0</value>
+ </prop>
+ </node>
+ <node oor:name="StarBaseReportChart" oor:op="replace">
+ <prop oor:name="DetectService"/>
+ <prop oor:name="URLPattern">
+ <value></value>
+ </prop>
+ <prop oor:name="Extensions">
+ <value>odc</value>
+ </prop>
+ <prop oor:name="MediaType">
+ <value>application/vnd.sun.xml.report.chart</value>
+ </prop>
+ <prop oor:name="Preferred">
+ <value>false</value>
+ </prop>
+ <prop oor:name="PreferredFilter">
+ <value>StarOffice XML (Base) Report Chart</value>
+ </prop>
+ <prop oor:name="UIName">
+ <value xml:lang="en-US">StarOffice XML (Base) Report Chart 9</value>
+ </prop>
+ <prop oor:name="ClipboardFormat">
+ <value>StarOffice XML (Base) Report Chart 9</value>
+ </prop>
+ </node>
+ </node>
+</oor:component-data>
diff --git a/officecfg/registry/files.mk b/officecfg/registry/files.mk
index 1f6fbfa..7a2deb8 100644
--- a/officecfg/registry/files.mk
+++ b/officecfg/registry/files.mk
@@ -43,6 +43,7 @@ officecfg_XCSFILES := \
Office/PresenterScreen \
Office/ProtocolHandler \
Office/Recovery \
+ Office/ReportDesign \
Office/SFX \
Office/Scripting \
Office/Security \
@@ -66,6 +67,7 @@ officecfg_XCSFILES := \
Office/UI/DbBrowserWindowState \
Office/UI/DbQueryWindowState \
Office/UI/DbRelationWindowState \
+ Office/UI/DbReportWindowState \
Office/UI/DbTableDataWindowState \
Office/UI/DbTableWindowState \
Office/UI/DbuCommands \
@@ -79,6 +81,7 @@ officecfg_XCSFILES := \
Office/UI/ImpressWindowState \
Office/UI/MathCommands \
Office/UI/MathWindowState \
+ Office/UI/ReportCommands \
Office/UI/StartModuleCommands \
Office/UI/StartModuleWindowState \
Office/UI/WindowContentFactories \
diff --git a/officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs b/officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs
new file mode 100644
index 0000000..89336c0
--- /dev/null
+++ b/officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+<oor:component-schema oor:name="ReportDesign" oor:package="org.openoffice.Office" xml:lang="en-US" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <info>
+ <author>OJ</author>
+ <desc>Contains informatation of report design.</desc>
+ </info>
+ <component>
+ <group oor:name="PropertyBrowser">
+ <info>
+ <desc>specifies settings for the property browser used for reports and report controls.</desc>
+ </info>
+ <prop oor:name="DirectHelp" oor:type="xs:boolean">
+ <info>
+ <author>OJ</author>
+ <desc>Enables or disables a help section at the bottom of the property browser, which shows the help of the currently active property.</desc>
+ </info>
+ <value>false</value>
+ </prop>
+ </group>
+ <group oor:name="Extension">
+ <info>
+ <desc>specifies extension settings for the report designer.</desc>
+ </info>
+ <prop oor:name="DownloadURL" oor:type="xs:string">
+ <info>
+ <author>LLA</author>
+ <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>
+ <author>LLA</author>
+ <desc>Name of the extension.</desc>
+ </info>
+ <value>Oracle(tm) Report Builder</value>
+ </prop>
+ </group>
+ <group oor:name="UserData" oor:extensible="true">
+ <info>
+ <desc>Denotes an additional field for arbitrary data.</desc>
+ </info>
+ </group>
+ </component>
+</oor:component-schema>
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs
new file mode 100644
index 0000000..3358e54
--- /dev/null
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+<oor:component-schema oor:name="DbReportWindowState" oor:package="org.openoffice.Office.UI" xml:lang="en-US" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <info>
+ <author>OJ</author>
+ <desc>Contains state information of all dockable user interface elements based on a Window class which belongs to the database report module.</desc>
+ </info>
+ <import oor:component="org.openoffice.Office.UI.WindowState"/>
+ <uses oor:component="org.openoffice.Office.UI.WindowState"/>
+ <templates/>
+ <component>
+ <group oor:name="UIElements">
+ <info>
+ <desc>Contains user interface element state data specific for the database report module."</desc>
+ </info>
+ <set oor:name="States" oor:node-type="WindowStateType" oor:component="org.openoffice.Office.UI.WindowState">
+ <info>
+ <desc>Contains states of all known dockable user interface elements of the report module."</desc>
+ </info>
+ </set>
+ </group>
+ </component>
+</oor:component-schema>
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs
new file mode 100644
index 0000000..cd0771e
--- /dev/null
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="ReportCommands" oor:package="org.openoffice.Office.UI" xml:lang="en-US">
+ <info>
+ <author>OJ</author>
+ <desc>Contains general information and about actions based on office commands.</desc>
+ </info>
+ <import oor:component="org.openoffice.Office.UI.Commands"/>
+ <uses oor:component="org.openoffice.Office.UI.Commands"/>
+ <templates/>
+ <component>
+ <group oor:name="UserInterface">
+ <info>
+ <desc>Contains user interface data for Office commands and identifiers that are used by the user interface."</desc>
+ </info>
+ <set oor:name="Commands" oor:node-type="LabelType" oor:component="org.openoffice.Office.UI.Commands">
+ <info>
+ <desc>Contains label text for Office commands and identifiers that are used by the user interface."</desc>
+ </info>
+ </set>
+ <set oor:name="Popups" oor:node-type="LabelType" oor:component="org.openoffice.Office.UI.Commands">
+ <info>
+ <desc>Contains label text for popup menus identifiers that are used by the user interface."</desc>
+ </info>
+ </set>
+ </group>
+ </component>
+</oor:component-schema>
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 181c782..40fd0d4 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -367,6 +367,25 @@ postprocess_DEPS_pyuno := main
postprocess_FILES_pyuno := \
$(postprocess_MOD)/org/openoffice/Office/Scripting-python.xcu
+ifeq ($(ENABLE_REPORTBUILDER),TRUE)
+postprocess_XCDS += reportbuilder.xcd
+postprocess_DEPS_reportbuilder := main
+postprocess_FILES_reportbuilder := \
+ $(postprocess_XCS)/Office/ReportDesign.xcs \
+ $(postprocess_XCS)/Office/UI/DbReportWindowState.xcs \
+ $(postprocess_XCS)/Office/UI/ReportCommands.xcs \
+ $(postprocess_XCU)/Office/ExtendedColorScheme.xcu \
+ $(postprocess_XCU)/Office/ReportDesign.xcu \
+ $(postprocess_XCU)/Office/UI/DbReportWindowState.xcu \
+ $(postprocess_XCU)/Office/UI/ReportCommands.xcu \
+ $(postprocess_XCU)/TypeDetection/Filter.xcu \
+ $(postprocess_XCU)/TypeDetection/Types.xcu \
+ $(postprocess_MOD)/org/openoffice/Setup-reportbuilder.xcu \
+ $(postprocess_MOD)/org/openoffice/Office/Accelerators-reportbuilder.xcu \
+ $(postprocess_MOD)/org/openoffice/Office/DataAccess-reportbuilder.xcu \
+ $(postprocess_MOD)/org/openoffice/Office/Embedding-reportbuilder.xcu
+endif
+
postprocess_DEPS_writer := main
postprocess_FILES_writer := \
$(postprocess_XCS)/Office/UI/WriterCommands.xcs \
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 8693cd1..4b0b8b7 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -334,4 +334,10 @@ $(eval $(call gb_Rdb_add_components,services,\
))
endif
+ifeq ($(ENABLE_REPORTBUILDER),TRUE)
+$(eval $(call gb_Rdb_add_components,services,\
+ reportbuilder/java/reportbuilder \
+))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/reportbuilder/Configuration_reportbuilder.mk b/reportbuilder/Configuration_reportbuilder.mk
deleted file mode 100644
index 14239aa..0000000
--- a/reportbuilder/Configuration_reportbuilder.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Configuration_Configuration,report-builder,nodeliver))
-
-$(eval $(call gb_Configuration_use_configuration,report-builder,registry))
-
-$(eval $(call gb_Configuration_add_schemas,report-builder,reportbuilder/registry/schema,\
- org/openoffice/Office/ReportDesign.xcs \
- org/openoffice/Office/UI/DbReportWindowState.xcs \
- org/openoffice/Office/UI/ReportCommands.xcs \
-))
-
-$(eval $(call gb_Configuration_add_datas,report-builder,reportbuilder/registry/data,\
- org/openoffice/Office/Paths.xcu \
- org/openoffice/Office/ReportDesign.xcu \
- org/openoffice/Office/UI/Controller.xcu \
-))
-
-$(eval $(call gb_Configuration_add_localized_datas,report-builder,reportbuilder/registry/data,\
- org/openoffice/Office/Accelerators.xcu \
- org/openoffice/Office/DataAccess.xcu \
- org/openoffice/Office/Embedding.xcu \
- org/openoffice/Office/ExtendedColorScheme.xcu \
- org/openoffice/Office/UI/DbReportWindowState.xcu \
- org/openoffice/Office/UI/ReportCommands.xcu \
- org/openoffice/Setup.xcu \
- org/openoffice/TypeDetection/Filter.xcu \
- org/openoffice/TypeDetection/Types.xcu \
-))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/reportbuilder/Extension_reportbuilder.mk b/reportbuilder/Extension_reportbuilder.mk
deleted file mode 100644
index 342522e..0000000
--- a/reportbuilder/Extension_reportbuilder.mk
+++ /dev/null
@@ -1,105 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Extension_Extension,report-builder,reportbuilder/util))
-
-$(eval $(call gb_Extension_use_default_description,report-builder))
-$(eval $(call gb_Extension_use_default_license,report-builder))
-
-$(eval $(call gb_Extension_add_files,report-builder,,\
- $(call gb_Jar_get_outdir_target,reportbuilderwizard) \
- $(call gb_Jar_get_outdir_target,report-builder) \
- $(SRCDIR)/reportbuilder/license/readme_en-US.html \
- $(SRCDIR)/reportbuilder/license/readme_en-US.txt \
- $(SRCDIR)/reportbuilder/util/components.rdb \
-))
-
-ifneq ($(SYSTEM_APACHE_COMMONS),YES)
-$(eval $(call gb_Extension_add_files,report-builder,,\
- $(OUTDIR)/bin/commons-logging-1.1.1.jar \
-))
-endif
-
-ifneq ($(SYSTEM_JFREEREPORT),YES)
-include $(SRCDIR)/jfreereport/version.mk
-$(eval $(call gb_Extension_add_files,report-builder,,\
- $(OUTDIR)/bin/flow-engine-$(FLOW_ENGINE_VERSION).jar \
- $(OUTDIR)/bin/flute-$(FLUTE_VERSION).jar \
- $(OUTDIR)/bin/libbase-$(LIBBASE_VERSION).jar \
- $(OUTDIR)/bin/libfonts-$(LIBFONTS_VERSION).jar \
- $(OUTDIR)/bin/libformula-$(LIBFORMULA_VERSION).jar \
- $(OUTDIR)/bin/liblayout-$(LIBLAYOUT_VERSION).jar \
- $(OUTDIR)/bin/libloader-$(LIBLOADER_VERSION).jar \
- $(OUTDIR)/bin/librepository-$(LIBREPOSITORY_VERSION).jar \
- $(OUTDIR)/bin/libserializer-$(LIBSERIALIZER_VERSION).jar \
- $(OUTDIR)/bin/libxml-$(LIBXML_VERSION).jar \
- $(OUTDIR)/bin/sac.jar \
-))
-endif
-
-$(eval $(call gb_Extension_add_files,report-builder,images,\
- $(SRCDIR)/icon-themes/galaxy/desktop/res/extension_32.png \
-))
-
-$(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice,\
- $(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/Setup.xcu) \
-))
-
-$(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/Office,\
- $(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu) \
- $(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu) \
- $(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu) \
- $(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu) \
- $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Paths.xcu) \
- $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu) \
-))
-
-$(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/Office/UI,\
- $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu) \
- $(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu) \
- $(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu) \
-))
-
-$(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/TypeDetection,\
- $(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu) \
- $(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu) \
-))
-
-$(eval $(call gb_Extension_add_files,report-builder,registry/schema/org/openoffice/Office,\
- $(call gb_XcsTarget_get_target,reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs) \
-))
-
-$(eval $(call gb_Extension_add_files,report-builder,registry/schema/org/openoffice/Office/UI,\
- $(call gb_XcsTarget_get_target,reportbuilder/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs) \
- $(call gb_XcsTarget_get_target,reportbuilder/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs) \
-))
-
-$(eval $(call gb_Extension_add_files,report-builder,template/en-US/wizard/report,\
- $(SRCDIR)/reportbuilder/template/en-US/wizard/report/default.otr \
-))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/reportbuilder/Jar_reportbuilder.mk b/reportbuilder/Jar_reportbuilder.mk
index 1fa82b6..a8e39a0 100644
--- a/reportbuilder/Jar_reportbuilder.mk
+++ b/reportbuilder/Jar_reportbuilder.mk
@@ -25,9 +25,9 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_Jar_Jar,report-builder))
+$(eval $(call gb_Jar_Jar,reportbuilder))
-$(eval $(call gb_Jar_use_jars,report-builder,\
+$(eval $(call gb_Jar_use_jars,reportbuilder,\
java_uno \
juh \
jurt \
@@ -35,7 +35,7 @@ $(eval $(call gb_Jar_use_jars,report-builder,\
unoil \
))
-$(eval $(call gb_Jar_use_externals,report-builder,\
+$(eval $(call gb_Jar_use_externals,reportbuilder,\
commons-logging \
flow-engine \
flute \
@@ -50,11 +50,13 @@ $(eval $(call gb_Jar_use_externals,report-builder,\
sac \
))
-$(eval $(call gb_Jar_set_manifest,report-builder,$(SRCDIR)/reportbuilder/util/manifest.mf))
+$(eval $(call gb_Jar_set_manifest,reportbuilder,$(SRCDIR)/reportbuilder/java/manifest.mf))
-$(eval $(call gb_Jar_set_packageroot,report-builder,org))
+$(eval $(call gb_Jar_set_componentfile,reportbuilder,reportbuilder/java/reportbuilder,OOO))
-$(eval $(call gb_Jar_add_sourcefiles,report-builder,\
+$(eval $(call gb_Jar_set_packageroot,reportbuilder,org))
+
+$(eval $(call gb_Jar_add_sourcefiles,reportbuilder,\
reportbuilder/java/org/libreoffice/report/DataRow \
reportbuilder/java/org/libreoffice/report/DataSource \
reportbuilder/java/org/libreoffice/report/DataSourceException \
@@ -249,13 +251,13 @@ $(eval $(call gb_Jar_add_sourcefiles,report-builder,\
reportbuilder/java/org/libreoffice/report/util/ManifestWriter \
))
-$(eval $(call gb_Jar_add_packagefiles,report-builder,,\
+$(eval $(call gb_Jar_add_packagefiles,reportbuilder,,\
$(SRCDIR)/reportbuilder/java/jfreereport.properties \
$(SRCDIR)/reportbuilder/java/libformula.properties \
$(SRCDIR)/reportbuilder/java/loader.properties \
))
-$(eval $(call gb_Jar_add_packagefiles,report-builder,org/libreoffice/report/function/metadata,\
+$(eval $(call gb_Jar_add_packagefiles,reportbuilder,org/libreoffice/report/function/metadata,\
$(SRCDIR)/reportbuilder/java/org/libreoffice/report/function/metadata/Author-Function.properties \
$(SRCDIR)/reportbuilder/java/org/libreoffice/report/function/metadata/Author-Function_en_US.properties \
$(SRCDIR)/reportbuilder/java/org/libreoffice/report/function/metadata/Title-Function.properties \
@@ -264,7 +266,7 @@ $(eval $(call gb_Jar_add_packagefiles,report-builder,org/libreoffice/report/func
$(SRCDIR)/reportbuilder/java/org/libreoffice/report/function/metadata/category_en_US.properties \
))
-$(eval $(call gb_Jar_add_packagefiles,report-builder,org/libreoffice/report/pentaho,\
+$(eval $(call gb_Jar_add_packagefiles,reportbuilder,org/libreoffice/report/pentaho,\
$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/configuration.properties \
$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/module.properties \
$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/oasis-datastyle.css \
@@ -281,13 +283,13 @@ $(eval $(call gb_Jar_add_packagefiles,report-builder,org/libreoffice/report/pent
$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/xsl-fo.css \
))
-$(eval $(call gb_Jar_add_packagefiles,report-builder,org/libreoffice/report/pentaho/parser,\
+$(eval $(call gb_Jar_add_packagefiles,reportbuilder,org/libreoffice/report/pentaho/parser,\
$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt-schema-v1.0-os.xsd \
$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/parser/selectors.properties \
$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/parser/style-mapping.txt \
))
-$(eval $(call gb_Jar_add_packagefiles,report-builder,org/libreoffice/report/pentaho/styles,\
+$(eval $(call gb_Jar_add_packagefiles,reportbuilder,org/libreoffice/report/pentaho/styles,\
$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/styles/stylemapper.xml \
$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/styles/stylemapper.xsd \
))
diff --git a/reportbuilder/Module_reportbuilder.mk b/reportbuilder/Module_reportbuilder.mk
index 1829743..c1c51e9 100644
--- a/reportbuilder/Module_reportbuilder.mk
+++ b/reportbuilder/Module_reportbuilder.mk
@@ -27,12 +27,9 @@
$(eval $(call gb_Module_Module,reportbuilder))
-ifeq ($(ENABLE_REPORTBUILDER),YES)
+ifeq ($(ENABLE_REPORTBUILDER),TRUE)
$(eval $(call gb_Module_add_targets,reportbuilder,\
- Configuration_reportbuilder \
- Extension_reportbuilder \
Jar_reportbuilder \
- Package_readme \
))
endif
diff --git a/reportbuilder/Package_readme.mk b/reportbuilder/Package_readme.mk
deleted file mode 100644
index 2db7635c..0000000
--- a/reportbuilder/Package_readme.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,reportbuilder_license,$(SRCDIR)/reportbuilder/license))
-
-$(eval $(call gb_Package_add_file,reportbuilder,bin/reportbuilder/readme_en-US.html,readme_en-US.html))
-$(eval $(call gb_Package_add_file,reportbuilder,bin/reportbuilder/readme_en-US.txt,readme_en-US.txt))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/reportbuilder/java/manifest.mf b/reportbuilder/java/manifest.mf
new file mode 100644
index 0000000..2b335b6
--- /dev/null
+++ b/reportbuilder/java/manifest.mf
@@ -0,0 +1,2 @@
+RegistrationClassName: org.libreoffice.report.pentaho.SOReportJobFactory
+UNO-Type-Path:
diff --git a/reportbuilder/java/reportbuilder.component b/reportbuilder/java/reportbuilder.component
new file mode 100644
index 0000000..75cdee4
--- /dev/null
+++ b/reportbuilder/java/reportbuilder.component
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<component loader="com.sun.star.loader.Java2"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="org.libreoffice.report.pentaho.SOFormulaParser">
+ <service name="com.sun.star.report.meta.FormulaParser"/>
+ </implementation>
+ <implementation name="org.libreoffice.report.pentaho.SOFunctionManager">
+ <service name="com.sun.star.report.meta.FunctionManager"/>
+ </implementation>
+ <implementation name="org.libreoffice.report.pentaho.SOReportJobFactory$_SOReportJobFactory">
+ <service name="org.libreoffice.report.pentaho.SOReportJobFactory"/>
+ </implementation>
+</component>
diff --git a/reportbuilder/license/readme_en-US.html b/reportbuilder/license/readme_en-US.html
deleted file mode 100644
index 9733d7d..0000000
--- a/reportbuilder/license/readme_en-US.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<html>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
- <head>
- <title>Oracle Report Builder</title>
- </head>
- <body>
- <h1>Oracle 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>
- <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>
- <li><p>All reports created by Report Builder can also be edited in the Report Builder window. </p></li>
- </ul>
- <p>You find more information about installation and usage of the extension in the following paragraphs of this readme file.</p>
- <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>
- </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>
- <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>
-</body>
-</html>
\ No newline at end of file
diff --git a/reportbuilder/license/readme_en-US.txt b/reportbuilder/license/readme_en-US.txt
deleted file mode 100644
index 5343e7c..0000000
--- a/reportbuilder/license/readme_en-US.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-Oracle 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:
-* 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.
-
-You find more information about installation and usage of the extension in the following paragraphs of this readme file.
-
-Notes on Installation
----------------------
-
-System Requirements
-
-* A recent version of Oracle Open Office or OpenOffice.org
-* A recent version of the Java(TM) Runtime Environment
-
-Installing
-
-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.
-* Double-click the extension file (*.oxt) in your system's file browser or choose Tools > Extension Manager and click Add.
-
-Uninstalling
-
-* Choose Tools > Extension Manager, click the Oracle 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.
diff --git a/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu b/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
deleted file mode 100644
index 890127e..0000000
--- a/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-<oor:component-data oor:name="ExtendedColorScheme" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <node oor:name="ExtendedColorScheme">
- <prop oor:name="CurrentColorScheme">
- <value>default</value>
- </prop>
- <node oor:name="ColorSchemes">
- <node oor:name="default" oor:op="replace">
- <node oor:name="SunReportBuilder" oor:op="replace">
- <node oor:name="Entries">
- <node oor:name="ReportHeader" oor:op="replace">
- <prop oor:name="Color">
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list