diff options
author | Dirk Völzke <dv@openoffice.org> | 2009-12-21 14:14:08 +0000 |
---|---|---|
committer | Dirk Völzke <dv@openoffice.org> | 2009-12-21 14:14:08 +0000 |
commit | bbce52251b1d763c9fa943ba5d9fcdd3c78e3ec5 (patch) | |
tree | 4cf898f8853f90f03261b326ceb8d9df1a426dca /scp2/source/ooo | |
parent | 2be04fff7b9d51a3f1cf61ddb9cd76286b48b375 (diff) |
#i107804# Checking for an already running office doesn't work well with Windows Vista or later
Diffstat (limited to 'scp2/source/ooo')
-rwxr-xr-x | scp2/source/ooo/windowscustomaction_ooo.scp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index b4ddac39799b..ceb0b156cd7b 100755 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -394,7 +394,7 @@ WindowsCustomAction gid_Customaction_Patch_Isofficerunning Target = "IsOfficeRunning"; Inbinarytable = 1; Assignment1 = ("ControlEvent", "ReadyToInstall", "InstallNow", "DoAction", "IsOfficeRunning", "1", "1"); - Assignment2 = ("InstallExecuteSequence", "", "RunningOffice"); + Assignment2 = ("InstallExecuteSequence", "VersionNT < 600", "RunningOffice"); End WindowsCustomAction gid_Customaction_Full_Isofficerunning @@ -403,7 +403,7 @@ WindowsCustomAction gid_Customaction_Full_Isofficerunning Source = "shlxtmsi.dll"; Target = "IsOfficeRunning"; Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "", "RunningOffice"); + Assignment1 = ("InstallExecuteSequence", "VersionNT < 600 Or Not PATCH", "RunningOffice"); End WindowsCustomAction gid_Customaction_Langpack_Isofficerunning @@ -412,7 +412,7 @@ WindowsCustomAction gid_Customaction_Langpack_Isofficerunning Source = "lngpckinsthlp.dll"; Target = "IsOfficeRunning"; Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "PATCH", "RunningOffice"); + Assignment1 = ("InstallExecuteSequence", "PATCH And VersionNT < 600", "RunningOffice"); End WindowsCustomAction gid_Customaction_CheckPatchList |