[ooo-build-commit] .: patches/dev300

[Fridrich Strba]

 patches/dev300/win32-dont-attempt-restart.diff          |    5 +++--
 patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff |    6 +++---
 patches/dev300/win32-prebuilt-writingaids-zip.diff      |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit b1c348ce2259d61edf0890b7a11fcf42cedfc514
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Aug 2 09:43:00 2010 +0200

    Massage more patches to apply on windows
    
    * patches/dev300/win32-dont-attempt-restart.diff:
    * patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff:
    * patches/dev300/win32-prebuilt-writingaids-zip.diff:

diff --git a/patches/dev300/win32-dont-attempt-restart.diff b/patches/dev300/win32-dont-attempt-restart.diff
index 704fea9..dd83af2 100644
--- a/patches/dev300/win32-dont-attempt-restart.diff
+++ b/patches/dev300/win32-dont-attempt-restart.diff
@@ -1,10 +1,11 @@
 --- desktop/win32/source/officeloader/officeloader.cxx
 +++ desktop/win32/source/officeloader/officeloader.cxx
-@@ -419,7 +419,7 @@
+@@ -419,8 +419,7 @@
              CloseHandle( aProcessInfo.hProcess );
              CloseHandle( aProcessInfo.hThread );
          }
--    } while ( fSuccess && ::desktop::ExitHelper::E_CRASH_WITH_RESTART == dwExitCode );
+-    } while ( fSuccess
+-              && ( ::desktop::ExitHelper::E_CRASH_WITH_RESTART == dwExitCode || ::desktop::ExitHelper::E_NORMAL_RESTART == dwExitCode ));
 +    } while ( false );
      delete[] lpCommandLine;
  
diff --git a/patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff b/patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff
index 5bea932..b035209 100644
--- a/patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff
+++ b/patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff
@@ -1,6 +1,6 @@
 --- scp2/source/ooo/file_ooo.scp.org	2008-07-17 08:37:09.000000000 +0200
 +++ scp2/source/ooo/file_ooo.scp	2008-07-18 07:23:31.000000000 +0200
-@@ -2920,6 +2920,19 @@
+@@ -1868,6 +1868,19 @@
  
  // Dictionary extensions
  
@@ -19,8 +19,8 @@
 +
  #ifndef WITHOUT_MYSPELL_DICTS
  File gid_File_Extension_Dictionary_Af
- 	Dir = gid_Brand_Dir_Share_Extensions_Install;
-@@ -3136,6 +3149,8 @@
+ 	Dir = gid_Brand_Dir_Share_Extensions_Dict_Af;
+@@ -2084,6 +2097,8 @@
  End
  #endif
  
diff --git a/patches/dev300/win32-prebuilt-writingaids-zip.diff b/patches/dev300/win32-prebuilt-writingaids-zip.diff
index 2af369e..a2d07f5 100644
--- a/patches/dev300/win32-prebuilt-writingaids-zip.diff
+++ b/patches/dev300/win32-prebuilt-writingaids-zip.diff
@@ -1,7 +1,7 @@
 --- dictionaries/prj/build.lst
 +++ dictionaries/prj/build.lst
 @@ -1,34 +1,3 @@
--di      dictionaries : soltools NULL
+-di      dictionaries : soltools mythes NULL
 -di	dictionaries					usr1 - all di_mkout NULL
 -di      dictionaries\af_ZA      nmake   -       all     di_af_ZA NULL
 -di      dictionaries\ca         nmake   -       all     di_ca NULL