INTEGRATION: CWS native127 (1.3.4); FILE MERGED

2008/01/25 11:31:06 is 1.3.4.2: #i85474# not all language modules deselectable
2008/01/25 09:56:18 is 1.3.4.1: #i85474# one and only language not selectable

1 files changed, 11 insertions, 3 deletions

diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java
index fea09a6a3d6b..6507245a9048 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: PrologueCtrl.java,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: obo $ $Date: 2008-01-07 12:32:23 $
+ *  last change: $Author: ihi $ $Date: 2008-02-05 13:37:02 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -87,7 +87,7 @@ public class PrologueCtrl extends PanelController {
                         Dumper.logModuleStates(packageData, "Prologue Dialog");
                     }
 
-                    if ( installData.getOSType().equalsIgnoreCase("SunOS") ) {
+                    if (( installData.getOSType().equalsIgnoreCase("SunOS") ) && ( installData.isMultiLingual() )) {
                         ModuleCtrl.checkLanguagesPackages(packageData, installData);
 
                         if ( installData.logModuleStates() ) {
@@ -95,6 +95,14 @@ public class PrologueCtrl extends PanelController {
                         }
                     }
 
+                    if ( ! installData.isMultiLingual() ) {
+                        ModuleCtrl.setHiddenLanguageModuleDefaultSettings(packageData);
+
+                        if ( installData.logModuleStates() ) {
+                            Dumper.logModuleStates(packageData, "after setHiddenLanguageModuleDefaultSettings");
+                        }
+                    }
+
                     if ( installData.isRootInstallation() ) {
                         Controller.checkForNewerVersion(installData);
                     }