summaryrefslogtreecommitdiff
path: root/instsetoo_native
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2012-03-20 21:41:49 +0100
committerAndras Timar <atimar@suse.com>2012-03-20 21:42:15 +0100
commitea3967103430b96e5cd2c4d201840a0d827d9d76 (patch)
treee9f2c9af8b2351831faa47b13bbc13488aa1aba8 /instsetoo_native
parent08fd513e715209a1295de2e65cbdb47108908826 (diff)
remove last traces of serial number check from MSI
Diffstat (limited to 'instsetoo_native')
-rw-r--r--instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt3
-rw-r--r--instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt3
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt3
-rw-r--r--instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt3
-rw-r--r--instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt3
5 files changed, 5 insertions, 10 deletions
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
index b03c291ce03f..e478ce00d111 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
@@ -21,8 +21,7 @@ CustomerInformation Back NewDialog InstallWelcome 1 1
CustomerInformation Cancel SpawnDialog CancelSetup 1 0
CustomerInformation Next [ALLUSERS] {} ApplicationUsers = "OnlyCurrentUser" And Privileged 2
CustomerInformation Next [ALLUSERS] 1 ApplicationUsers = "AllUsers" And Privileged 1
-CustomerInformation Next EndDialog Exit (SERIALNUMVALRETRYLIMIT) And (SERIALNUMVALRETRYLIMIT<0) And (SERIALNUMVALRETURN<>SERIALNUMVALSUCCESSRETVAL) 3
-CustomerInformation Next NewDialog SetupType ((Not SERIALNUMVALRETURN) OR (SERIALNUMVALRETURN=SERIALNUMVALSUCCESSRETVAL)) 4
+CustomerInformation Next NewDialog SetupType 1 3
CustomSetup Back NewDialog MaintenanceType Installed 0
CustomSetup Back NewDialog SetupType NOT Installed 0
CustomSetup Cancel SpawnDialog CancelSetup 1 0
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
index b03c291ce03f..e478ce00d111 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
@@ -21,8 +21,7 @@ CustomerInformation Back NewDialog InstallWelcome 1 1
CustomerInformation Cancel SpawnDialog CancelSetup 1 0
CustomerInformation Next [ALLUSERS] {} ApplicationUsers = "OnlyCurrentUser" And Privileged 2
CustomerInformation Next [ALLUSERS] 1 ApplicationUsers = "AllUsers" And Privileged 1
-CustomerInformation Next EndDialog Exit (SERIALNUMVALRETRYLIMIT) And (SERIALNUMVALRETRYLIMIT<0) And (SERIALNUMVALRETURN<>SERIALNUMVALSUCCESSRETVAL) 3
-CustomerInformation Next NewDialog SetupType ((Not SERIALNUMVALRETURN) OR (SERIALNUMVALRETURN=SERIALNUMVALSUCCESSRETVAL)) 4
+CustomerInformation Next NewDialog SetupType 1 3
CustomSetup Back NewDialog MaintenanceType Installed 0
CustomSetup Back NewDialog SetupType NOT Installed 0
CustomSetup Cancel SpawnDialog CancelSetup 1 0
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
index 3eb1b8533ed8..b32bd003dee4 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
@@ -22,8 +22,7 @@ CustomerInformation Back NewDialog InstallWelcome 1 1
CustomerInformation Cancel SpawnDialog CancelSetup 1 0
CustomerInformation Next [ALLUSERS] {} ApplicationUsers = "OnlyCurrentUser" And Privileged 2
CustomerInformation Next [ALLUSERS] 1 ApplicationUsers = "AllUsers" And Privileged 1
-CustomerInformation Next EndDialog Exit (SERIALNUMVALRETRYLIMIT) And (SERIALNUMVALRETRYLIMIT<0) And (SERIALNUMVALRETURN<>SERIALNUMVALSUCCESSRETVAL) 3
-CustomerInformation Next NewDialog SetupType ((Not SERIALNUMVALRETURN) OR (SERIALNUMVALRETURN=SERIALNUMVALSUCCESSRETVAL)) 4
+CustomerInformation Next NewDialog SetupType 1 3
CustomSetup Back NewDialog MaintenanceType Installed 0
CustomSetup Back NewDialog SetupType NOT Installed 0
CustomSetup Cancel SpawnDialog CancelSetup 1 0
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
index 05254de76b77..e0476e9c2d4c 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
@@ -21,8 +21,7 @@ CustomerInformation Back NewDialog InstallWelcome 1 1
CustomerInformation Cancel SpawnDialog CancelSetup 1 0
CustomerInformation Next [ALLUSERS] {} ApplicationUsers = "OnlyCurrentUser" And Privileged 2
CustomerInformation Next [ALLUSERS] 1 ApplicationUsers = "AllUsers" And Privileged 1
-CustomerInformation Next EndDialog Exit (SERIALNUMVALRETRYLIMIT) And (SERIALNUMVALRETRYLIMIT<0) And (SERIALNUMVALRETURN<>SERIALNUMVALSUCCESSRETVAL) 3
-CustomerInformation Next NewDialog SetupType ((Not SERIALNUMVALRETURN) OR (SERIALNUMVALRETURN=SERIALNUMVALSUCCESSRETVAL)) 4
+CustomerInformation Next NewDialog SetupType 1 3
CustomSetup Back NewDialog MaintenanceType Installed 0
CustomSetup Back NewDialog SetupType NOT Installed 0
CustomSetup Cancel SpawnDialog CancelSetup 1 0
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt
index 05254de76b77..e0476e9c2d4c 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt
@@ -21,8 +21,7 @@ CustomerInformation Back NewDialog InstallWelcome 1 1
CustomerInformation Cancel SpawnDialog CancelSetup 1 0
CustomerInformation Next [ALLUSERS] {} ApplicationUsers = "OnlyCurrentUser" And Privileged 2
CustomerInformation Next [ALLUSERS] 1 ApplicationUsers = "AllUsers" And Privileged 1
-CustomerInformation Next EndDialog Exit (SERIALNUMVALRETRYLIMIT) And (SERIALNUMVALRETRYLIMIT<0) And (SERIALNUMVALRETURN<>SERIALNUMVALSUCCESSRETVAL) 3
-CustomerInformation Next NewDialog SetupType ((Not SERIALNUMVALRETURN) OR (SERIALNUMVALRETURN=SERIALNUMVALSUCCESSRETVAL)) 4
+CustomerInformation Next NewDialog SetupType 1 3
CustomSetup Back NewDialog MaintenanceType Installed 0
CustomSetup Back NewDialog SetupType NOT Installed 0
CustomSetup Cancel SpawnDialog CancelSetup 1 0