mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS native179 (1.8.20); FILE MERGED

Browse Source 
2008/07/31 15:12:18 is 1.8.20.1: #i91489# improved solaris language preselection process
This commit is contained in:
Vladimir Glazounov
2008-08-18 09:46:58 +00:00
parent c9acd2026e
commit 2af2b07e93
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: ModuleCtrl.java,v $ * $RCSfile: ModuleCtrl.java,v $
* $Revision: 1.8 $ * $Revision: 1.9 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -715,6 +715,9 @@ public class ModuleCtrl {
oneLang = oneLang.trim(); oneLang = oneLang.trim();
if ( systemLanguages.contains(oneLang)) { if ( systemLanguages.contains(oneLang)) {
foundLang = true; foundLang = true;
int count = installData.getPreselectedLanguages();
count++;
installData.setPreselectedLanguages(count);
break; break;
} }
} }
@@ -730,6 +733,18 @@ public class ModuleCtrl {
} }
} }
static public void setLanguagesPackages(PackageDescription packageData) {
if (( packageData.getPkgLanguage() != null ) && ( ! packageData.getPkgLanguage().equals(""))) {
// This is a package with a specific language.
packageData.setSelectionState(PackageDescription.INSTALL);
}
for (Enumeration e = packageData.children(); e.hasMoreElements(); ) {
PackageDescription child = (PackageDescription) e.nextElement();
setLanguagesPackages(child);
}
}
static public void defaultDatabaseAnalysis(InstallData data) { static public void defaultDatabaseAnalysis(InstallData data) {
PackageDescription packageData = SetupDataProvider.getPackageDescription(); PackageDescription packageData = SetupDataProvider.getPackageDescription();