officecfg: move the reportbuilder filter configuration to filter/

Change-Id: Ied496ddbc4d5341a8e1e15d760df775eee19f850

filter/Configuration_filter.mk

@@ -290,6 +290,22 @@ $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fr
 	StarOffice_XML__Base__ui \
 )
 
+# fcfg_reportbuilder
+$(call filter_Configuration_add_types,fcfg_langpack,fcfg_reportbuilder_types.xcu,filter/source/config/fragments/types,\
+	StarBaseReport \
+	StarBaseReportChart \
+)
+
+$(call filter_Configuration_add_filters,fcfg_langpack,fcfg_reportbuilder_filters.xcu,filter/source/config/fragments/filters,\
+	StarBaseReport \
+	StarBaseReportChart \
+)
+
+$(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\
+	StarBaseReport_ui \
+	StarBaseReportChart_ui \
+)
+
 # fcfg_writer
 $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter/source/config/fragments/types,\
 	generic_HTML \

filter/source/config/fragments/filters/StarBaseReport.xcu

+<!--
+ * 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 .
+-->
+    <node oor:name="StarOffice XML (Base) Report" oor:op="replace">
+      <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>
+    </node>

officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu → filter/source/config/fragments/filters/StarBaseReportChart.xcu

-<?xml version="1.0" encoding="UTF-8"?>
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -15,31 +14,8 @@
  *   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">
+-->
+    <node oor:name="StarOffice XML (Base) Report Chart" oor:op="replace">
       <prop oor:name="Flags">
         <value>IMPORT EXPORT OWN DEFAULT NOTINFILEDIALOG NOTINCHOOSER</value>
       </prop>
@@ -58,9 +34,4 @@
       <prop oor:name="DocumentService">
         <value>com.sun.star.chart2.ChartDocument</value>
       </prop>
-      <prop oor:name="UIName">
-        <value xml:lang="en-US">OpenOffice.org 1.0 Report Chart</value>
-      </prop>
     </node>
-  </node>
-</oor:component-data>

filter/source/config/fragments/filters/StarBaseReportChart_ui.xcu

+<!--
+ * 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 .
+-->
+    <node oor:name="StarOffice XML (Base) Report Chart">
+      <prop oor:name="UIName">
+        <value xml:lang="en-US">OpenOffice.org 1.0 Report Chart</value>
+      </prop>
+    </node>

filter/source/config/fragments/filters/StarBaseReport_ui.xcu

+<!--
+ * 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 .
+-->
+    <node oor:name="StarOffice XML (Base) Report">
+      <prop oor:name="UIName">
+        <value xml:lang="en-US">ODF Database Report</value>
+      </prop>
+    </node>

officecfg/registry/data/org/openoffice/TypeDetection/Types.xcu → filter/source/config/fragments/types/StarBaseReport.xcu

-<?xml version="1.0" encoding="UTF-8"?>
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -15,9 +14,7 @@
  *   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>
@@ -44,29 +41,3 @@
         <value>StarBaseReport 9.0</value>
       </prop>
     </node>
-    <node oor:name="StarBaseReportChart" oor:op="replace">
-      <prop oor:name="DetectService"/>
-      <prop oor:name="URLPattern">
-        <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>

filter/source/config/fragments/types/StarBaseReportChart.xcu

+<!--
+ * 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 .
+-->
+    <node oor:name="StarBaseReportChart" oor:op="replace">
+      <prop oor:name="DetectService"/>
+      <prop oor:name="URLPattern">
+        <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>

officecfg/Configuration_officecfg.mk

@@ -52,8 +52,6 @@ $(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\
 	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 \
 ))

postprocess/CustomTarget_registry.mk

@@ -391,8 +391,8 @@ postprocess_FILES_reportbuilder := \
 	$(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 \
+	$(call gb_XcuFilterFiltersTarget_get_target,fcfg_reportbuilder_filters.xcu) \
+	$(call gb_XcuFilterTypesTarget_get_target,fcfg_reportbuilder_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 \