[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                           |    9 +++++++++
 patches/dev300/win32-dont-attempt-restart.diff |   11 +++++++++++
 2 files changed, 20 insertions(+)

New commits:
commit 3b08b0b3907db79ec7adbb9d4437f763e2756c54
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Oct 22 16:40:15 2009 +0300

    Don't attempt to restart soffice.bin on Windows either
    
    * patches/dev300/win32-dont-attempt-restart.diff: New
      patch. Workaround for bnc#524250. Simply kill the restart looping
      upon sofice.bin crashes in desktop/win32/source/officeloader/
      officeloader.cxx. The restart is broken (or not implemented) on
      Linux too anyway.
    
    * patches/dev300/apply: Add it to NovellOnlyWin32.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index fb3626d..a69a4d7 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3399,3 +3399,12 @@ store-crash-fix.diff, thorsten
 sd-ppt-fix-document-summary-reading.diff, n#546758, rodo
 # fixes crasher in xml parser
 unoxml-fix-empty-xmlns.diff, rodo
+
+[ NovellOnlyWin32 ]
+# Don't attempt to restart soffice.bin immediately if it crashes.  At
+# such a restart, if the document recovery dialog is cancelled, an
+# empty Writer document is opened even if the user was editing some
+# other kind of document. Some customers are annoyed by this. And the
+# automatic restart doesn't work on Linux anyway, so for consistency
+# it doesn't hurt if we force it not to work on Windows, either.
+win32-dont-attempt-restart.diff, n#524250, tml
diff --git a/patches/dev300/win32-dont-attempt-restart.diff b/patches/dev300/win32-dont-attempt-restart.diff
new file mode 100644
index 0000000..704fea9
--- /dev/null
+++ b/patches/dev300/win32-dont-attempt-restart.diff
@@ -0,0 +1,11 @@
+--- desktop/win32/source/officeloader/officeloader.cxx
++++ desktop/win32/source/officeloader/officeloader.cxx
+@@ -419,7 +419,7 @@
+             CloseHandle( aProcessInfo.hProcess );
+             CloseHandle( aProcessInfo.hThread );
+         }
+-    } while ( fSuccess && ::desktop::ExitHelper::E_CRASH_WITH_RESTART == dwExitCode );
++    } while ( false );
+     delete[] lpCommandLine;
+ 
+     return fSuccess ? dwExitCode : -1;