diff options
Diffstat (limited to 'vcl/unx')
-rw-r--r-- | vcl/unx/generic/app/i18n_cb.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/printer/jobdata.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/printer/printerinfomanager.cxx | 20 | ||||
-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 | ||||
-rw-r--r-- | vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 2 |
7 files changed, 18 insertions, 16 deletions
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index 5732ac20571c..015f226ed8fb 100644 --- a/vcl/unx/generic/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -523,7 +523,7 @@ void SwitchIMCallback (XIC, XPointer, XPointer call_data) { XIMSwitchIMNotifyCallbackStruct* pCallData = (XIMSwitchIMNotifyCallbackStruct*)call_data; - ::vcl::I18NStatus::get().changeIM( OUString::fromUtf8(pCallData->to->name) ); + ::vcl::I18NStatus::get().changeIM( OStringToOUString(pCallData->to->name, RTL_TEXTENCODING_UTF8) ); } // vii. destroy callbacks: internally disable all IC/IM calls diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx index ea7bb0de3735..389f74dc8be8 100644 --- a/vcl/unx/generic/printer/jobdata.cxx +++ b/vcl/unx/generic/printer/jobdata.cxx @@ -219,7 +219,7 @@ bool JobData::constructFromStreamBuffer( void* pData, int bytes, JobData& rJobDa else if (aLine.startsWith(printerEquals)) { bPrinter = true; - rJobData.m_aPrinterName = OUString::fromUtf8(aLine.copy(RTL_CONSTASCII_LENGTH(printerEquals))); + rJobData.m_aPrinterName = OStringToOUString(aLine.copy(RTL_CONSTASCII_LENGTH(printerEquals)), RTL_TEXTENCODING_UTF8); } else if (aLine.startsWith(orientatationEquals)) { diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index 97c3668f1542..fecc6ada9054 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -128,8 +128,9 @@ PrinterInfoManager::~PrinterInfoManager() void PrinterInfoManager::initSystemDefaultPaper() { - m_aSystemDefaultPaper = OUString::fromUtf8( - PaperInfo::toPSName(PaperInfo::getSystemDefaultPaper().getPaper())); + m_aSystemDefaultPaper = OStringToOUString( + PaperInfo::toPSName(PaperInfo::getSystemDefaultPaper().getPaper()), + RTL_TEXTENCODING_UTF8); } bool PrinterInfoManager::checkPrintersChanged( bool bWait ) @@ -329,9 +330,10 @@ void PrinterInfoManager::initialize() // initialize to global defaults aPrinter.m_aInfo = m_aGlobalDefaults; - aPrinterName = OUString::fromUtf8(aValue.copy(nNamePos+1)); + aPrinterName = OStringToOUString(aValue.copy(nNamePos+1), + RTL_TEXTENCODING_UTF8); aPrinter.m_aInfo.m_aPrinterName = aPrinterName; - aPrinter.m_aInfo.m_aDriverName = OUString::fromUtf8(aValue.copy(0, nNamePos)); + aPrinter.m_aInfo.m_aDriverName = OStringToOUString(aValue.copy(0, nNamePos), RTL_TEXTENCODING_UTF8); // set parser, merge settings // don't do this for CUPS printers as this is done @@ -385,14 +387,14 @@ void PrinterInfoManager::initialize() aValue = "lpr"; #endif } - aPrinter.m_aInfo.m_aCommand = OUString::fromUtf8(aValue); + aPrinter.m_aInfo.m_aCommand = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); } aValue = aConfig.ReadKey( "QuickCommand" ); - aPrinter.m_aInfo.m_aQuickCommand = OUString::fromUtf8(aValue); + aPrinter.m_aInfo.m_aQuickCommand = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); aValue = aConfig.ReadKey( "Features" ); - aPrinter.m_aInfo.m_aFeatures = OUString::fromUtf8(aValue); + aPrinter.m_aInfo.m_aFeatures = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); // override the settings in m_aGlobalDefaults if keys exist aValue = aConfig.ReadKey( "DefaultPrinter" ); @@ -400,10 +402,10 @@ void PrinterInfoManager::initialize() aDefaultPrinter = aPrinterName; aValue = aConfig.ReadKey( "Location" ); - aPrinter.m_aInfo.m_aLocation = OUString::fromUtf8(aValue); + aPrinter.m_aInfo.m_aLocation = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); aValue = aConfig.ReadKey( "Comment" ); - aPrinter.m_aInfo.m_aComment = OUString::fromUtf8(aValue); + aPrinter.m_aInfo.m_aComment = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); aValue = aConfig.ReadKey( "Copies" ); if (!aValue.isEmpty()) 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 ) { diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index 96b73c7c218d..66d0dddba5d7 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -1283,7 +1283,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 ) { |