diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-18 22:30:22 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-19 09:30:44 +0100 |
| commit | d1fb13adf9ab73e53851e5d56cbbbe33bcdcd82c (patch) | |
| tree | 43c8a344a67113e3b1a26138f6653304809f62c7 /automation/source | |
| parent | 2add3f0e5a6b6e5b818a9e41b19436c496aa4c66 (diff) | |
convert tools::Config to rtl::OString
Diffstat (limited to 'automation/source')
| -rw-r--r-- | automation/source/server/server.cxx | 6 | ||||
| -rw-r--r-- | automation/source/testtool/objtest.cxx | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx index ccf0e7ffb840..44c2c0de423e 100644 --- a/automation/source/server/server.cxx +++ b/automation/source/server/server.cxx @@ -216,17 +216,17 @@ sal_uLong RemoteControlCommunicationManager::GetPort() aConf.WriteKey( aNoTesttoolKey, "something" ); } - nPortIs = aConf.ReadKey("TTPort","0").ToInt32(); + nPortIs = aConf.ReadKey("TTPort","0").toInt32(); // noch pr�fen ob dieses Office getestet werden soll. if ( !bAutomate || aConf.ReadKey( aNoTesttoolKey, "" ) != "" ) nPortIs = 0; - nComm = (sal_uInt16)aConf.ReadKey("Comm","0").ToInt32(); + nComm = (sal_uInt16)aConf.ReadKey("Comm","0").toInt32(); if ( nComm ) aConf.DeleteKey("Comm"); - bQuiet = ( aConf.ReadKey("Quiet","no").CompareIgnoreCaseToAscii("yes") == COMPARE_EQUAL ); + bQuiet = aConf.ReadKey("Quiet","no").equalsIgnoreAsciiCase("yes"); } return nPortIs; } diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx index 78a2928bd8ff..1f2be28613c3 100644 --- a/automation/source/testtool/objtest.cxx +++ b/automation/source/testtool/objtest.cxx @@ -362,11 +362,11 @@ void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die d aVar = UniString( __##aVar##__, RTL_TEXTENCODING_UTF8 );\ } -#define NEWOLD( NewKey, OldKey ) \ - { \ - ByteString aValue; \ - if ( ( (aValue = aConf.ReadKey( OldKey )).Len() ) && !aConf.ReadKey( NewKey ).Len() ) \ - aConf.WriteKey( NewKey, aValue ); \ +#define NEWOLD( NewKey, OldKey ) \ + { \ + rtl::OString aValue; \ + if ( ( (aValue = aConf.ReadKey( OldKey )).getLength() ) && !aConf.ReadKey( NewKey ).getLength() ) \ + aConf.WriteKey( NewKey, aValue ); \ } @@ -381,8 +381,8 @@ void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die d pImpl->aFileBase = DirEntry(aFB); // remove old keys - if ( aConf.ReadKey("KeyCodes + Classes").Len() != 0 || - aConf.ReadKey("KeyCodes + Classes + Res_Type").Len() != 0 ) + if ( aConf.ReadKey("KeyCodes + Classes").getLength() != 0 || + aConf.ReadKey("KeyCodes + Classes + Res_Type").getLength() != 0 ) { aConf.DeleteKey("KeyCodes + Classes + Res_Type"); aConf.DeleteKey("KeyCodes + Classes"); |