MSI cleanup: remove redundant conditions

VersionNT is now always greated than 600 (only needs checking in version
checking action). ISSETUPDRIVEN and ISSCHEDULEREBOOT are specific to
InstallShield and aren't relevant to LibreOffice installer.

Change-Id: I6cb769c863e09f1568ae895a6cfbb0e5940c2486
Reviewed-on: https://gerrit.libreoffice.org/46434Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt

@@ -12,7 +12,7 @@ CreateShortcuts		2150
 DeleteServices	VersionNT	1000
 DuplicateFiles		2050
 FileCost		400
-FindRelatedProducts	NOT ISSETUPDRIVEN	100
+FindRelatedProducts		100
 InstallFiles		1950
 InstallFinalize		3150
 InstallInitialize		700
@@ -51,7 +51,6 @@ RemoveRegistryValues		1300
 RemoveShortcuts		1600
 RMCCPSearch	Not CCP_SUCCESS And CCP_TEST	250
 SameProductFound	SAMEPRODUCTS	120
-ScheduleReboot	ISSCHEDULEREBOOT	3125
 SetARPInstallLocation		990
 SetARPNoRemove	VersionNT < 600	995
 SetODBCFolders		550

instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt

@@ -10,5 +10,4 @@ InstallFiles		350
 InstallFinalize		400
 InstallInitialize		250
 InstallValidate		200
-ScheduleReboot	ISSCHEDULEREBOOT	375
 SetAdminInstallProperty		248

instsetoo_native/inc_openoffice/windows/msi_templates/AdvtExec.idt

@@ -16,4 +16,3 @@ RegisterExtensionInfo		350
 RegisterMIMEInfo		450
 RegisterProgIdInfo		400
 RegisterTypeLibraries		500
-ScheduleReboot	ISSCHEDULEREBOOT	675

instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt

@@ -5,7 +5,6 @@ ISInitAllUsers	307	ALLUSERS	1
 setAllUsersProfile	51	ALLUSERSPROFILE	[%ALLUSERSPROFILE]
 setUserProfile	51	USERPROFILE	[%USERPROFILE]
 SetARPInstallLocation	51	ARPINSTALLLOCATION	[INSTALLLOCATION]
-SetARPNoRemove	51	ARPNOREMOVE	1
 NewProductFound	19		OOO_CUSTOMACTION_1
 SameProductFound	19		OOO_CUSTOMACTION_2
 WrongWindowsVersion	19		OOO_CUSTOMACTION_5

instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt

 Action	Condition	Sequence
 s72	S255	I2
 InstallExecuteSequence	Action
-AllocateRegistrySpace	NOT Installed	750
+AllocateRegistrySpace	Not Installed	750
 AppSearch		25
 BindImage		2100
 CCPSearch	CCP_TEST	200
@@ -9,17 +9,17 @@ CostFinalize		500
 CostInitialize		350
 CreateFolders		1850
 CreateShortcuts		2150
-DeleteServices	VersionNT	1000
+DeleteServices		1000
 DuplicateFiles		2050
 FileCost		400
-FindRelatedProducts	NOT ISSETUPDRIVEN	100
+FindRelatedProducts		100
 InstallFiles		1950
 InstallFinalize		3150
 InstallInitialize		700
 InstallODBC		2600
-InstallServices	VersionNT	2750
+InstallServices		2750
 InstallValidate		650
-ISInitAllUsers	VersionNT And NOT Installed And Privileged	525
+ISInitAllUsers	Not Installed And Privileged	525
 IsolateComponents		450
 LaunchConditions		50
 MigrateFeatureStates		600
@@ -52,12 +52,10 @@ RemoveRegistryValues		1300
 RemoveShortcuts		1600
 RMCCPSearch	Not CCP_SUCCESS And CCP_TEST	250
 SameProductFound	SAMEPRODUCTS	120
-ScheduleReboot	ISSCHEDULEREBOOT	3125
 SetARPInstallLocation		990
-SetARPNoRemove	VersionNT < 600	995
 SetODBCFolders		550
-StartServices	VersionNT	2800
-StopServices	VersionNT	950
+StartServices		2800
+StopServices		950
 UnpublishComponents		850
 UnpublishFeatures		900
 UnregisterClassInfo		1350

instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt

@@ -9,7 +9,7 @@ ExecuteAction		850
 FileCost		450
 FindRelatedProducts		150
 InstallWelcome	Not Installed	650
-ISInitAllUsers	VersionNT And NOT Installed And Privileged	575
+ISInitAllUsers	Not Installed And Privileged	575
 IsolateComponents		500
 LaunchConditions		50
 MaintenanceWelcome	Installed And Not RESUME And Not Preselected And Not PATCH	750

instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt

@@ -12,7 +12,7 @@ CreateShortcuts		2150
 DeleteServices	VersionNT	1000
 DuplicateFiles		2050
 FileCost		400
-FindRelatedProducts	NOT ISSETUPDRIVEN	100
+FindRelatedProducts		100
 InstallFiles		1950
 InstallFinalize		3150
 InstallInitialize		700
@@ -50,7 +50,6 @@ RemoveODBC		1200
 RemoveRegistryValues		1300
 RemoveShortcuts		1600
 RMCCPSearch	Not CCP_SUCCESS And CCP_TEST	250
-ScheduleReboot	ISSCHEDULEREBOOT	3125
 SetARPInstallLocation		990
 SetARPNoRemove	VersionNT < 600	995
 SetODBCFolders		550

scp2/source/ooo/windowscustomaction_ooo.scp

@@ -24,7 +24,7 @@ WindowsCustomAction gid_Customaction_RenamePrgFolder
 	Source = "shlxtmsi.dll";
 	Target = "RenamePrgFolder";
 	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "VersionNT >= 600 And OLDPRODUCTS And Not REMOVE=\"ALL\" And Not PATCH", "ValidateProductID");
+	Assignment1 = ("InstallExecuteSequence", "OLDPRODUCTS And Not REMOVE=\"ALL\" And Not PATCH", "ValidateProductID");
 End
 
 WindowsCustomAction gid_Customaction_RemovePrgFolder
@@ -33,7 +33,7 @@ WindowsCustomAction gid_Customaction_RemovePrgFolder
 	Source = "shlxtmsi.dll";
 	Target = "RemovePrgFolder";
 	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "VersionNT >= 600 And OLDPRODUCTS And Not REMOVE=\"ALL\" And Not PATCH", "end");
+	Assignment1 = ("InstallExecuteSequence", "OLDPRODUCTS And Not REMOVE=\"ALL\" And Not PATCH", "end");
 End
 
 WindowsCustomAction gid_Customaction_Regallmsdocdll