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

[Tor Lillqvist]

 scp2/source/ooo/windowscustomaction_ooo.scp |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 84724f5b8a45c2d74432d336fa1d544b57967f30
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 5 16:32:50 2011 +0300

    bnc#530872: Save old associations for MS doc types when installing
    
    Then restore them, if still relevant, when uninstalling LibreOffice.
    
    git log from build repository:
    commit 1737ec9b6675cc7e30df03fa5537012a429425bb
    Author: Tor Lillqvist <tlillqvist at novell.com>
    Date:   Thu Oct 14 15:28:55 2010 +0300
    
        Make win32-restore-associations.diff apply again
    
    commit 72a25ab4a055cd1d3cf5aec627cfe120113bfb34
    Author: Tor Lillqvist <tlillqvist at novell.com>
    Date:   Thu May 20 10:34:24 2010 +0300
    
        Make patches apply for a Windows build
    
    commit d635f716a75d8c1648eab0c1d598b390be8c4f07
    Author: Tor Lillqvist <tlillqvist at novell.com>
    Date:   Thu Sep 17 22:16:40 2009 +0300
    
        Add new patch to restore MSO file associations on uninstall
    
        * patches/dev300/apply: Add it to Win32Only
    
        * patches/dev300/win32-restore-associations.diff: New file. Save
          previous associations of the MS Office file formats on installation
          of OOo. On uninstallation of OOo, restore them. Still a bit
          experimental, but seems to work.

diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 6cae743..dd08744 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -54,6 +54,15 @@ WindowsCustomAction gid_Customaction_Regallmsdocdll
 	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And _IsSetupTypeMin<>\"Custom\"", "CostFinalize");
 End
 
+WindowsCustomAction gid_Customaction_Restoreregallmsdocdll
+    Name = "Restoreregallmsdocdll";
+    Typ = "65";
+    Source = "reg4allmsdoc.dll";
+    Target = "RestoreRegAllMSDoc";
+    Inbinarytable = 1;
+    Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "end");
+End
+
 WindowsCustomAction gid_Customaction_Regactivexdll1
 	Name = "Regactivexdll1";
 	Typ = "65";