diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 11:15:14 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 11:15:14 +0000 |
| commit | 0a21ba770b9799a976fe9953f5b979caca028adb (patch) | |
| tree | 88dc6d40d07cafebed544d4c612eeea5e4f0782d /javainstaller2 | |
| parent | INTEGRATION: CWS sb83 (1.2.48); FILE MERGED (diff) | |
| download | core-0a21ba770b9799a976fe9953f5b979caca028adb.tar.gz core-0a21ba770b9799a976fe9953f5b979caca028adb.zip | |
INTEGRATION: CWS sb83 (1.4.8); FILE MERGED
2008/02/22 05:55:23 sb 1.4.8.2: RESYNC: (1.4-1.5); FILE MERGED
2008/02/11 16:07:21 is 1.4.8.1: #i86012# Java GUI Installer and three layer office
Diffstat (limited to 'javainstaller2')
| -rwxr-xr-x | javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/ProductDescription.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/ProductDescription.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/ProductDescription.java index 01f389f0b56c..122610506d56 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/ProductDescription.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/ProductDescription.java @@ -4,9 +4,9 @@ * * $RCSfile: ProductDescription.java,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: ihi $ $Date: 2008-02-05 13:37:50 $ + * last change: $Author: vg $ $Date: 2008-03-18 12:15:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -188,6 +188,15 @@ public class ProductDescription { } } + /* check for a default product directory */ + section = data.getElement("productdir"); + if (section != null) { + String value = section.getValue(); + if (value != null) { + installData.setProductDir(value); + } + } + /* check for the package format of this installation set */ section = data.getElement("packageformat"); if (section != null) { |