diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-08-21 15:07:31 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-08-21 15:10:35 +0200 |
commit | 64b993e046f23baaacaff1572b7d2a816588b5ef (patch) | |
tree | 237dce36a1d4787d168a0520839f6aab22500487 /vcl/unx | |
parent | 75f41baab6ce75786a91fe461835ee16a23ec18e (diff) |
finish deprecation of O(U)String::valueOf()
Compiler plugin to replace with matching number(), boolean() or OUString ctor,
ran it, few manual tweaks, mark as really deprecated.
Change-Id: I4a79bdbcf4c460d21e73b635d2bd3725c22876b2
Diffstat (limited to 'vcl/unx')
-rw-r--r-- | vcl/unx/generic/printer/cupsmgr.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/printer/printerinfomanager.cxx | 10 | ||||
-rw-r--r-- | vcl/unx/gtk/gdi/salprn-gtk.cxx | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index e386d3dfc293..a5705c31bd30 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -629,7 +629,7 @@ void CUPSManager::getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner if( rJob.m_nPDFDevice > 0 && rJob.m_nCopies > 1 ) { - OString aVal( OString::valueOf( sal_Int32( rJob.m_nCopies ) ) ); + OString aVal( OString::number( rJob.m_nCopies ) ); rNumOptions = cupsAddOption( "copies", aVal.getStr(), rNumOptions, (cups_option_t**)rOptions ); } if( ! bBanner ) diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index 4e53c82891a2..9f4dfa2870d7 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -772,12 +772,12 @@ bool PrinterInfoManager::writePrinterConfig() pConfig->WriteKey( "Command", OUStringToOString(it->second.m_aInfo.m_aCommand, RTL_TEXTENCODING_UTF8) ); pConfig->WriteKey( "QuickCommand", OUStringToOString(it->second.m_aInfo.m_aQuickCommand, RTL_TEXTENCODING_UTF8) ); pConfig->WriteKey( "Features", OUStringToOString(it->second.m_aInfo.m_aFeatures, RTL_TEXTENCODING_UTF8) ); - pConfig->WriteKey("Copies", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nCopies))); + pConfig->WriteKey("Copies", OString::number(it->second.m_aInfo.m_nCopies)); pConfig->WriteKey( "Orientation", it->second.m_aInfo.m_eOrientation == orientation::Landscape ? "Landscape" : "Portrait" ); - pConfig->WriteKey("PSLevel", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nPSLevel))); - pConfig->WriteKey("PDFDevice", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nPDFDevice))); - pConfig->WriteKey("ColorDevice", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nColorDevice))); - pConfig->WriteKey("ColorDepth", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nColorDepth))); + pConfig->WriteKey("PSLevel", OString::number(it->second.m_aInfo.m_nPSLevel)); + pConfig->WriteKey("PDFDevice", OString::number(it->second.m_aInfo.m_nPDFDevice)); + pConfig->WriteKey("ColorDevice", OString::number(it->second.m_aInfo.m_nColorDevice)); + pConfig->WriteKey("ColorDepth", OString::number(it->second.m_aInfo.m_nColorDepth)); aValue.append(static_cast<sal_Int32>(it->second.m_aInfo.m_nLeftMarginAdjust)); aValue.append(','); aValue.append(static_cast<sal_Int32>(it->second.m_aInfo.m_nRightMarginAdjust)); diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx index b50fae1b1815..18af29460b82 100644 --- a/vcl/unx/gtk/gdi/salprn-gtk.cxx +++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx @@ -635,7 +635,7 @@ GtkPrintDialog::impl_initCustomTab() GtkWidget* const pRow = gtk_hbox_new(FALSE, 12); gtk_box_pack_start(GTK_BOX(pVbox), pRow, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(pRow), pWidget, FALSE, FALSE, 0); - aPropertyToDependencyRowMap[aPropertyName + OUString::valueOf(m)] = pRow; + aPropertyToDependencyRowMap[aPropertyName + OUString::number(m)] = pRow; gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pWidget), m == nSelectVal); gtk_widget_set_sensitive(pWidget, m_rController.isUIOptionEnabled(aPropertyName) && pVal != NULL); @@ -722,7 +722,7 @@ GtkPrintDialog::impl_initCustomTab() { if (bUseDependencyRow && !aDependsOnName.isEmpty()) { - pRow = aPropertyToDependencyRowMap[aDependsOnName + OUString::valueOf(nDependsOnValue)]; + pRow = aPropertyToDependencyRowMap[aDependsOnName + OUString::number(nDependsOnValue)]; if (!pRow) { gtk_widget_destroy(pWidget); @@ -738,7 +738,7 @@ GtkPrintDialog::impl_initCustomTab() gtk_box_pack_start(GTK_BOX(pCurParent), pRow, FALSE, FALSE, 0); } if (!pGroup) - aPropertyToDependencyRowMap[aPropertyName + OUString::valueOf(sal_Int32(0))] = pRow; + aPropertyToDependencyRowMap[aPropertyName + OUString::number(0)] = pRow; gtk_box_pack_start(GTK_BOX(pRow), pWidget, FALSE, FALSE, 0); } } @@ -1153,7 +1153,7 @@ const const OUString aPrintDialogStr("PrintDialog"); pItem->setValue(aPrintDialogStr, OUString("CopyCount"), - OUString::valueOf(sal_Int32(m_pWrapper->print_settings_get_n_copies(pSettings)))); + OUString::number(m_pWrapper->print_settings_get_n_copies(pSettings))); pItem->setValue(aPrintDialogStr, OUString("Collate"), m_pWrapper->print_settings_get_collate(pSettings) |