diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-07 09:07:51 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-08-12 11:56:45 +0200 |
| commit | 697c37fefd3444e93c380e419f8d4ee3a377e8b1 (patch) | |
| tree | 3be4c24a2347c7982b38351f1990d0fc1610195c /vcl | |
| parent | 869823461007c8711181470c11ca713dbbd82211 (diff) | |
convert vcl/inc/printdlg.hxx from String to OUString
Change-Id: Ib12fc400afe0974a5af37298e77e3816c17e5387
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/printdlg.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/printdlg.cxx | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index 82476e7536e5..618e2f9d936a 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -270,7 +270,7 @@ namespace vcl class PrintProgressDialog : public ModelessDialog { - String maStr; + OUString maStr; FixedText maText; CancelButton maButton; diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 89f9a76df85b..594fb4442450 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -75,8 +75,8 @@ PrintDialog::PrintPreviewWindow::PrintPreviewWindow( Window* i_pParent ) maHorzDim.Show(); maVertDim.Show(); - maHorzDim.SetText( String( "2.0in" ) ); - maVertDim.SetText( String( "2.0in" ) ); + maHorzDim.SetText( OUString( "2.0in" ) ); + maVertDim.SetText( OUString( "2.0in" ) ); } PrintDialog::PrintPreviewWindow::~PrintPreviewWindow() @@ -230,7 +230,7 @@ void PrintDialog::PrintPreviewWindow::setPreview( const GDIMetaFile& i_rNewPrevi nDigits = 2; } Size aLogicPaperSize( LogicToLogic( i_rOrigSize, MapMode( MAP_100TH_MM ), MapMode( eUnit ) ) ); - String aNumText( rLocWrap.getNum( aLogicPaperSize.Width(), nDigits ) ); + OUString aNumText( rLocWrap.getNum( aLogicPaperSize.Width(), nDigits ) ); aBuf.append( aNumText ); aBuf.appendAscii( eUnit == MAP_MM ? "mm" : "in" ); if( !i_rPaperName.isEmpty() ) @@ -618,7 +618,7 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterCont { // fall back to last printer SettingsConfigItem* pItem = SettingsConfigItem::get(); - String aValue( pItem->getValue( OUString( "PrintDialog" ), + OUString aValue( pItem->getValue( OUString( "PrintDialog" ), OUString( "LastPrinter" ) ) ); if( maJobPage.mpPrinters->GetEntryPos( aValue ) != LISTBOX_ENTRY_NOTFOUND ) { @@ -1261,9 +1261,9 @@ void PrintDialog::updatePrinterText() } else { - maJobPage.mpLocationTxt->SetText( String() ); - maJobPage.mpCommentTxt->SetText( String() ); - maJobPage.mpStatusTxt->SetText( String() ); + maJobPage.mpLocationTxt->SetText( OUString() ); + maJobPage.mpCommentTxt->SetText( OUString() ); + maJobPage.mpStatusTxt->SetText( OUString() ); } } @@ -1484,7 +1484,7 @@ IMPL_LINK( PrintDialog, SelectHdl, ListBox*, pBox ) { if( pBox == maJobPage.mpPrinters ) { - String aNewPrinter( pBox->GetSelectEntry() ); + OUString aNewPrinter( pBox->GetSelectEntry() ); // set new printer maPController->setPrinter( boost::shared_ptr<Printer>( new Printer( aNewPrinter ) ) ); maPController->resetPrinterOptions( maOptionsPage.mpToFileBox->IsChecked() ); |