diff options
| author | Ricardo Montania <ricardo@linuxafundo.com.br> | 2013-05-13 16:14:52 -0300 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-05-15 15:58:17 +0200 |
| commit | 8a9448aabcee0171b0dc3b0401600de09455fb10 (patch) | |
| tree | 200f609afeab42dd1281833607ae5f4fedf9dcee /padmin/source | |
| parent | 8d08ba5e7530580afd61930bfc00ae513962b754 (diff) | |
String.AppendAscii Drop
Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
https://gerrit.libreoffice.org/#/c/3892/
Change-Id: I12175a81f0a74546b5e00633176f204b9a3fb35c
Diffstat (limited to 'padmin/source')
| -rw-r--r-- | padmin/source/adddlg.cxx | 8 | ||||
| -rw-r--r-- | padmin/source/cmddlg.cxx | 5 | ||||
| -rw-r--r-- | padmin/source/padialog.cxx | 13 | ||||
| -rw-r--r-- | padmin/source/prtsetup.cxx | 4 |
4 files changed, 12 insertions, 18 deletions
diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx index 4adb755c2e0f..bb3487abe5f9 100644 --- a/padmin/source/adddlg.cxx +++ b/padmin/source/adddlg.cxx @@ -274,10 +274,10 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*, pButton ) FindFiles( aPPDDir, aFiles, OUString( "PS;PPD;PS.GZ;PPD.GZ" ), true ); for( file = aFiles.begin(); file != aFiles.end(); ++file ) { - String aFile( aPPDDir ); - if( aFile.GetChar( aFile.Len() ) != '/' ) - aFile.AppendAscii( "/" ); - aFile.Append( *file ); + OUString aFile( aPPDDir ); + if( !aFile.endsWith( "/" ) ) + aFile += "/"; + aFile += *file; int nPos = file->SearchBackward( '.' ); if( file->Copy( 0, nPos ) == String( aPPD ) ) diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx index c9b21edc4d67..bbbbdc7a564a 100644 --- a/padmin/source/cmddlg.cxx +++ b/padmin/source/cmddlg.cxx @@ -529,9 +529,8 @@ void RTSCommandPage::UpdateCommands() void RTSCommandPage::ConnectCommand() { - String aString( m_aConnectedTo.GetText().getToken( 0, ':' ) ); - aString.AppendAscii( ": " ); - aString += m_aCommandsCB.GetText(); + OUString aString = ( m_aConnectedTo.GetText().getToken( 0, ':' ) ) + + ": " + m_aCommandsCB.GetText(); m_aConnectedTo.SetText( aString ); } diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx index c6adfc93f779..fe6184843c04 100644 --- a/padmin/source/padialog.cxx +++ b/padmin/source/padialog.cxx @@ -254,10 +254,9 @@ void PADialog::UpdateText() if( !aDev.isEmpty() ) { const PrinterInfo& rInfo = m_rPIManager.getPrinterInfo( aDev ); - String aDriver( rInfo.m_aPrinterName ); - aDriver.AppendAscii( " (" ); - aDriver += String( rInfo.m_aDriverName ); - aDriver.Append( ')' ); + + OUString aDriver = rInfo.m_aPrinterName + " (" + rInfo.m_aDriverName + ")"; + m_aDriver.SetText( aDriver ); m_aCommand.SetText( rInfo.m_aCommand ); m_aComment.SetText( rInfo.m_aComment ); @@ -707,12 +706,10 @@ void PADialog::UpdateDevice() if( bAutoQueue ) continue; - String aEntry( *it ); + OUString aEntry( *it ); if( *it == m_rPIManager.getDefaultPrinter() ) { - aEntry.AppendAscii( " (" ); - aEntry += m_aDefPrt; - aEntry.AppendAscii( ")" ); + aEntry += " (" + OUString( m_aDefPrt ) + ")"; } int nPos = m_aDevicesLB.InsertEntry( aEntry, diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx index 53d09ce0c5e4..d9d87cf1f214 100644 --- a/padmin/source/prtsetup.cxx +++ b/padmin/source/prtsetup.cxx @@ -708,9 +708,7 @@ void RTSFontSubstPage::update() for( it = m_pParent->m_aJobData.m_aFontSubstitutes.begin(); it != m_pParent->m_aJobData.m_aFontSubstitutes.end(); ++it ) { - String aEntry( it->first ); - aEntry.AppendAscii( " -> " ); - aEntry.Append( String( it->second ) ); + OUString aEntry = it->first + " -> " + it->second; m_aSubstitutionsBox.InsertEntry( aEntry ); } } |