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@gmx.de> Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
author: David Ostrovsky <david@ostrovsky.org> 2013-03-13 22:45:02 +0100
committer: David Ostrovsky <David.Ostrovsky@gmx.de> 2013-03-18 15:30:44 +0000
commit: 90a326c7028d5af132c62edfaef77c53627e4c0e (patch)
tree: 61d963c6d5da61755e5072e2ef765d8243361246
parent: 35bc07513c46cfa40fa85ec1053f7ce5c1e9c318 (diff)
42 files changed, 527 insertions, 489 deletions
diff --git a/Repository.mk b/Repository.mk
index 6c7e9714ec51..579cba908237 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 15c575db1fc7..1492d72160ab 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 a7092e0d439f..ce7eb3701649 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 eba42f0f886d..3a0bae3495df 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 50f76cf9c1dc..fd649ba7294d 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 1958a771da8d..4f15a46e6f3c 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 70982483183f..543940dcd9ce 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/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu b/officecfg/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
index 890127e87a20..890127e87a20 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
diff --git a/reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu b/officecfg/registry/data/org/openoffice/Office/ReportDesign.xcu
index 53b8ba592588..53b8ba592588 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/ReportDesign.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 2f40b2ab7a2d..8b01361f57ba 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/reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu
index 91bce6748689..91bce6748689 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu
diff --git a/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
index df7277d48eff..df7277d48eff 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index 4017fc705805..ea9b1865555e 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/reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu b/officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu
index 1b24d4041461..1b24d4041461 100644
--- a/reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu
+++ b/officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu
diff --git a/reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu b/officecfg/registry/data/org/openoffice/TypeDetection/Types.xcu
index 9faf9eac9fed..9faf9eac9fed 100644
--- a/reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu
+++ b/officecfg/registry/data/org/openoffice/TypeDetection/Types.xcu
diff --git a/officecfg/registry/files.mk b/officecfg/registry/files.mk
index 1f6fbfa4d1ac..7a2deb85dea9 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/reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs b/officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs
index 89336c06b5e3..89336c06b5e3 100644
--- a/reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs
diff --git a/reportbuilder/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs
index 3358e5422a6e..3358e5422a6e 100644
--- a/reportbuilder/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs
diff --git a/reportbuilder/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs
index cd0771e58cab..cd0771e58cab 100644
--- a/reportbuilder/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 181c78247ab1..40fd0d4d7647 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 8693cd1d0561..4b0b8b7c527c 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 14239aa46b4a..000000000000
--- 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@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 342522ef1ea0..000000000000
--- 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@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 1fa82b6fbe67..a8e39a0eb2b6 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 1829743ddb86..c1c51e9dabe9 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 2db7635ccb30..000000000000
--- 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@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/util/manifest.mf b/reportbuilder/java/manifest.mf
index 2b335b640796..2b335b640796 100644
--- a/reportbuilder/util/manifest.mf
+++ b/reportbuilder/java/manifest.mf
diff --git a/reportbuilder/java/reportbuilder.component b/reportbuilder/java/reportbuilder.component
new file mode 100644
index 000000000000..75cdee4e0969
--- /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 9733d7d09ebc..000000000000
--- 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 &quot;Create Report in Design View&quot;.</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 &gt; Extension Manager</b>and click <B>Add</B>.</P>
-		<h3>Uninstalling</h3>
-		<p>Choose Tools &gt; 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 5343e7c3d464..000000000000
--- 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/util/META-INF/manifest.xml b/reportbuilder/util/META-INF/manifest.xml
deleted file mode 100644
index ee6b809722fe..000000000000
--- a/reportbuilder/util/META-INF/manifest.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
-<!--
- * 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 .
--->
-<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components"
-                      manifest:full-path="components.rdb"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                      manifest:full-path="registry/data/org/openoffice/Office/Accelerators.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                      manifest:full-path="registry/data/org/openoffice/Office/DataAccess.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                      manifest:full-path="registry/data/org/openoffice/Office/Embedding.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                      manifest:full-path="registry/data/org/openoffice/Office/ExtendedColorScheme.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                      manifest:full-path="registry/data/org/openoffice/Office/Paths.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                      manifest:full-path="registry/data/org/openoffice/Office/ReportDesign.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                      manifest:full-path="registry/data/org/openoffice/Office/UI/Controller.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                      manifest:full-path="registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                      manifest:full-path="registry/data/org/openoffice/Office/UI/ReportCommands.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                      manifest:full-path="registry/data/org/openoffice/Setup.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                      manifest:full-path="registry/data/org/openoffice/TypeDetection/Filter.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                      manifest:full-path="registry/data/org/openoffice/TypeDetection/Types.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
-                      manifest:full-path="registry/schema/org/openoffice/Office/ReportDesign.xcs"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
-                      manifest:full-path="registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
-                      manifest:full-path="registry/schema/org/openoffice/Office/UI/ReportCommands.xcs"/>
-</manifest:manifest>
diff --git a/reportbuilder/util/components.rdb b/reportbuilder/util/components.rdb
deleted file mode 100644
index b49abce1a3ea..000000000000
--- a/reportbuilder/util/components.rdb
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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/.
- *
--->
-<components xmlns="http://openoffice.org/2010/uno-components">
-    <component loader="com.sun.star.loader.Java2" uri="./report-builder.jar">
-        <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>
-</components>
diff --git a/reportbuilder/util/description-en-US.txt b/reportbuilder/util/description-en-US.txt
deleted file mode 100644
index 257af1da6548..000000000000
--- a/reportbuilder/util/description-en-US.txt
+++ /dev/null
@@ -1 +0,0 @@
-Use the Report Builder to create stylish, smart-looking database reports. The flexible report editor can define group and page headers as well as group and page footers. Additionally, calculation fields are available to accomplish complex database reports.
diff --git a/reportbuilder/util/description.xml b/reportbuilder/util/description.xml
deleted file mode 100644
index 3ea03d6d700e..000000000000
--- a/reportbuilder/util/description.xml
+++ /dev/null
@@ -1,40 +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 .
--->
-<description xmlns="http://openoffice.org/extensions/description/2006"
-    xmlns:d="http://openoffice.org/extensions/description/2006"
-    xmlns:xlink="http://www.w3.org/1999/xlink">
-  <display-name>
-    <name lang="en-US">Report Builder</name>
-  </display-name>
-  <version value="1.2.4"/>
-  <identifier value="com.sun.reportdesigner"/>
-  <dependencies>
-    <OpenOffice.org-minimal-version value="3.2" d:name="OpenOffice.org 3.2"/>
-  </dependencies>
-  <publisher>
-    <name xlink:href="http://www.documentfoundation.org" lang="en-US">The Document Foundation</name>
-  </publisher>
-  <icon>
-    <default xlink:href="images/extension_32.png" />
-  </icon>
-  <extension-description>
-    <src xlink:href="description-en-US.txt" lang="en-US" />
-  </extension-description>
-</description>
-
diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk
index 9ad40a329a44..225cf94ba325 100644
--- a/scp2/InstallModule_base.mk
+++ b/scp2/InstallModule_base.mk
@@ -27,9 +27,10 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/base))
 
