[Libreoffice-commits] .: Branch 'libreoffice-3-5' - scp2/source

[Michael Meeks]

 scp2/source/ooo/windowscustomaction_ooo.scp |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a9dbdd81ed2d2cfb7154316e5cc3580172d31618
Author: Andras Timar <atimar at suse.com>
Date:   Sun May 6 12:27:34 2012 +0200

    fdo#44628 run unopkg.exe after InstallFinalize
    
    Change-Id: I828d6a03b2c3a7b9e9e5dcdcbe142ac6567f0046
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 70197b7..2ddfe34 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -214,12 +214,12 @@ End
 
 WindowsCustomAction gid_Customaction_Register_Extensions
 	Name = "RegisterExtensions";
-	Typ = "1025";
+	Typ = "1";
 	Source = "shlxtmsi.dll";
 	Target = "RegisterExtensions";
 	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "behind_SetInstalllocation");
-	Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "behind_SetInstalllocation");
+	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "behind_InstallFinalize");
+	Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "behind_InstallFinalize");
 End
 
 WindowsCustomAction gid_Customaction_Remove_Extensions