[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                      |    3 ---
 patches/dev300/sfx2-quickstarter-fix.diff |   19 -------------------
 2 files changed, 22 deletions(-)

New commits:
commit 78421557bd9f40867c84b7b2d91b297298bc48cf
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 21 14:59:53 2009 +0300

    sfx2-quickstarter-fix.diff is upstream
    
    * patches/dev300/sfx2-quickstarter-fix.diff: Delete, is
      upstream. i#88382 is fixed and verified.
    * patches/dev300/apply: Drop it.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4383087..c72d3ab 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -545,9 +545,6 @@ gnome-vfs-late-init.diff, i#84137, jholesov
 [ QuickStarter ]
 unxsplash-rework.diff, i#60696, michael/jholesov
 
-# fix the systray quickstarter
-sfx2-quickstarter-fix.diff, i#88382, michael
-
 # FIXME: unxsplash-rework needs this function which was removed in m13
 # due to being unused. fix properly.
 hack-readd-GetStringParam.diff
diff --git a/patches/dev300/sfx2-quickstarter-fix.diff b/patches/dev300/sfx2-quickstarter-fix.diff
deleted file mode 100644
index 39558c8..0000000
--- a/patches/dev300/sfx2-quickstarter-fix.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: sfx2/source/appl/shutdownicon.cxx
-===================================================================
-RCS file: /cvs/framework/sfx2/source/appl/shutdownicon.cxx,v
-retrieving revision 1.61
-diff -u -p -r1.61 shutdownicon.cxx
---- sfx2/source/appl/shutdownicon.cxx	2 Nov 2007 13:13:41 -0000	1.61
-+++ sfx2/source/appl/shutdownicon.cxx	17 Apr 2008 10:37:07 -0000
-@@ -531,9 +531,8 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogCl
-         }
-     }
- 
--#ifdef WNT
--        LeaveModalMode();
--#endif
-+    LeaveModalMode();
-+
-     return 0;
- }
-