-$(eval $(call gb_InstallModule_define_if_set,scp2/base,\
-	ENABLE_REPORTBUILDER \
-))
+# Not sure about that?
+#$(eval $(call gb_InstallModule_define_if_set,scp2/base,\
+#	ENABLE_REPORTBUILDER \
+#))
 
 $(eval $(call gb_InstallModule_add_templates,scp2/base,\
     scp2/source/templates/module_langpack_base \
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 0d3aa52ef054..25adf4b867a1 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -25,6 +25,12 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
+ifeq ($(ENABLE_REPORTBUILDER),TRUE)
+ifneq ($(SYSTEM_JFREEREPORT),YES)
+include $(SRCDIR)/jfreereport/version.mk
+endif
+endif
+
 $(eval $(call gb_InstallModule_InstallModule,scp2/ooo))
 
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,ooo))
@@ -51,6 +57,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	ENABLE_TDEAB \
 	ENABLE_TELEPATHY \
 	MERGELIBS \
+	SYSTEM_APACHE_COMMONS \
 	SYSTEM_BOOST \
 	SYSTEM_CAIRO \
 	SYSTEM_CLUCENE \
@@ -61,6 +68,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	SYSTEM_HUNSPELL \
 	SYSTEM_HYPH \
 	SYSTEM_ICU \
+	SYSTEM_JFREEREPORT \
 	SYSTEM_JPEG \
 	SYSTEM_LCMS2 \
 	SYSTEM_LIBEXTTEXTCAT \
