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

[Kohei Yoshida]

 patches/dev300/apply                        |    4 --
 patches/dev300/ok-cancel-btn-add-accel.diff |   40 +++++++++++++++-------------
 2 files changed, 23 insertions(+), 21 deletions(-)

New commits:
commit 2c0ecf8b3b2232cac336e2bc77a14fb77b41eabf
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue May 25 16:30:08 2010 -0400

    When launching native GTK dialogs, translate mnemonics properly.
    
    * patches/dev300/ok-cancel-btn-add-accel.diff: replace '~' with
      '_' when launching native GTK dialogs. (n#608572)

diff --git a/patches/dev300/ok-cancel-btn-add-accel.diff b/patches/dev300/ok-cancel-btn-add-accel.diff
index 7070e1c..7b172cd 100644
--- a/patches/dev300/ok-cancel-btn-add-accel.diff
+++ b/patches/dev300/ok-cancel-btn-add-accel.diff
@@ -1,31 +1,35 @@
-From b827edde5c2f5ffc6121703dfef9ac3b6431a632 Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 16:53:02 +0200
-Subject: [PATCH 017/768] ok-cancel-btn-add-accel.diff
-
----
- vcl/source/src/btntext.src |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
 diff --git vcl/source/src/btntext.src vcl/source/src/btntext.src
-index 99579f0..1d07a15 100644
+index 39cba21..aded52a 100644
 --- vcl/source/src/btntext.src
 +++ vcl/source/src/btntext.src
-@@ -33,12 +33,12 @@
+@@ -36,12 +36,12 @@
  
  String SV_BUTTONTEXT_OK
  {
--    Text [ en-US ] = "OK";
-+    Text [ en-US ] = "~OK";
+-	Text [ en-US ] = "OK";
++	Text [ en-US ] = "~OK";
  };
  
  String SV_BUTTONTEXT_CANCEL
  {
--    Text [ en-US ] = "Cancel";
-+    Text [ en-US ] = "~Cancel";
+-	Text [ en-US ] = "Cancel";
++	Text [ en-US ] = "~Cancel";
  };
  
  String SV_BUTTONTEXT_YES
--- 
-1.7.0.1
-
+diff --git vcl/unx/gtk/app/gtksys.cxx vcl/unx/gtk/app/gtksys.cxx
+index 272af20..9456af8 100644
+--- vcl/unx/gtk/app/gtksys.cxx
++++ vcl/unx/gtk/app/gtksys.cxx
+@@ -74,7 +74,10 @@ int GtkSalSystem::ShowNativeDialog( const String& rTitle,
+     int nButton = 0;
+     for( std::list< String >::const_iterator it = rButtons.begin(); it != rButtons.end(); ++it )
+     {
+-        ByteString aLabel( *it, RTL_TEXTENCODING_UTF8 );
++        String aStr = *it;
++        // GTK uses '_' to indicate mnemonic, not '~'.
++        aStr.SearchAndReplaceAscii("~", String::CreateFromAscii("_"));
++        ByteString aLabel( aStr, RTL_TEXTENCODING_UTF8 );
+ 
+         if( nButton == nDefButton )
+         {
commit 7a41de74543434a624ca37a073873abdcce147e2
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue May 25 16:28:14 2010 -0400

    Revert "Disabled ok-cancel-btn-add-accel.diff."
    
    This reverts commit 5a80108684cbb4599e014e8869e89b09e787889b.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9e26928..ed1816f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -216,9 +216,7 @@ cws-koheiextref01-sc.diff,     kohei
 
 [ LinuxOnly ]
 # add accelerator to the OK and Cancel buttons.
-# FIXME this causes problems eg. in the MessageBox dialogs, where it shows the
-# OK buttons as [~OK]
-# FIXME ok-cancel-btn-add-accel.diff, kohei
+ok-cancel-btn-add-accel.diff, kohei
 
 [ TemporaryHacks ]