diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-21 01:09:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-22 09:39:16 +0100 |
| commit | 91a418d2137e33b48d9e524b53dd71e08754a06b (patch) | |
| tree | c59dacc45b00addbfd95a24221ee5bf49d400a19 /automation | |
| parent | dbfa0518af3d398f19d53d39fa72f5f437fd83fc (diff) | |
ByteString->rtl::OString
Diffstat (limited to 'automation')
| -rw-r--r-- | automation/source/testtool/tcommuni.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/automation/source/testtool/tcommuni.cxx b/automation/source/testtool/tcommuni.cxx index 32b97075f77c..82583a414e0a 100644 --- a/automation/source/testtool/tcommuni.cxx +++ b/automation/source/testtool/tcommuni.cxx @@ -117,13 +117,12 @@ sal_Bool CommunicationManagerClientViaSocketTT::KillApplication() #define GETSET(aVar, KeyName, Dafault) \ aVar = aConf.ReadKey(KeyName,"No Entry"); \ - if ( aVar.CompareTo("No Entry") == COMPARE_EQUAL ) \ + if (aVar.equalsL(RTL_CONSTASCII_STRINGPARAM("No Entry"))) \ { \ - aVar = ByteString(Dafault); \ + aVar = Dafault; \ aConf.WriteKey(KeyName, aVar); \ } - String GetHostConfig() { String aHostToTalk; @@ -138,12 +137,12 @@ String GetHostConfig() return Application::GetCommandLineParam( i ).Copy(6); } - ByteString abHostToTalk; + rtl::OString abHostToTalk; Config aConf(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") )); aConf.SetGroup("Communication"); GETSET( abHostToTalk, "Host", DEFAULT_HOST ); - return UniString( abHostToTalk, RTL_TEXTENCODING_UTF8 ); + return rtl::OStringToOUString(abHostToTalk, RTL_TEXTENCODING_UTF8); } @@ -164,13 +163,13 @@ sal_uLong GetTTPortConfig() } } - ByteString abPortToTalk; + rtl::OString abPortToTalk; Config aConf(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") )); aConf.SetGroup("Communication"); GETSET( abPortToTalk, "TTPort", rtl::OString::valueOf(static_cast<sal_Int32>(TESTTOOL_DEFAULT_PORT)) ); - return (sal_uLong)abPortToTalk.ToInt32(); + return (sal_uLong)abPortToTalk.toInt32(); } @@ -191,13 +190,13 @@ sal_uLong GetUnoPortConfig() } } - ByteString abPortToTalk; + rtl::OString abPortToTalk; Config aConf(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") )); aConf.SetGroup("Communication"); GETSET( abPortToTalk, "UnoPort", rtl::OString::valueOf(static_cast<sal_Int32>(UNO_DEFAULT_PORT)) ); - return (sal_uLong)abPortToTalk.ToInt32(); + return (sal_uLong)abPortToTalk.toInt32(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |