diff options
Diffstat (limited to 'vcl/unx/gtk')
| -rw-r--r-- | vcl/unx/gtk/fpicker/resourceprovider.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk/gtksalframe.cxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vcl/unx/gtk/fpicker/resourceprovider.cxx b/vcl/unx/gtk/fpicker/resourceprovider.cxx index 42ef78a59132..c4da0258b8c6 100644 --- a/vcl/unx/gtk/fpicker/resourceprovider.cxx +++ b/vcl/unx/gtk/fpicker/resourceprovider.cxx @@ -75,7 +75,7 @@ OUString SalGtkPicker::getResString( sal_Int32 aId ) // translate the control id to a resource id sal_Int16 aResId = CtrlIdToResId( aId ); if ( aResId > -1 ) - aResString = ResId(aResId, *ImplGetResMgr()).toString(); + aResString = ResId(aResId, *ImplGetResMgr()); } catch(...) { diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index f32e49ad4f7b..8192076fc906 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -643,7 +643,7 @@ gboolean ensure_dbus_setup( gpointer data ) GMenu *firstsubmenu = g_menu_new (); - OString sNew(OUStringToOString(ResId(SV_BUTTONTEXT_NEW, *pMgr).toString(), + OString sNew(OUStringToOString(ResId(SV_BUTTONTEXT_NEW, *pMgr), RTL_TEXTENCODING_UTF8).replaceFirst("~", "_")); item = g_menu_item_new(sNew.getStr(), "app.New"); @@ -655,7 +655,7 @@ gboolean ensure_dbus_setup( gpointer data ) GMenu *secondsubmenu = g_menu_new (); - OString sPreferences(OUStringToOString(ResId(SV_STDTEXT_PREFERENCES, *pMgr).toString(), + OString sPreferences(OUStringToOString(ResId(SV_STDTEXT_PREFERENCES, *pMgr), RTL_TEXTENCODING_UTF8).replaceFirst("~", "_")); item = g_menu_item_new(sPreferences.getStr(), "app.OptionsTreeDialog"); @@ -667,21 +667,21 @@ gboolean ensure_dbus_setup( gpointer data ) GMenu *thirdsubmenu = g_menu_new (); - OString sHelp(OUStringToOString(ResId(SV_BUTTONTEXT_HELP, *pMgr).toString(), + OString sHelp(OUStringToOString(ResId(SV_BUTTONTEXT_HELP, *pMgr), RTL_TEXTENCODING_UTF8).replaceFirst("~", "_")); item = g_menu_item_new(sHelp.getStr(), "app.HelpIndex"); g_menu_append_item( thirdsubmenu, item ); g_object_unref(item); - OString sAbout(OUStringToOString(ResId(SV_STDTEXT_ABOUT, *pMgr).toString(), + OString sAbout(OUStringToOString(ResId(SV_STDTEXT_ABOUT, *pMgr), RTL_TEXTENCODING_UTF8).replaceFirst("~", "_")); item = g_menu_item_new(sAbout.getStr(), "app.About"); g_menu_append_item( thirdsubmenu, item ); g_object_unref(item); - OString sQuit(OUStringToOString(ResId(SV_MENU_MAC_QUITAPP, *pMgr).toString(), + OString sQuit(OUStringToOString(ResId(SV_MENU_MAC_QUITAPP, *pMgr), RTL_TEXTENCODING_UTF8).replaceFirst("~", "_")); item = g_menu_item_new(sQuit.getStr(), "app.Quit"); |