convert gtk plugin to rtl::O(U)String

4 files changed, 22 insertions, 20 deletions

diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index f5ee92a036a8..1facf7e52d1f 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -205,7 +205,7 @@ class GtkSalFrame : public SalFrame
     bool                            m_bSendModChangeOnRelease;
     bool                            m_bWindowIsGtkPlug;
     bool                            m_bSetFocusOnMap;
-    String                          m_aTitle;
+    rtl::OUString                          m_aTitle;
     rtl::OUString                   m_sWMClass;
 
     IMHandler*                      m_pIMHandler;
@@ -340,7 +340,7 @@ public:
     // When Event is called, SalInstance::Yield() must be returned
     virtual sal_Bool                PostEvent( void* pData );
 
-    virtual void                SetTitle( const XubString& rTitle );
+    virtual void                SetTitle( const rtl::OUString& rTitle );
     virtual void                SetIcon( sal_uInt16 nIcon );
     virtual void                SetMenu( SalMenu *pSalMenu );
     virtual void                DrawMenuBar();
@@ -384,8 +384,8 @@ public:
     virtual void                SetInputContext( SalInputContext* pContext );
     virtual void                EndExtTextInput( sal_uInt16 nFlags );
 
-    virtual String              GetKeyName( sal_uInt16 nKeyCode );
-    virtual String              GetSymbolKeyName( const XubString& rFontName, sal_uInt16 nKeyCode );
+    virtual rtl::OUString              GetKeyName( sal_uInt16 nKeyCode );
+    virtual rtl::OUString              GetSymbolKeyName( const rtl::OUString& rFontName, sal_uInt16 nKeyCode );
     virtual sal_Bool            MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
 
     // returns the input language used for the last key stroke
diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx
index f378bf35b162..c310e1729fad 100644
--- a/vcl/inc/unx/gtk/gtksys.hxx
+++ b/vcl/inc/unx/gtk/gtksys.hxx
@@ -47,9 +47,9 @@ public:
     virtual rtl::OUString GetScreenName                  (unsigned int nScreen);
     virtual Rectangle     GetDisplayScreenPosSizePixel   (unsigned int nScreen);
     virtual Rectangle     GetDisplayWorkAreaPosSizePixel (unsigned int nScreen);
-    virtual int           ShowNativeDialog (const String&              rTitle,
-                                            const String&              rMessage,
-                                            const std::list< String >& rButtons,
+    virtual int           ShowNativeDialog (const rtl::OUString&              rTitle,
+                                            const rtl::OUString&              rMessage,
+                                            const std::list< rtl::OUString >& rButtons,
                                             int                        nDefButton);
 
     // We have a 'screen' number that is combined from screen-idx + monitor-idx
diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index dbe1c47c7e89..a5b134e420f2 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -30,6 +30,7 @@
 #include <string.h>
 #include <gmodule.h>
 #include <gtk/gtk.h>
+#include <comphelper/string.hxx>
 #include <unx/gtk/gtkinst.hxx>
 #include <unx/gtk/gtksys.hxx>
 
@@ -210,15 +211,16 @@ rtl::OUString GtkSalSystem::GetScreenName(unsigned int nScreen)
 }
 
 // convert ~ to indicate mnemonic to '_'
-static rtl::OString MapToGtkAccelerator(const String &rStr)
+static rtl::OString MapToGtkAccelerator(const rtl::OUString &rStr)
 {
-    String aRet( rStr );
-    aRet.SearchAndReplaceAscii("~", String::CreateFromAscii("_"));
-    return rtl::OUStringToOString(aRet, RTL_TEXTENCODING_UTF8);
+    const rtl::OUString aRep(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_" )));
+    return rtl::OUStringToOString(
+            comphelper::string::searchAndReplaceAsciiL(
+                rStr, RTL_CONSTASCII_STRINGPARAM( "~" ), aRep), RTL_TEXTENCODING_UTF8);
 }
 
-int GtkSalSystem::ShowNativeDialog (const String& rTitle, const String& rMessage,
-                                    const std::list< String >& rButtonNames,
+int GtkSalSystem::ShowNativeDialog (const rtl::OUString& rTitle, const rtl::OUString& rMessage,
+                                    const std::list< rtl::OUString >& rButtonNames,
                                     int nDefaultButton)
 {
     rtl::OString aTitle (rtl::OUStringToOString (rTitle, RTL_TEXTENCODING_UTF8));
@@ -231,7 +233,7 @@ int GtkSalSystem::ShowNativeDialog (const String& rTitle, const String& rMessage
                       "text", aMessage.getStr(),
                       NULL));
     int nButton = 0;
-    std::list< String >::const_iterator it;
+    std::list< rtl::OUString >::const_iterator it;
     for (it = rButtonNames.begin(); it != rButtonNames.end(); ++it)
         gtk_dialog_add_button (pDialog, MapToGtkAccelerator(*it).getStr(), nButton++);
     gtk_dialog_set_default_response (pDialog, nDefaultButton);
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index e8998ca94abc..9947eb0abd02 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -1133,7 +1133,7 @@ sal_Bool GtkSalFrame::PostEvent( void* pData )
     return sal_True;
 }
 
-void GtkSalFrame::SetTitle( const String& rTitle )
+void GtkSalFrame::SetTitle( const rtl::OUString& rTitle )
 {
     m_aTitle = rTitle;
     if( m_pWindow && ! isChild() )
@@ -2358,25 +2358,25 @@ void GtkSalFrame::Sync()
     gdk_display_sync( getGdkDisplay() );
 }
 
-String GtkSalFrame::GetSymbolKeyName( const String&, sal_uInt16 nKeyCode )
+rtl::OUString GtkSalFrame::GetSymbolKeyName( const rtl::OUString&, sal_uInt16 nKeyCode )
 {
 #if !GTK_CHECK_VERSION(3,0,0)
   return getDisplay()->GetKeyName( nKeyCode );
 #else
   (void)nKeyCode;
 # warning FIXME - key names
-  return String();
+  return rtl::OUString();
 #endif
 }
 
-String GtkSalFrame::GetKeyName( sal_uInt16 nKeyCode )
+rtl::OUString GtkSalFrame::GetKeyName( sal_uInt16 nKeyCode )
 {
 #if !GTK_CHECK_VERSION(3,0,0)
     return getDisplay()->GetKeyName( nKeyCode );
 #else
   (void)nKeyCode;
 # warning FIXME - key names
-  return String();
+  return rtl::OUString();
 #endif
 }
 
@@ -2621,7 +2621,7 @@ void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed, int nSc
     }
 #endif
 
-    if( m_aTitle.Len() )
+    if( ! m_aTitle.isEmpty() )
         SetTitle( m_aTitle );
 
     if( bWasVisible )