1 files changed, 21 insertions, 21 deletions

diff --git a/automation/source/testtool/tcommuni.cxx b/automation/source/testtool/tcommuni.cxx
index 97684cfba2cf..f3c338362529 100644
--- a/automation/source/testtool/tcommuni.cxx
+++ b/automation/source/testtool/tcommuni.cxx
@@ -44,7 +44,7 @@
 #include <basic/testtool.hxx>
 
 CommunicationManagerClientViaSocketTT::CommunicationManagerClientViaSocketTT()
-: CommunicationManagerClientViaSocket( TRUE )
+: CommunicationManagerClientViaSocket( sal_True )
 , aAppPath()
 , aAppParams()
 , pProcess( NULL )
@@ -52,14 +52,14 @@ CommunicationManagerClientViaSocketTT::CommunicationManagerClientViaSocketTT()
 }
 
 
-BOOL CommunicationManagerClientViaSocketTT::StartCommunication()
+sal_Bool CommunicationManagerClientViaSocketTT::StartCommunication()
 {
-    bApplicationStarted = FALSE;
+    bApplicationStarted = sal_False;
     return CommunicationManagerClientViaSocket::StartCommunication( ByteString( GetHostConfig(), RTL_TEXTENCODING_UTF8 ), GetTTPortConfig() );
 }
 
 
-BOOL CommunicationManagerClientViaSocketTT::StartCommunication( String aApp, String aParams, Environment *pChildEnv )
+sal_Bool CommunicationManagerClientViaSocketTT::StartCommunication( String aApp, String aParams, Environment *pChildEnv )
 {
     aAppPath = aApp;
     aAppParams = aParams;
@@ -68,7 +68,7 @@ BOOL CommunicationManagerClientViaSocketTT::StartCommunication( String aApp, Str
 }
 
 
-BOOL CommunicationManagerClientViaSocketTT::RetryConnect()
+sal_Bool CommunicationManagerClientViaSocketTT::RetryConnect()
 {
     if ( !bApplicationStarted )
     {
@@ -80,8 +80,8 @@ BOOL CommunicationManagerClientViaSocketTT::RetryConnect()
             pProcess = new Process();
             pProcess->SetImage( aAppPath, aAppParams, &aAppEnv );
 
-            BOOL bSucc = pProcess->Start();
-            bApplicationStarted = TRUE;
+            sal_Bool bSucc = pProcess->Start();
+            bApplicationStarted = sal_True;
 
             if ( bSucc )
             {
@@ -91,7 +91,7 @@ BOOL CommunicationManagerClientViaSocketTT::RetryConnect()
             }
             return bSucc;
         }
-        return FALSE;
+        return sal_False;
     }
     else
     {
@@ -102,18 +102,18 @@ BOOL CommunicationManagerClientViaSocketTT::RetryConnect()
             aWait.Start();
             while ( aWait.IsActive() )
                 GetpApp()->Yield();
-            return TRUE;
+            return sal_True;
         }
         else
-            return FALSE;
+            return sal_False;
     }
 }
 
-BOOL CommunicationManagerClientViaSocketTT::KillApplication()
+sal_Bool CommunicationManagerClientViaSocketTT::KillApplication()
 {
     if ( pProcess )
         return pProcess->Terminate();
-    return TRUE;
+    return sal_True;
 }
 
 #define GETSET(aVar, KeyName, Dafault)                 \
@@ -129,7 +129,7 @@ String GetHostConfig()
 {
     String aHostToTalk;
 
-    for ( USHORT i = 0 ; i < Application::GetCommandLineParamCount() ; i++ )
+    for ( sal_uInt16 i = 0 ; i < Application::GetCommandLineParamCount() ; i++ )
     {
         if ( Application::GetCommandLineParam( i ).Copy(0,6).CompareIgnoreCaseToAscii("-host=") == COMPARE_EQUAL
 #ifndef UNX
@@ -148,11 +148,11 @@ String GetHostConfig()
 }
 
 
-ULONG GetTTPortConfig()
+sal_uLong GetTTPortConfig()
 {
     String aPortToTalk;
 
-    for ( USHORT i = 0 ; i < Application::GetCommandLineParamCount() ; i++ )
+    for ( sal_uInt16 i = 0 ; i < Application::GetCommandLineParamCount() ; i++ )
     {
         if ( Application::GetCommandLineParam( i ).Copy(0,6).CompareIgnoreCaseToAscii("-port=") == COMPARE_EQUAL
 #ifndef UNX
@@ -161,7 +161,7 @@ ULONG GetTTPortConfig()
           )
         {
             aPortToTalk = Application::GetCommandLineParam( i ).Copy(6);
-            return (ULONG)aPortToTalk.ToInt64();
+            return (sal_uLong)aPortToTalk.ToInt64();
         }
     }
 
@@ -170,15 +170,15 @@ ULONG GetTTPortConfig()
     aConf.SetGroup("Communication");
 
     GETSET( abPortToTalk, "TTPort", ByteString::CreateFromInt32( TESTTOOL_DEFAULT_PORT ) );
-    return (ULONG)abPortToTalk.ToInt64();
+    return (sal_uLong)abPortToTalk.ToInt64();
 }
 
 
-ULONG GetUnoPortConfig()
+sal_uLong GetUnoPortConfig()
 {
     String aPortToTalk;
 
-    for ( USHORT i = 0 ; i < Application::GetCommandLineParamCount() ; i++ )
+    for ( sal_uInt16 i = 0 ; i < Application::GetCommandLineParamCount() ; i++ )
     {
         if ( Application::GetCommandLineParam( i ).Copy(0,9).CompareIgnoreCaseToAscii("-unoport=") == COMPARE_EQUAL
 #ifndef UNX
@@ -187,7 +187,7 @@ ULONG GetUnoPortConfig()
           )
         {
             aPortToTalk = Application::GetCommandLineParam( i ).Copy(6);
-            return (ULONG)aPortToTalk.ToInt64();
+            return (sal_uLong)aPortToTalk.ToInt64();
         }
     }
 
@@ -196,5 +196,5 @@ ULONG GetUnoPortConfig()
     aConf.SetGroup("Communication");
 
     GETSET( abPortToTalk, "UnoPort", ByteString::CreateFromInt32( UNO_DEFAULT_PORT ) );
-    return (ULONG)abPortToTalk.ToInt64();
+    return (sal_uLong)abPortToTalk.ToInt64();
 }