CWS-TOOLING: integrate CWS native195_DEV300

2 files changed, 11 insertions, 0 deletions

diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java
index f8f17345f746..2b5773171298 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java
@@ -167,6 +167,7 @@ public class UninstallationPrologueCtrl extends PanelController {
                     ModuleCtrl.setDatabaseSettings(packageData, installData, installer);
                     installData.setDatabaseAnalyzed(true);
                     ModuleCtrl.setDontUninstallFlags(packageData);
+                    if ( installData.isRootInstallation() ) { ModuleCtrl.setDontUninstallUserInstallOnylFlags(packageData); }
                     ModuleCtrl.setParentDefaultModuleSettings(packageData);
                     getSetupFrame().setButtonEnabled(true, getSetupFrame().BUTTON_NEXT);
                     getSetupFrame().setButtonSelected(getSetupFrame().BUTTON_NEXT);
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
index c96e8ebd5700..35c9113c103b 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
@@ -500,7 +500,17 @@ public class ModuleCtrl {
             PackageDescription child = (PackageDescription) e.nextElement();
             setDontUninstallFlags(child);
         }
+    }
+
+    static public void setDontUninstallUserInstallOnylFlags(PackageDescription packageData) {
+        if ( packageData.showInUserInstallOnly() ) {
+            packageData.setSelectionState(PackageDescription.IGNORE);
+        }
 
+        for (Enumeration e = packageData.children(); e.hasMoreElements(); ) {
+            PackageDescription child = (PackageDescription) e.nextElement();
+            setDontUninstallUserInstallOnylFlags(child);
+        }
     }
 
     static public void checkVisibleModulesInstall(PackageDescription packageData, InstallData data) {