@@ -178,6 +186,23 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
 ))
 endif
 
+ifneq ($(SYSTEM_JFREEREPORT),YES)
+
+$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
+	-DFLOW_ENGINE_VERSION=$(FLOW_ENGINE_VERSION) \
+	-DFLUTE_VERSION=$(FLUTE_VERSION) \
+	-DLIBBASE_VERSION=$(LIBBASE_VERSION) \
+	-DLIBFONTS_VERSION=$(LIBFONTS_VERSION) \
+	-DLIBFORMULA_VERSION=$(LIBFORMULA_VERSION) \
+	-DLIBLAYOUT_VERSION=$(LIBLAYOUT_VERSION) \
+	-DLIBLOADER_VERSION=$(LIBLOADER_VERSION) \
+	-DLIBREPOSITORY_VERSION=$(LIBREPOSITORY_VERSION) \
+	-DLIBSERIALIZER_VERSION=$(LIBSERIALIZER_VERSION) \
+	-DLIBXML_VERSION=$(LIBXML_VERSION) \
+))
+
+endif
+
 $(eval $(call gb_InstallModule_add_templates,scp2/ooo,\
     scp2/source/templates/module_helppack \
     scp2/source/templates/module_helppack_root \
@@ -223,4 +248,10 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
 ))
 endif
 
+ifeq ($(ENABLE_REPORTBUILDER),TRUE)
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
+    scp2/source/ooo/module_reportbuilder \
+))
+endif
+
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
index 0b7055231f5c..fab69aa948f4 100644
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -44,17 +44,6 @@ End
 
 #endif
 
-/* ** Report Builder ** */
-
-#ifndef WITHOUT_EXTENSION_REPORTDESIGN
-
-Directory gid_Brand_Dir_Share_Extensions_Report_Builder
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "report-builder";
-End
-
-#endif
-
 /* ** MediaWiki Publisher** */
 
 #ifndef WITHOUT_EXTENSION_MEDIAWIKI
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index f68b539aed66..936f15a617bb 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -46,19 +46,6 @@ End
 
 #endif
 
-/* ** Report Builder ** */
-
-#ifndef WITHOUT_EXTENSION_REPORTDESIGN
-
-File gid_File_Oxt_Report_Builder
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Report_Builder;
-    Name = "report-builder.oxt";
-End
-
-#endif
-
 /* ** MediaWiki Publisher** */
 
 #ifndef WITHOUT_EXTENSION_MEDIAWIKI
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
index 319b69b70278..61c371e17039 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -57,21 +57,6 @@ Module gid_Module_Optional_Extensions_MINIMIZER
 End
 #endif
 
-/* ** Report Builder ** */
-
-#ifndef WITHOUT_EXTENSION_REPORTDESIGN
-Module gid_Module_Optional_Extensions_REPORTDESIGN
-    PackageInfo = "packinfo_extensions.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN);
-    ParentID = gid_Module_Optional_Extensions;
-    Files = (
-        gid_File_Oxt_Report_Builder );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-#endif
-
 /* ** MediaWiki Publisher** */
 
 #ifndef WITHOUT_EXTENSION_MEDIAWIKI
