diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-11-27 20:37:42 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-28 09:55:03 +0000 |
| commit | 6f33482f8f4329b6c9874397bdb67c1b958b69c2 (patch) | |
| tree | ba19bc4bff6ddbd87354f90a61615cf5f4892c5a /automation/source/server | |
| parent | c95a10ca2079cdc33d09189aef0a8788eab274ff (diff) | |
ByteString->rtl::OUStringToOString
Diffstat (limited to 'automation/source/server')
| -rw-r--r-- | automation/source/server/server.cxx | 2 | ||||
| -rw-r--r-- | automation/source/server/statemnt.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx index 46b25b0a7c66..7418e88b8ac5 100644 --- a/automation/source/server/server.cxx +++ b/automation/source/server/server.cxx @@ -206,7 +206,7 @@ sal_uLong RemoteControlCommunicationManager::GetPort() Config aConf(Config::GetConfigName( aIniFileDir, CUniString("testtool") )); aConf.SetGroup("Communication"); - ByteString aNoTesttoolKey( ByteString("Exclude_").Append( ByteString( Application::GetAppFileName(), RTL_TEXTENCODING_UTF8 ) ) ); + rtl::OString aNoTesttoolKey( ByteString("Exclude_").Append( rtl::OUStringToOString(Application::GetAppFileName(), RTL_TEXTENCODING_UTF8) ) ); // -notesttool for ( i = 0 ; i < Application::GetCommandLineParamCount() ; i++ ) { diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index 310afe866b84..15c2c5357d1a 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.cxx @@ -2502,10 +2502,10 @@ sal_Bool StatementCommand::Execute() case RC_Assert: { ByteString aAssertion( "Diese Assertion wurde vom Testtool per Befehl ausgel�st" ); - aAssertion = ByteString( String( aAssertion, RTL_TEXTENCODING_MS_1252 ), RTL_TEXTENCODING_UTF8 ); - DBG_ASSERT( !aString1.Len(), ByteString( aString1, RTL_TEXTENCODING_UTF8 ).GetBuffer() ); + aAssertion = rtl::OUStringToOString(String(aAssertion, RTL_TEXTENCODING_MS_1252), RTL_TEXTENCODING_UTF8 ); + DBG_ASSERT( !aString1.Len(), rtl::OUStringToOString( aString1, RTL_TEXTENCODING_UTF8 ).getStr() ); DBG_ASSERT( aString1.Len(), aAssertion.GetBuffer() ); - OSL_ENSURE( !aString1.Len(), ByteString( aString1, RTL_TEXTENCODING_UTF8 ).GetBuffer() ); + OSL_ENSURE( !aString1.Len(), rtl::OUStringToOString( aString1, RTL_TEXTENCODING_UTF8 ).getStr() ); OSL_ENSURE( aString1.Len(), aAssertion.GetBuffer() ); } break; |