some GetTokens hidden in windows only code

Change-Id: I45da175fe0f72996b26d66c29e0e6a1b4115b896
This commit is contained in:
Caolán McNamara
2013-10-18 12:04:03 +01:00
parent 9c1170b25a
commit f649a16e74

View File

@@ -82,15 +82,15 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
pService = *aI; pService = *aI;
if ( !hText2 || ( *pService->pName == hText2 ) ) if ( !hText2 || ( *pService->pName == hText2 ) )
{ {
String sTopics( pService->Topics() ); OUString sTopics( pService->Topics() );
if( sTopics.Len() ) if (!sTopics.isEmpty())
{ {
if( hText1 ) if( hText1 )
{ {
sal_Int32 n = 0; sal_Int32 n = 0;
while( -1 != n ) while( -1 != n )
{ {
OUString s( sTopics.GetToken( 0, '\t', n )); OUString s( sTopics.getToken( 0, '\t', n ));
if( s == reinterpret_cast<const sal_Unicode*>(chTopicBuf) ) if( s == reinterpret_cast<const sal_Unicode*>(chTopicBuf) )
++nTopics; ++nTopics;
} }
@@ -114,11 +114,11 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
pService = *aI; pService = *aI;
if ( !hText2 || (*pService->pName == hText2 ) ) if ( !hText2 || (*pService->pName == hText2 ) )
{ {
String sTopics( pService->Topics() ); OUString sTopics( pService->Topics() );
sal_Int32 n = 0; sal_Int32 n = 0;
while( -1 != n ) while( -1 != n )
{ {
OUString s( sTopics.GetToken( 0, '\t', n )); OUString s( sTopics.getToken( 0, '\t', n ));
s = comphelper::string::remove(s, '\n'); s = comphelper::string::remove(s, '\n');
s = comphelper::string::remove(s, '\r'); s = comphelper::string::remove(s, '\r');
if( !hText1 || s == reinterpret_cast<const sal_Unicode*>(chTopicBuf) ) if( !hText1 || s == reinterpret_cast<const sal_Unicode*>(chTopicBuf) )