diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-07-20 21:41:40 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-07-21 09:29:09 +0100 |
| commit | a035737e46ec58ffbb11f95780e1573b40fc746e (patch) | |
| tree | f9aa23a3baf33147f03b0a8493d0418371050620 /padmin | |
| parent | 3e4269deb560f2f3f8156edd530bae96a8c7dbb1 (diff) | |
ByteString::CreateFromInt32->rtl::OString::valueOf
Diffstat (limited to 'padmin')
| -rw-r--r-- | padmin/source/cmddlg.cxx | 8 | ||||
| -rw-r--r-- | padmin/source/newppdlg.cxx | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx index be87417891f4..4303757628ba 100644 --- a/padmin/source/cmddlg.cxx +++ b/padmin/source/cmddlg.cxx @@ -129,11 +129,11 @@ void CommandStore::getStoredCommands( const char* pGroup, ::std::list< String >& { Config& rConfig( getPadminRC() ); rConfig.SetGroup( pGroup ); - int nKeys = rConfig.GetKeyCount(); + sal_Int32 nKeys = rConfig.GetKeyCount(); ::std::list< String >::const_iterator it; while( nKeys-- ) { - String aCommand( rConfig.ReadKey( ByteString::CreateFromInt32( nKeys ), RTL_TEXTENCODING_UTF8 ) ); + String aCommand( rConfig.ReadKey(rtl::OString::valueOf(nKeys), RTL_TEXTENCODING_UTF8 ) ); if( aCommand.Len() ) { for( it = rCommands.begin(); it != rCommands.end() && *it != aCommand; ++it ) @@ -156,7 +156,7 @@ void CommandStore::setCommands( ::std::list< String >::const_iterator it, loop; ::std::list< String > aWriteList; - int nWritten = 0; + sal_Int32 nWritten = 0; for( it = rCommands.begin(); it != rCommands.end(); ++it ) { if( it->Len() ) @@ -176,7 +176,7 @@ void CommandStore::setCommands( nWritten--; } for( nWritten = 0, it = aWriteList.begin(); it != aWriteList.end(); ++it, ++nWritten ) - rConfig.WriteKey( ByteString::CreateFromInt32( nWritten ), ByteString( *it, RTL_TEXTENCODING_UTF8 ) ); + rConfig.WriteKey( rtl::OString::valueOf(nWritten), ByteString( *it, RTL_TEXTENCODING_UTF8 ) ); } diff --git a/padmin/source/newppdlg.cxx b/padmin/source/newppdlg.cxx index 6382ae1359dd..0da40ce90f02 100644 --- a/padmin/source/newppdlg.cxx +++ b/padmin/source/newppdlg.cxx @@ -77,9 +77,9 @@ PPDImportDialog::PPDImportDialog( Window* pParent ) : Config& rConfig = getPadminRC(); rConfig.SetGroup( PPDIMPORT_GROUP ); m_aPathBox.SetText( String( rConfig.ReadKey( "LastDir" ), RTL_TEXTENCODING_UTF8 ) ); - for( int i = 0; i < 11; i++ ) + for (sal_Int32 i = 0; i < 11; ++i) { - ByteString aEntry( rConfig.ReadKey( ByteString::CreateFromInt32( i ) ) ); + ByteString aEntry(rConfig.ReadKey(rtl::OString::valueOf(i))); if( aEntry.Len() ) m_aPathBox.InsertEntry( String( aEntry, RTL_TEXTENCODING_UTF8 ) ); } @@ -117,10 +117,10 @@ void PPDImportDialog::Import() break; if( nEntries < 0 ) { - int nNextEntry = rConfig.ReadKey( "NextEntry" ).ToInt32(); - rConfig.WriteKey( ByteString::CreateFromInt32( nNextEntry ), ByteString( aImportPath, RTL_TEXTENCODING_UTF8 ) ); + sal_Int32 nNextEntry = rConfig.ReadKey( "NextEntry" ).ToInt32(); + rConfig.WriteKey( rtl::OString::valueOf(nNextEntry), ByteString( aImportPath, RTL_TEXTENCODING_UTF8 ) ); nNextEntry = nNextEntry < 10 ? nNextEntry+1 : 0; - rConfig.WriteKey( "NextEntry", ByteString::CreateFromInt32( nNextEntry ) ); + rConfig.WriteKey( "NextEntry", rtl::OString::valueOf(nNextEntry) ); m_aPathBox.InsertEntry( aImportPath ); } while( m_aDriverLB.GetEntryCount() ) |