diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-09-04 06:16:23 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-09-04 06:16:23 +0000 |
| commit | 29a0773d60cac9d25f65c65206217c65c155d407 (patch) | |
| tree | 11a653b944420d9a5166f9ca57eed771eea1d48f /scp2/source | |
| parent | d1e118e0963138f3955b085c3990ed6b81ede4b5 (diff) | |
INTEGRATION: CWS native193_DEV300 (1.29.62); FILE MERGED
2008/09/02 15:49:58 is 1.29.62.1: #i92973# fixes for Windows language packs
Diffstat (limited to 'scp2/source')
| -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 40eab73f6deb..0e86f5577f85 100755 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: windowscustomaction_ooo.scp,v $ - * $Revision: 1.29 $ + * $Revision: 1.30 $ * * This file is part of OpenOffice.org. * @@ -357,7 +357,7 @@ WindowsCustomAction gid_Customaction_Patch_SetUserInstallMode Source = "patchmsi.dll"; Target = "GetUserInstallMode"; Inbinarytable = 1; - Assignment1 = ("ControlEvent", "LicenseAgreement", "Next", "DoAction", "SetUserInstallMode", "1", "1"); + Assignment1 = ("ControlEvent", "InstallWelcome", "Next", "DoAction", "SetUserInstallMode", "1", "1"); Assignment2 = ("ControlEvent", "InstallChangeFolder", "OK", "DoAction", "SetUserInstallMode", "1", "8"); Assignment3 = ("ControlCondition", "DestinationFolder", "Next", "Enable", "NOT INVALIDDIRECTORY And NOT PATCHISOLDER And NOT ISWRONGPRODUCT"); Assignment4 = ("ControlCondition", "DestinationFolder", "Next", "Disable", "INVALIDDIRECTORY Or PATCHISOLDER Or ISWRONGPRODUCT"); @@ -378,7 +378,7 @@ WindowsCustomAction gid_Customaction_Langpack_SetUserInstallMode Source = "lngpckinsthlp.dll"; Target = "GetUserInstallMode"; Inbinarytable = 1; - Assignment1 = ("ControlEvent", "LicenseAgreement", "Next", "DoAction", "SetUserInstallMode", "1", "1"); + Assignment1 = ("ControlEvent", "InstallWelcome", "Next", "DoAction", "SetUserInstallMode", "1", "1"); Assignment2 = ("ControlEvent", "InstallChangeFolder", "OK", "DoAction", "SetUserInstallMode", "1", "8"); Assignment3 = ("ControlCondition", "DestinationFolder", "Next", "Enable", "NOT INVALIDDIRECTORY And NOT ISWRONGPRODUCT"); Assignment4 = ("ControlCondition", "DestinationFolder", "Next", "Disable", "INVALIDDIRECTORY Or ISWRONGPRODUCT"); |