diff options
Diffstat (limited to 'vcl/unx/generic/printer/printerinfomanager.cxx')
| -rw-r--r-- | vcl/unx/generic/printer/printerinfomanager.cxx | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index fecc6ada9054..97c3668f1542 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -128,9 +128,8 @@ PrinterInfoManager::~PrinterInfoManager() void PrinterInfoManager::initSystemDefaultPaper() { - m_aSystemDefaultPaper = OStringToOUString( - PaperInfo::toPSName(PaperInfo::getSystemDefaultPaper().getPaper()), - RTL_TEXTENCODING_UTF8); + m_aSystemDefaultPaper = OUString::fromUtf8( + PaperInfo::toPSName(PaperInfo::getSystemDefaultPaper().getPaper())); } bool PrinterInfoManager::checkPrintersChanged( bool bWait ) @@ -330,10 +329,9 @@ void PrinterInfoManager::initialize() // initialize to global defaults aPrinter.m_aInfo = m_aGlobalDefaults; - aPrinterName = OStringToOUString(aValue.copy(nNamePos+1), - RTL_TEXTENCODING_UTF8); + aPrinterName = OUString::fromUtf8(aValue.copy(nNamePos+1)); aPrinter.m_aInfo.m_aPrinterName = aPrinterName; - aPrinter.m_aInfo.m_aDriverName = OStringToOUString(aValue.copy(0, nNamePos), RTL_TEXTENCODING_UTF8); + aPrinter.m_aInfo.m_aDriverName = OUString::fromUtf8(aValue.copy(0, nNamePos)); // set parser, merge settings // don't do this for CUPS printers as this is done @@ -387,14 +385,14 @@ void PrinterInfoManager::initialize() aValue = "lpr"; #endif } - aPrinter.m_aInfo.m_aCommand = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); + aPrinter.m_aInfo.m_aCommand = OUString::fromUtf8(aValue); } aValue = aConfig.ReadKey( "QuickCommand" ); - aPrinter.m_aInfo.m_aQuickCommand = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); + aPrinter.m_aInfo.m_aQuickCommand = OUString::fromUtf8(aValue); aValue = aConfig.ReadKey( "Features" ); - aPrinter.m_aInfo.m_aFeatures = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); + aPrinter.m_aInfo.m_aFeatures = OUString::fromUtf8(aValue); // override the settings in m_aGlobalDefaults if keys exist aValue = aConfig.ReadKey( "DefaultPrinter" ); @@ -402,10 +400,10 @@ void PrinterInfoManager::initialize() aDefaultPrinter = aPrinterName; aValue = aConfig.ReadKey( "Location" ); - aPrinter.m_aInfo.m_aLocation = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); + aPrinter.m_aInfo.m_aLocation = OUString::fromUtf8(aValue); aValue = aConfig.ReadKey( "Comment" ); - aPrinter.m_aInfo.m_aComment = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); + aPrinter.m_aInfo.m_aComment = OUString::fromUtf8(aValue); aValue = aConfig.ReadKey( "Copies" ); if (!aValue.isEmpty()) |