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

[Tor Lillqvist]

 patches/dev300/apply                               |    1 -
 patches/dev300/openlockedquerybox-alwaysontop.diff |   11 -----------
 2 files changed, 12 deletions(-)

New commits:
commit 20e66153075186bd6cdd3072d859058bad5dbf15
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Apr 6 16:22:54 2011 +0300

    openlockedquerybox-alwaysontop.diff is integrated

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 72401d2..57a0825 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1728,7 +1728,6 @@ oox-smartart-import.diff, thorsten
 
 [ NovellOnlyWin32 ]
 novell-win32-splash.diff, fridrich
-openlockedquerybox-alwaysontop.diff, n#656566, tml
 
 [ SUSE101 ]
 # fix build with the old autoconf
diff --git a/patches/dev300/openlockedquerybox-alwaysontop.diff b/patches/dev300/openlockedquerybox-alwaysontop.diff
deleted file mode 100644
index 8b32c63..0000000
--- a/patches/dev300/openlockedquerybox-alwaysontop.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- uui/source/openlocked.cxx~	2010-05-20 12:31:55.000000000 +0300
-+++ uui/source/openlocked.cxx	2010-12-01 17:04:49.281050200 +0200
-@@ -43,6 +43,8 @@
-     AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
-     SetButtonHelpText( RET_YES, String() );
-     SetButtonHelpText( RET_NO, String() );
-+
-+    EnableAlwaysOnTop( TRUE );
- }
- 
- OpenLockedQueryBox::~OpenLockedQueryBox()