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

[Tor Lillqvist]

 patches/dev300/apply                                 |    4 --
 patches/dev300/win32-no-seterror-when-debugging.diff |   35 -------------------
 2 files changed, 39 deletions(-)

New commits:
commit fcb3fa42ba296a07bd30665e634f05a3a200b704
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Sep 29 15:04:58 2010 +0300

    Move win32-no-seterror-when-debugging.diff to git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1ee862a..24ac28c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2146,10 +2146,6 @@ always_default_iconset.diff
 [ Win32Only ]
 seamonkey-source-1.1.14.patch.diff, i#84961, tml
 
-# We *do* want error message windows about missing DLLs etc displayed
-# by Windows when built with debug=true, I think
-win32-no-seterror-when-debugging.diff, tml
-
 # Save old associations for MS doc types when installing OOo, and then
 # restore them if still relevant when uninstalling OOo
 win32-restore-associations.diff, n#530872, tml
diff --git a/patches/dev300/win32-no-seterror-when-debugging.diff b/patches/dev300/win32-no-seterror-when-debugging.diff
deleted file mode 100644
index bc7f682..0000000
--- a/patches/dev300/win32-no-seterror-when-debugging.diff
+++ /dev/null
@@ -1,35 +0,0 @@
---- sal/osl/w32/dllentry.c
-+++ sal/osl/w32/dllentry.c
-@@ -197,8 +197,10 @@
-                     osl_isSingleCPU = 1;
-                 }
- #endif
-+#if OSL_DEBUG_LEVEL < 2
-                 /* Suppress file error messages from system like "Floppy A: not inserted" */
-                 SetErrorMode( SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS );
-+#endif
- 
-                 /* initialize global mutex */
-                 g_Mutex = osl_createMutex();
---- sal/osl/w32/module.cxx
-+++ sal/osl/w32/module.cxx
-@@ -48,7 +48,9 @@
- oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 nRtldMode )
- {
-     HINSTANCE hInstance;
-+#if OSL_DEBUG_LEVEL < 2
-     UINT errorMode = SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS);
-+#endif
-     rtl_uString* Module = NULL;
-     oslModule ret = 0;
-     oslFileError	nError;
-@@ -74,7 +74,9 @@
- 
-     ret = (oslModule) hInstance;
-     rtl_uString_release(Module);
-+#if OSL_DEBUG_LEVEL < 2
-     SetErrorMode(errorMode);
-+#endif
- 
-     RTL_LOGFILE_TRACE1( "} osl_loadModule end: %S", (LPTSTR)&strModuleName->buffer );
-