instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt | 3 +--
instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt | 3 +--
instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt | 3 +--
instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt | 3 +--
instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt | 3 +--
5 files changed, 5 insertions(+), 10 deletions(-)
New commits:
commit ea3967103430b96e5cd2c4d201840a0d827d9d76
Author: Andras Timar <ati...@suse.com>
Date: Tue Mar 20 21:41:49 2012 +0100
remove last traces of serial number check from MSI
diff --git
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
index b03c291..e478ce0 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 b03c291..e478ce0 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 3eb1b85..b32bd00 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 05254de..e0476e9 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 05254de..e0476e9 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
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
