summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2013-03-23 11:16:45 +0100
committerAndras Timar <atimar@suse.com>2013-03-23 11:26:02 +0100
commitb3644853d67872b0bb3956fb16cbaf0d0ed3c5dc (patch)
tree281cc2691806473a09161e6d942c69205c507418 /scp2
parent50e6c21ad80656cb3eefd1adaaaeeafa1f017473 (diff)
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
Diffstat (limited to 'scp2')
-rw-r--r--scp2/InstallModule_ooo.mk2
-rw-r--r--scp2/source/ooo/module_reportbuilder.scp7
-rw-r--r--scp2/source/ooo/module_reportbuilder.ulf13
3 files changed, 19 insertions, 3 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 25adf4b867a1..d4cd99eb81ed 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/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
diff --git a/scp2/source/ooo/module_reportbuilder.scp b/scp2/source/ooo/module_reportbuilder.scp
index 5b264e85e641..67ffebf0cbae 100644
--- a/scp2/source/ooo/module_reportbuilder.scp
+++ b/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
diff --git a/scp2/source/ooo/module_reportbuilder.ulf b/scp2/source/ooo/module_reportbuilder.ulf
new file mode 100644
index 000000000000..626f242e7ae0
--- /dev/null
+++ b/scp2/source/ooo/module_reportbuilder.ulf
@@ -0,0 +1,13 @@
+/*
+ * 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."