[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Kohei Yoshida]

 patches/dev300/ok-cancel-btn-add-accel.diff |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

New commits:
commit 93709df8845f0ef82e4791ac3ca922287de2c53a
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue May 25 16:26:05 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 5cfbc08..7b172cd 100644
--- a/patches/dev300/ok-cancel-btn-add-accel.diff
+++ b/patches/dev300/ok-cancel-btn-add-accel.diff
@@ -17,3 +17,19 @@ index 39cba21..aded52a 100644
  };
  
  String SV_BUTTONTEXT_YES
+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 )
+         {