diff --git a/scp2/source/ooo/module_reportbuilder.scp b/scp2/source/ooo/module_reportbuilder.scp
new file mode 100644
index 000000000000..89c0639ac25d
--- /dev/null
+++ b/scp2/source/ooo/module_reportbuilder.scp
@@ -0,0 +1,71 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ */
+
+#include "macros.inc"
+
+Module gid_Module_Reportbuilder
+    MOD_NAME_DESC(MODULE_PRG_REPORTBUILDER);
+    ParentID = gid_Module_Root_Brand;
+    Styles = (HIDDEN_ROOT);
+    Dirs = (gid_Dir_Share_Reportbuilder);
+    Files = (
+#if !defined SYSTEM_APACHE_COMMONS
+        gid_File_Jar_CommonsLogging,
+#endif
+#if ! defined SYSTEM_JFREEREPORT
+        gid_File_Jar_FlowEngine,
+        gid_File_Jar_Flute,
+        gid_File_Jar_Libbase,
+        gid_File_Jar_Libfonts,
+        gid_File_Jar_Libformula,
+        gid_File_Jar_Liblayout,
+        gid_File_Jar_Libloader,
+        gid_File_Jar_Librepository,
+        gid_File_Jar_Libserializer,
+        gid_File_Jar_Libxml,
+        gid_File_Jar_Sac,
+#endif
+        gid_File_Jar_Reportbuilder,
+        gid_File_Xcd_Reportbuilder);
+End
+
+Directory gid_Dir_Share_Reportbuilder
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "reportbuilder";
+End
+
+STD_JAR_FILE( gid_File_Jar_Reportbuilder, reportbuilder )
+
+#if !defined SYSTEM_APACHE_COMMONS
+STD_JAR_FILE(gid_File_Jar_CommonsLogging, commons-logging-1.1.1)
+#endif
+
+/* Not sure, if can we use CONCAT3 in that context here? */
+#ifndef SYSTEM_JFREEREPORT
+    STD_JAR_FILE( gid_File_Jar_FlowEngine, CONCAT3(flow-engine,-,FLOW_ENGINE_VERSION) )
+    STD_JAR_FILE( gid_File_Jar_Flute, CONCAT3(flute,-,FLUTE_VERSION) )
+    STD_JAR_FILE( gid_File_Jar_Libbase, CONCAT3(libbase,-,LIBBASE_VERSION) )
+    STD_JAR_FILE( gid_File_Jar_Libfonts, CONCAT3(libfonts,-,LIBFONTS_VERSION) )
+    STD_JAR_FILE( gid_File_Jar_Libformula, CONCAT3(libformula,-,LIBFORMULA_VERSION) )
+    STD_JAR_FILE( gid_File_Jar_Liblayout, CONCAT3(liblayout,-,LIBLAYOUT_VERSION) )
+    STD_JAR_FILE( gid_File_Jar_Libloader, CONCAT3(libloader,-,LIBLOADER_VERSION) )
+    STD_JAR_FILE( gid_File_Jar_Librepository, CONCAT3(librepository,-,LIBREPOSITORY_VERSION) )
+    STD_JAR_FILE( gid_File_Jar_Libserializer, CONCAT3(libserializer,-,LIBSERIALIZER_VERSION) )
+    STD_JAR_FILE( gid_File_Jar_Libxml, CONCAT3(libxml,-,LIBXML_VERSION) )
+    STD_JAR_FILE( gid_File_Jar_Sac, sac )
+#endif
+
+File gid_File_Xcd_Reportbuilder
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "reportbuilder.xcd";
+    Styles = (PACKED);
+End
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/packinfo/packinfo_extensions.txt b/setup_native/source/packinfo/packinfo_extensions.txt
index 49b980a310a0..dc39c5f6dc2d 100644
--- a/setup_native/source/packinfo/packinfo_extensions.txt
+++ b/setup_native/source/packinfo/packinfo_extensions.txt
@@ -50,21 +50,6 @@ packageversion = "%PACKAGEVERSION"
 End
 
 Start
-module = "gid_Module_Optional_Extensions_REPORTDESIGN"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-report-builder"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-report-builder"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
-linuxpatchrequires = ""
-copyright = "2012 The Document Foundation"
-solariscopyright = "solariscopyrightfile"
-vendor = "The Document Foundation"
-description = "Report Builder extension for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt"
-packageversion = "%PACKAGEVERSION"
-End
-
-Start
 module = "gid_Module_Optional_Extensions_MEDIAWIKI"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-mediawiki-publisher"
 solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 61726f4bc17c..4cf663e82a95 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -138,7 +138,6 @@ my %replaceable = (
     $brand_program_dir . '/classes' => '\.jar$',
     'ure-link/share/java' => '\.jar$',
     'share/extensions/nlpsolver' => '\.jar$',
-    'share/extensions/report-builder' => '\.jar$',
     'share/extensions/wiki-publisher' => '\.jar$',
     'share/extensions/pdf-import' => "(\\.so|\\.dll|\\.exe|\\.com$bin)\$",
     'share/extensions/presenter-screen' => "(\\.so|\\.dll|\\.exe|\\.com$bin)\$",
author	David Ostrovsky <david@ostrovsky.org>	2013-03-13 22:45:02 +0100
committer	David Ostrovsky <David.Ostrovsky@gmx.de>	2013-03-18 15:30:44 +0000
commit	90a326c7028d5af132c62edfaef77c53627e4c0e (patch)
tree	61d963c6d5da61755e5072e2ef765d8243361246
parent	35bc07513c46cfa40fa85ec1053f7ce5c1e9c318 (diff)