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>

11 files changed, 1226 insertions, 0 deletions

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/officecfg/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu b/officecfg/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
new file mode 100644
index 000000000000..890127e87a20
--- /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 000000000000..53b8ba592588
--- /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 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/officecfg/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu
new file mode 100644
index 000000000000..91bce6748689
--- /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 000000000000..df7277d48eff
--- /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 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/officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu b/officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu
new file mode 100644
index 000000000000..1b24d4041461
--- /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 000000000000..9faf9eac9fed
--- /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>