summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2013-10-12 12:02:38 -0700
committerTor Lillqvist <tml@collabora.com>2013-10-13 07:40:12 +0000
commit32bbc8d9d84e56ef0dbc34b2a6f3057e3274a357 (patch)
tree924ab6cc27701ad868eaa8d1293cfd34d368915d
parentNo vcl.unx component in the ENABLE_HEADLESS case (diff)
downloadcore-32bbc8d9d84e56ef0dbc34b2a6f3057e3274a357.tar.gz
core-32bbc8d9d84e56ef0dbc34b2a6f3057e3274a357.zip
hide program modules in Custom Install panel of Windows installer
We all know that LibreOffice is not a suite of six office applications, Writer, Calc, Draw, Impress, Math and Base. LibreOffice is more or less monolithic. Yet, for marketing reasons probably, Windows installer offered the option to de-select any of the six applications. From the technical point of view, it did not make much sense. The saved disk space was negligible. On the other hand many issues could occur. For example fdo#67130, LibreOffice cannot start if LibreLogo is installed while Writer is not, or fdo#70226, Writer crashes when bibliography database is selected, when Base isn't installed. We need less complexity, fewer options. It is hard to imagine a user who insists on having just Writer and Calc but not Impress and Draw, etc. The new start center BTW does not make starter icons inactive for not installed applications. Change-Id: I4d486f0d59c393bfe08ea3a69e51cc32b751f130 Reviewed-on: https://gerrit.libreoffice.org/6235 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
-rw-r--r--solenv/bin/modules/installer/windows/feature.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm
index 23f6a0f9728e..dacb06b06ac1 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -106,8 +106,8 @@ sub get_feature_display
# Special handling for language modules. Only visible in multilingual installation set
if (( $styles =~ /\bSHOW_MULTILINGUAL_ONLY\b/ ) && ( ! $installer::globals::ismultilingual )) { $display = "0"; }
- # Special handling for c05office. No program module visible.
- if (( $onefeature->{'gid'} eq "gid_Module_Prg" ) && ( $installer::globals::product =~ /c05office/i )) { $display = "0"; }
+ # No program module visible.
+ if ( $onefeature->{'gid'} eq "gid_Module_Prg" ) { $display = "0"; }
# making all feature invisible in Language packs and in Help packs!
if ( $installer::globals::languagepack || $installer::globals::helppack ) { $display = "0"; }