Report Builder should be an optional component in Windows installer

... because when it is installed, it hides the original template based
reporting UI, which is preferred by some users.

Change-Id: Id758b664d6b06c2c12e32c428b5dbcf7bfaf045d

scp2/InstallModule_ooo.mk

@@ -249,7 +249,7 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
 endif
 
 ifeq ($(ENABLE_REPORTBUILDER),TRUE)
-$(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/ooo,\
     scp2/source/ooo/module_reportbuilder \
 ))
 endif

scp2/source/ooo/module_reportbuilder.scp

@@ -11,8 +11,11 @@
 
 Module gid_Module_Reportbuilder
     PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Root_Brand;
-    Styles = (HIDDEN_ROOT);
+    MOD_NAME_DESC(MODULE_OPTIONAL_REPORTDESIGN); 
+    ParentID = gid_Module_Optional;
+    Styles = ( );
+    Minimal = NO;
+    Default = YES; 
     Dirs = (gid_Dir_Share_Reportbuilder);
     Files = (
 #if !defined SYSTEM_APACHE_COMMONS

scp2/source/ooo/module_reportbuilder.ulf

+/*
+ * 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/.
+ */ 
+
+[STR_NAME_MODULE_OPTIONAL_REPORTDESIGN]
+en-US = "Report Builder"
+
+[STR_DESC_MODULE_OPTIONAL_REPORTDESIGN]
+en-US = "Report Builder helps to design database reports. It requires Java."