mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert tools::Config to rtl::OString

Browse Source
This commit is contained in:
Caolán McNamara
2011-08-18 22:30:22 +01:00
parent 2add3f0e5a
commit d1fb13adf9
13 changed files with 77 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
automation/source/server/server.cxx
View File

@@ -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<70>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;
}

14
automation/source/testtool/objtest.cxx
View File

@@ -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");