INTEGRATION: CWS native147 (1.7.2); FILE MERGED

2008/04/21 13:02:20 is 1.7.2.2: #i88334# packages no longer relocatable
2008/04/16 12:56:46 is 1.7.2.1: #i88008# do not show license dialog

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 a2d238807b63..3aba24855f99 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/ProductDescription.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/ProductDescription.java
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ProductDescription.java,v $
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -179,7 +179,7 @@ public class ProductDescription {
                 String value = section.getValue();
                 if (value != null) {
                     installData.setDefaultDir(value);
-                    installData.setInstallDir(value);
+                    // installData.setInstallDir(value);
                 }
             }
 
@@ -239,6 +239,15 @@ public class ProductDescription {
                 installData.setDontUpdate(dontupdate);
             }
 
+           section = data.getElement("hideeula");
+            if (section != null) {
+                String value = section.getValue();
+                if ((value != null) && (! value.equals(""))) {
+                    boolean hideeulaValue = Parser.parseBoolean(value);
+                    installData.setHideEula(hideeulaValue);
+                }
+            }
+
             /* check for any macro definitions */
             for (Enumeration e = data.elements(); e.hasMoreElements(); ) {
                 XMLPackageDescription p = (XMLPackageDescription) e.nextElement();