diff options
Diffstat (limited to 'vcl/unx/gtk')
| -rw-r--r-- | vcl/unx/gtk/a11y/atktextattributes.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx index 081542e5af45..fe2f0d5e2f52 100644 --- a/vcl/unx/gtk/a11y/atktextattributes.cxx +++ b/vcl/unx/gtk/a11y/atktextattributes.cxx @@ -542,7 +542,7 @@ SetString( uno::Any& rAny, const gchar * value ) if( !aFontName.isEmpty() ) { - rAny = uno::makeAny( OUString::fromUtf8( aFontName ) ); + rAny = uno::makeAny( OStringToOUString( aFontName, RTL_TEXTENCODING_UTF8 ) ); return true; } diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 405c4719f10f..4eeafb1aeff7 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -938,7 +938,7 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std gchar *gFileName = g_filename_from_uri ( sFileName.getStr(), NULL, NULL ); if( g_file_test( gFileName, G_FILE_TEST_IS_REGULAR ) ) { - INetURLObject aFileObj( OUString::fromUtf8(sFileName) ); + INetURLObject aFileObj( OStringToOUString(sFileName, RTL_TEXTENCODING_UTF8) ); OString baseName( OUStringToOString( @@ -1382,7 +1382,7 @@ OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId ) else OSL_TRACE("Can't get label on list"); - return OUString::fromUtf8( aTxt ); + return OStringToOUString( aTxt, RTL_TEXTENCODING_UTF8 ); } // XFilePreview functions diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 6d669e88fcd7..bab4f5c6f888 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -3898,7 +3898,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) psp::FastPrintFontInfo aInfo; // set family name - aInfo.m_aFamilyName = OUString::fromUtf8( aFamily ); + aInfo.m_aFamilyName = OStringToOUString( aFamily, RTL_TEXTENCODING_UTF8 ); // set italic switch( eStyle ) { |