[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                                      |    1 
 patches/dev300/novell-win32-avoid-premature-shutdown.diff |   30 --------------
 2 files changed, 31 deletions(-)

New commits:
commit 94dd56304c3d1ec24eb14abc33411a4a6fcde9d8
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 5 18:16:17 2011 +0300

    Kill novell-win32-avoid-premature-shutdown.diff
    
    It has not been used for years.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 72d0fc5..c9b0c18 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1196,7 +1196,6 @@ dont-check-fqdn.diff
 [ UnUsedButNotYetRemovedFromGit ]
 # diffs kept for reference as there might soon be a need to resurrect
 # part of the code
-novell-win32-avoid-premature-shutdown.diff, n#269146, tml
 
 # Provides a great speed-up for a mail merge operation : 7x faster
 sw-mailmerge-faster.diff, i#40827, mloiseleur
diff --git a/patches/dev300/novell-win32-avoid-premature-shutdown.diff b/patches/dev300/novell-win32-avoid-premature-shutdown.diff
deleted file mode 100644
index 95a2ca3..0000000
--- a/patches/dev300/novell-win32-avoid-premature-shutdown.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- dbaccess/source/ui/dlg/dbwizsetup.cxx	2006-12-01 17:52:43.000000000 +0000
-+++ dbaccess/source/ui/dlg/dbwizsetup.cxx	2007-05-28 10:10:03.370250000 +0000
-@@ -1228,6 +1228,7 @@
-             // wants us to load could be a non-database document. Instead, we asynchronously
-             // open the selected document. Thus, the wizard's return value is RET_CANCEL,
-             // which means to not continue loading the database document
-+            putenv("UGLY_HACK_TO_FIX_N269146=HAHA");
-             if ( !OWizardMachine::onFinish( RET_CANCEL ) )
-                 return sal_False;
- 
---- desktop/source/app/dispatchwatcher.cxx	2006-12-01 17:53:04.000000000 +0000
-+++ desktop/source/app/dispatchwatcher.cxx	2007-05-28 10:25:35.526500000 +0000
-@@ -489,13 +489,16 @@
- 
-         Reference< XElementAccess > xList( xTasksSupplier->getFrames(), UNO_QUERY );
- 
--        if ( !xList->hasElements() )
-+        char *hack = getenv("UGLY_HACK_TO_FIX_N269146");
-+        if ( (hack == NULL || *hack == '\0') && !xList->hasElements() )
- 		{
- 			// We don't have any task open so we have to shutdown ourself!!
- 			Reference< XDesktop > xDesktop2( xTasksSupplier, UNO_QUERY );
- 			if ( xDesktop2.is() )
- 				return xDesktop2->terminate();
- 		}
-+        if (hack != NULL)
-+            putenv("UGLY_HACK_TO_FIX_N269146=");
- 	}
- 
- 	return sal_False;