[Libreoffice-commits] .: patches/dev300

[Tor Lillqvist]

 patches/dev300/win32-restore-associations.diff |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
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

diff --git a/patches/dev300/win32-restore-associations.diff b/patches/dev300/win32-restore-associations.diff
index cc08673..8d037c3 100644
--- a/patches/dev300/win32-restore-associations.diff
+++ b/patches/dev300/win32-restore-associations.diff
@@ -121,7 +121,7 @@
  extern "C" UINT __stdcall DeleteRegisteredExtensions( MSIHANDLE /*handle*/ )
  {         
      OutputDebugStringFormat( "DeleteRegisteredExtensions\n" );
-@@ -324,3 +389,77 @@
+@@ -324,5 +389,79 @@
  
      return ERROR_SUCCESS;
  }
@@ -182,7 +182,7 @@
 +
 +//----------------------------------------------------------
 +//
-+// This function is not in upstream. We call this from the
++// This function is not in OO.o. We call this from the
 +// Restoreregallmsdocdll custom action.
 +//
 +extern "C" UINT __stdcall RestoreRegAllMSDoc( MSIHANDLE /*handle*/ )
@@ -199,6 +199,8 @@
 +
 +    return ERROR_SUCCESS;
 +}
+ 
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 --- setup_native/source/win32/customactions/reg4allmsdoc/exports.dxp
 +++ setup_native/source/win32/customactions/reg4allmsdoc/exports.dxp
 @@ -1,3 +1,4 @@