[Libreoffice-commits] core.git: svl/source

[Caolán McNamara]

 svl/source/svdde/ddesvr.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f649a16e740f55ee9413a556ebaa8b8774f8a42c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 18 12:04:03 2013 +0100

    some GetTokens hidden in windows only code
    
    Change-Id: I45da175fe0f72996b26d66c29e0e6a1b4115b896

diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index 0a15b70..77c85a9 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -82,15 +82,15 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
                 pService = *aI;
                 if ( !hText2 || ( *pService->pName == hText2 ) )
                 {
-                    String sTopics( pService->Topics() );
-                    if( sTopics.Len() )
+                    OUString sTopics( pService->Topics() );
+                    if (!sTopics.isEmpty())
                     {
                         if( hText1 )
                         {
                             sal_Int32 n = 0;
                             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) )
                                     ++nTopics;
                             }
@@ -114,11 +114,11 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
                 pService = *aI;
                 if ( !hText2 || (*pService->pName == hText2 ) )
                 {
-                    String sTopics( pService->Topics() );
+                    OUString sTopics( pService->Topics() );
                     sal_Int32 n = 0;
                     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, '\r');
                         if( !hText1 || s == reinterpret_cast<const sal_Unicode*>(chTopicBuf) )