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

[Tor Lillqvist]

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

New commits:
commit 45b04f9d461899b349bb69b9e052136214f5fcbe
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Dec 1 18:05:45 2010 +0200

    Add fix for bnc#656566
    
    * patches/dev300/openlockedquerybox-alwaysontop.diff: New patch.
      Call EnableAlwaysOnTop(TRUE) in the OpenLockedQueryBox constructor.
    
    * patches/dev300/apply: Add it to NovellOnlyWin32
    
    Doing this as an old-fashioned patch as llunak says he will fix it
    better.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4669de2..9d86691 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2342,6 +2342,7 @@ oox-smartart-import.diff, thorsten
 
 [ NovellOnlyWin32 ]
 sled10-splash.diff, i#123456, pmladek
+openlockedquerybox-alwaysontop.diff, n#656566, tml
 
 [ Fixes ]
 svx-ppt-bullet-offset-fix.diff, n#593609, rodo
diff --git a/patches/dev300/openlockedquerybox-alwaysontop.diff b/patches/dev300/openlockedquerybox-alwaysontop.diff
new file mode 100644
index 0000000..8b32c63
--- /dev/null
+++ b/patches/dev300/openlockedquerybox-alwaysontop.diff
@@ -0,0 +1,11 @@
+--- 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()