summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-08-18 09:46:32 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-08-18 09:46:32 +0000
commitf5dce4ed9774671d4c4fa91def7473476f1acaa2 (patch)
tree624931504fbf1b9dc1783cdcef9294d88bea1b85
parent70814dd6267440a29f1fb0344c2f76e428e43fff (diff)
INTEGRATION: CWS native179 (1.7.20); FILE MERGED
2008/07/31 15:12:17 is 1.7.20.1: #i91489# improved solaris language preselection process
-rwxr-xr-xjavainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java
index 2ed95106890a..39798e6ae394 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: PrologueCtrl.java,v $
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -85,6 +85,14 @@ public class PrologueCtrl extends PanelController {
if (( installData.getOSType().equalsIgnoreCase("SunOS") ) && ( installData.isMultiLingual() )) {
ModuleCtrl.checkLanguagesPackages(packageData, installData);
+ // int count = installData.getPreselectedLanguages();
+ // System.err.println("Number of preselected language packages: " + count);
+
+ if ( installData.getPreselectedLanguages() == 0 ) {
+ // Something misterious happened. Setting all languages again.
+ ModuleCtrl.setLanguagesPackages(packageData);
+ }
+
if ( installData.logModuleStates() ) {
Dumper.logModuleStates(packageData, "Prologue Dialog Language Selection");
}