[Libreoffice-commits] core.git: 2 commits - scp2/InstallModule_ooo.mk scp2/source

[Andras Timar]

 scp2/InstallModule_ooo.mk                    |    2 +-
 scp2/source/extensions/module_extensions.ulf |    8 +-------
 scp2/source/ooo/module_reportbuilder.scp     |    7 +++++--
 scp2/source/ooo/module_reportbuilder.ulf     |   13 +++++++++++++
 4 files changed, 20 insertions(+), 10 deletions(-)

New commits:
commit b3644853d67872b0bb3956fb16cbaf0d0ed3c5dc
Author: Andras Timar <atimar at suse.com>
Date:   Sat Mar 23 11:16:45 2013 +0100

    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

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 25adf4b..d4cd99e 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 5b264e8..67ffebf 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 0000000..626f242
--- /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."
commit 50e6c21ad80656cb3eefd1adaaaeeafa1f017473
Author: Andras Timar <atimar at suse.com>
Date:   Sat Mar 23 11:10:08 2013 +0100

    add longer description in Windows installer to Numbertext extension
    
    Change-Id: I34b459c3e8b676b47f9ce0da15bfdea5f749ad20

diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf
index 50466f5..ac079e9 100644
--- a/scp2/source/extensions/module_extensions.ulf
+++ b/scp2/source/extensions/module_extensions.ulf
@@ -39,12 +39,6 @@ en-US = "Presentation Minimizer"
 [STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MINIMIZER]
 en-US = "Presentation Minimizer"
 
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN]
-en-US = "Report Builder"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN]
-en-US = "Report Builder"
-
 [STR_NAME_MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI]
 en-US = "MediaWiki Publisher"
 
@@ -55,7 +49,7 @@ en-US = "MediaWiki Publisher"
 en-US = "Numbertext"
 
 [STR_DESC_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT]
-en-US = "Numbertext"
+en-US = "Provides the NUMBERTEXT/MONEYTEXT spreadsheet functions which convert numbers to localized text, e.g. '100' to 'hundred'."
 
 [STR_NAME_MODULE_OPTIONAL_EXTENSIONS_HUNART]
 en-US = "Hungarian cross-reference toolbar"